Attachment #207048 for bug #345298

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 677-683 Link Here

(-)a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java (-1 / +3 lines)
677	manager.registerAdapters(actionFactory, ITerminate.class);	677	manager.registerAdapters(actionFactory, ITerminate.class);
678	manager.registerAdapters(actionFactory, ILaunch.class);	678	manager.registerAdapters(actionFactory, ILaunch.class);
679	manager.registerAdapters(actionFactory, IProcess.class);	679	manager.registerAdapters(actionFactory, IProcess.class);
680	manager.registerAdapters(actionFactory, IDebugElement.class);	680	manager.registerAdapters(actionFactory, IDebugElement.class);
		681	getBreakpointManager();
		682	fBreakpointManager.start();
681	}	683	}
682		684
683	/**	685	/**




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.IBreakpointManager;
import org.eclipse.debug.internal.core.BreakpointManager;
import org.eclipse.debug.internal.core.DebugCoreMessages;

/**
 * Abstract implementation of a breakpoint. This class is
 * intended to be sub-classed by implementations
 * of breakpoints.
 * 
 * @see IBreakpoint

	 * Underlying marker.
	 */
	private IMarker fMarker= null;

    /**
     * Default constructor used to ensure that breakpoint manager is initialized.
     */
    public Breakpoint() {
        // making sure that the BreakpointManager is correctly initialized
        // before any breakpoint marker related operation (see bug 54993)
        ((BreakpointManager)DebugPlugin.getDefault().getBreakpointManager()).ensureBreakpointsInitialized();
    }
                

	/**
	 * @see IBreakpoint#setMarker(IMarker)

Lines 341-346 Link Here

(-)a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java (-3 / +14 lines)
341	fImportParticipants = null;	341	fImportParticipants = null;
342	fDefaultParticipant = null;	342	fDefaultParticipant = null;
343	}	343	}
		344	if(fBreakpoints != null) {
		345	fBreakpoints.clear();
		346	fBreakpoints = null;
		347	}
		348	if(fMarkersToBreakpoints != null) {
		349	fMarkersToBreakpoints.clear();
		350	}
344	}	351	}
345		352
346	/**	353	/**
Lines 394-403 Link Here
394	}	401	}
395		402
396	/**	403	/**
397	* Calls {@link #initializeBreakpoints()} if breakpoints have not yet been initialized.	404	* Perform any initialization of the manager.
		405	*
		406	* Called when {@link DebugPlugin#start(org.osgi.framework.BundleContext)} is called.
		407	*
		408	* @since 3.8
398	*/	409	*/
399	public void ensureBreakpointsInitialized() {	410	public void start() {
400	getBreakpoints0();	411	getBreakpoints0();
401	}	412	}
402		413
403	/**	414	/**

Return to bug 345298

Lines 1-5 Link Here

(-)a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java (-13 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 28-39 Link Here
28	import org.eclipse.debug.core.DebugException;	28	import org.eclipse.debug.core.DebugException;
29	import org.eclipse.debug.core.DebugPlugin;	29	import org.eclipse.debug.core.DebugPlugin;
30	import org.eclipse.debug.core.IBreakpointManager;	30	import org.eclipse.debug.core.IBreakpointManager;
31	import org.eclipse.debug.internal.core.BreakpointManager;
32	import org.eclipse.debug.internal.core.DebugCoreMessages;	31	import org.eclipse.debug.internal.core.DebugCoreMessages;
33		32
34	/**	33	/**
35	* Abstract implementation of a breakpoint. This class is	34	* Abstract implementation of a breakpoint. This class is
36	* intended to be subclassed by implementations	35	* intended to be sub-classed by implementations
37	* of breakpoints.	36	* of breakpoints.
38	*	37	*
39	* @see IBreakpoint	38	* @see IBreakpoint
Lines 46-61 Link Here
46	* Underlying marker.	45	* Underlying marker.
47	*/	46	*/
48	private IMarker fMarker= null;	47	private IMarker fMarker= null;
49
50	/**
51	* Default constructor used to ensure that breakpoint manager is initialized.
52	*/
53	public Breakpoint() {
54	// making sure that the BreakpointManager is correctly initialized
55	// before any breakpoint marker related operation (see bug 54993)
56	((BreakpointManager)DebugPlugin.getDefault().getBreakpointManager()).ensureBreakpointsInitialized();
57	}
58
59		48
60	/**	49	/**
61	* @see IBreakpoint#setMarker(IMarker)	50	* @see IBreakpoint#setMarker(IMarker)