mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Renamed ICBreakpointTyped to ICBreakpointType

Browse source
This commit is contained in:
John Cortell 2008-05-07 23:29:25 +00:00
parent 9ec9ace2e4
commit 79aa62cd97
13 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java
View file

@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.core.cdi.model;
import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDICondition; import org.eclipse.cdt.debug.core.cdi.ICDICondition;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
/** /**
* *
@ -32,11 +32,11 @@ import org.eclipse.cdt.debug.core.model.ICBreakpointTyped;
*/ */
public interface ICDIBreakpoint extends ICDIObject { public interface ICDIBreakpoint extends ICDIObject {
/** @deprecated use ICBreakpointTyped.REGULAR */ /** @deprecated use ICBreakpointTyped.REGULAR */
final static public int REGULAR = ICBreakpointTyped.REGULAR; final static public int REGULAR = ICBreakpointType.REGULAR;
/** @deprecated use ICBreakpointTyped.TEMPORARY */ /** @deprecated use ICBreakpointTyped.TEMPORARY */
final static public int TEMPORARY = ICBreakpointTyped.TEMPORARY; final static public int TEMPORARY = ICBreakpointType.TEMPORARY;
/** @deprecated use ICBreakpointTyped.HARDWARE */ /** @deprecated use ICBreakpointTyped.HARDWARE */
final static public int HARDWARE = ICBreakpointTyped.HARDWARE; final static public int HARDWARE = ICBreakpointType.HARDWARE;
/** /**
* Returns whether this breakpoint is temporary. * Returns whether this breakpoint is temporary.
* *

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java
View file

@ -27,7 +27,7 @@ import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.debug.core.cdi.model.ICDITarget; import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.core.model.ICEventBreakpoint; import org.eclipse.cdt.debug.core.model.ICEventBreakpoint;
import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;
import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; import org.eclipse.cdt.debug.core.model.ICLineBreakpoint;
@ -204,7 +204,7 @@ public class CDIDebugModel {
attributes.put( ICBreakpoint.IGNORE_COUNT, new Integer( ignoreCount ) ); attributes.put( ICBreakpoint.IGNORE_COUNT, new Integer( ignoreCount ) );
attributes.put( ICBreakpoint.CONDITION, condition ); attributes.put( ICBreakpoint.CONDITION, condition );
attributes.put( ICBreakpoint.SOURCE_HANDLE, sourceHandle ); attributes.put( ICBreakpoint.SOURCE_HANDLE, sourceHandle );
attributes.put( ICBreakpointTyped.TYPE, ICBreakpointTyped.REGULAR ); attributes.put( ICBreakpointType.TYPE, ICBreakpointType.REGULAR );
return new CLineBreakpoint( resource, attributes, register ); return new CLineBreakpoint( resource, attributes, register );
} }

10
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java
View file

@ -31,7 +31,7 @@ import javax.xml.transform.stream.StreamResult;
import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;
import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; import org.eclipse.cdt.debug.core.model.ICLineBreakpoint;
import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.cdt.debug.core.model.ICValue;
@ -460,14 +460,14 @@ public class CDebugUtils {
} }
protected static StringBuffer appendBreakpointType( ICBreakpoint breakpoint, StringBuffer label ) throws CoreException { protected static StringBuffer appendBreakpointType( ICBreakpoint breakpoint, StringBuffer label ) throws CoreException {
if (breakpoint instanceof ICBreakpointTyped) { if (breakpoint instanceof ICBreakpointType) {
String typeString = null; String typeString = null;
int type = ((ICBreakpointTyped) breakpoint).getType(); int type = ((ICBreakpointType) breakpoint).getType();
switch (type) { switch (type) {
case ICBreakpointTyped.HARDWARE: case ICBreakpointType.HARDWARE:
typeString = DebugCoreMessages.getString("CDebugUtils.10"); typeString = DebugCoreMessages.getString("CDebugUtils.10");
break; break;
case ICBreakpointTyped.TEMPORARY: case ICBreakpointType.TEMPORARY:
typeString = DebugCoreMessages.getString("CDebugUtils.11"); typeString = DebugCoreMessages.getString("CDebugUtils.11");
break; break;
} }

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointTyped.java → debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointType.java
View file

@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.core.model;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
public interface ICBreakpointTyped { public interface ICBreakpointType {
/** /**
* Breakpoint attribute storing the type of the breakpoint * Breakpoint attribute storing the type of the breakpoint
* This attribute is a <code>int</code>. Strictly speaking, * This attribute is a <code>int</code>. Strictly speaking,

8
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
View file

@ -64,7 +64,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIWatchpoint2;
import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointFilterExtension; import org.eclipse.cdt.debug.core.model.ICBreakpointFilterExtension;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.core.model.ICDebugTarget; import org.eclipse.cdt.debug.core.model.ICDebugTarget;
import org.eclipse.cdt.debug.core.model.ICEventBreakpoint; import org.eclipse.cdt.debug.core.model.ICEventBreakpoint;
import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;
@ -771,10 +771,10 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
for ( int i = 0; i < breakpoints.length; ++i ) { for ( int i = 0; i < breakpoints.length; ++i ) {
try { try {
ICDIBreakpoint b = null; ICDIBreakpoint b = null;
int breakpointType = ICBreakpointTyped.REGULAR; int breakpointType = ICBreakpointType.REGULAR;
ICBreakpoint icbreakpoint = breakpoints[i]; ICBreakpoint icbreakpoint = breakpoints[i];
if (icbreakpoint instanceof ICBreakpointTyped) { if (icbreakpoint instanceof ICBreakpointType) {
breakpointType = ((ICBreakpointTyped) icbreakpoint).getType(); breakpointType = ((ICBreakpointType) icbreakpoint).getType();
} }
if ( icbreakpoint instanceof ICFunctionBreakpoint ) { if ( icbreakpoint instanceof ICFunctionBreakpoint ) {
ICFunctionBreakpoint breakpoint = (ICFunctionBreakpoint)icbreakpoint; ICFunctionBreakpoint breakpoint = (ICFunctionBreakpoint)icbreakpoint;

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java
View file

@ -21,7 +21,7 @@ import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointExtension; import org.eclipse.cdt.debug.core.model.ICBreakpointExtension;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.IWorkspaceRunnable;
@ -42,7 +42,7 @@ import org.eclipse.debug.core.model.Breakpoint;
/** /**
* The base class for all C/C++ specific breakpoints. * The base class for all C/C++ specific breakpoints.
*/ */
public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, ICBreakpointTyped, IDebugEventSetListener { public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, ICBreakpointType, IDebugEventSetListener {
/** /**
* Map of breakpoint extensions. The keys to the map are debug model IDs * Map of breakpoint extensions. The keys to the map are debug model IDs

8
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
View file

@ -68,7 +68,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIThread;
import org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor; import org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor;
import org.eclipse.cdt.debug.core.model.CDebugElementState; import org.eclipse.cdt.debug.core.model.CDebugElementState;
import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.core.model.ICDebugElement; import org.eclipse.cdt.debug.core.model.ICDebugElement;
import org.eclipse.cdt.debug.core.model.ICDebugElementStatus; import org.eclipse.cdt.debug.core.model.ICDebugElementStatus;
import org.eclipse.cdt.debug.core.model.ICDebugTarget; import org.eclipse.cdt.debug.core.model.ICDebugTarget;
@ -1309,11 +1309,11 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
public void setInternalTemporaryBreakpoint( ICDILocation location ) throws DebugException { public void setInternalTemporaryBreakpoint( ICDILocation location ) throws DebugException {
try { try {
if (location instanceof ICDIFunctionLocation) { if (location instanceof ICDIFunctionLocation) {
getCDITarget().setFunctionBreakpoint( ICBreakpointTyped.TEMPORARY, (ICDIFunctionLocation)location, null, false ); getCDITarget().setFunctionBreakpoint( ICBreakpointType.TEMPORARY, (ICDIFunctionLocation)location, null, false );
} else if (location instanceof ICDILineLocation) { } else if (location instanceof ICDILineLocation) {
getCDITarget().setLineBreakpoint( ICBreakpointTyped.TEMPORARY, (ICDILineLocation)location, null, false ); getCDITarget().setLineBreakpoint( ICBreakpointType.TEMPORARY, (ICDILineLocation)location, null, false );
} else if (location instanceof ICDIAddressLocation) { } else if (location instanceof ICDIAddressLocation) {
getCDITarget().setAddressBreakpoint( ICBreakpointTyped.TEMPORARY, (ICDIAddressLocation)location, null, false ); getCDITarget().setAddressBreakpoint( ICBreakpointType.TEMPORARY, (ICDIAddressLocation)location, null, false );
} else { } else {
// ??? // ???
targetRequestFailed("not_a_location", null); //$NON-NLS-1$ targetRequestFailed("not_a_location", null); //$NON-NLS-1$

12
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
View file

@ -33,7 +33,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIExceptionpoint;
import org.eclipse.cdt.debug.core.cdi.model.ICDIFunctionBreakpoint; import org.eclipse.cdt.debug.core.cdi.model.ICDIFunctionBreakpoint;
import org.eclipse.cdt.debug.core.cdi.model.ICDILineBreakpoint; import org.eclipse.cdt.debug.core.cdi.model.ICDILineBreakpoint;
import org.eclipse.cdt.debug.core.cdi.model.ICDIWatchpoint; import org.eclipse.cdt.debug.core.cdi.model.ICDIWatchpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.mi.core.MIException; import org.eclipse.cdt.debug.mi.core.MIException;
import org.eclipse.cdt.debug.mi.core.MIFormat; import org.eclipse.cdt.debug.mi.core.MIFormat;
import org.eclipse.cdt.debug.mi.core.MIPlugin; import org.eclipse.cdt.debug.mi.core.MIPlugin;
@ -424,11 +424,11 @@ public class BreakpointManager extends Manager {
} }
} else { } else {
// add the new breakpoint and fire CreatedEvent // add the new breakpoint and fire CreatedEvent
int type = ICBreakpointTyped.REGULAR; int type = ICBreakpointType.REGULAR;
if (miBreakpoint.isHardware()) { if (miBreakpoint.isHardware()) {
type = ICBreakpointTyped.HARDWARE; type = ICBreakpointType.HARDWARE;
} else if (miBreakpoint.isTemporary()) { } else if (miBreakpoint.isTemporary()) {
type = ICBreakpointTyped.TEMPORARY; type = ICBreakpointType.TEMPORARY;
} }
String[] tids = null; String[] tids = null;
String tid = miBreakpoint.getThreadId(); String tid = miBreakpoint.getThreadId();
@ -861,7 +861,7 @@ public class BreakpointManager extends Manager {
int id = EXCEPTION_THROW_IDX; int id = EXCEPTION_THROW_IDX;
if (exceptionBps[EXCEPTION_THROW_IDX] == null) { if (exceptionBps[EXCEPTION_THROW_IDX] == null) {
FunctionLocation location = new FunctionLocation(null, EXCEPTION_FUNCS[id]); FunctionLocation location = new FunctionLocation(null, EXCEPTION_FUNCS[id]);
FunctionBreakpoint bp = new FunctionBreakpoint(target, ICBreakpointTyped.REGULAR, location, null, enabled); FunctionBreakpoint bp = new FunctionBreakpoint(target, ICBreakpointType.REGULAR, location, null, enabled);
setLocationBreakpoint(bp); setLocationBreakpoint(bp);
exceptionBps[id] = bp; exceptionBps[id] = bp;
miBreakpoints = bp.getMIBreakpoints(); miBreakpoints = bp.getMIBreakpoints();
@ -873,7 +873,7 @@ public class BreakpointManager extends Manager {
int id = EXCEPTION_THROW_IDX; int id = EXCEPTION_THROW_IDX;
if (exceptionBps[id] == null) { if (exceptionBps[id] == null) {
FunctionLocation location = new FunctionLocation(null, EXCEPTION_FUNCS[id]); FunctionLocation location = new FunctionLocation(null, EXCEPTION_FUNCS[id]);
FunctionBreakpoint bp = new FunctionBreakpoint(target, ICBreakpointTyped.REGULAR, location, null, enabled); FunctionBreakpoint bp = new FunctionBreakpoint(target, ICBreakpointType.REGULAR, location, null, enabled);
setLocationBreakpoint(bp); setLocationBreakpoint(bp);
exceptionBps[id] = bp; exceptionBps[id] = bp;
if (miBreakpoints != null) { if (miBreakpoints != null) {

6
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java
View file

@ -16,7 +16,7 @@ import java.util.List;
import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDICondition; import org.eclipse.cdt.debug.core.cdi.ICDICondition;
import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint; import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.mi.core.cdi.BreakpointManager; import org.eclipse.cdt.debug.mi.core.cdi.BreakpointManager;
import org.eclipse.cdt.debug.mi.core.cdi.Condition; import org.eclipse.cdt.debug.mi.core.cdi.Condition;
import org.eclipse.cdt.debug.mi.core.cdi.Session; import org.eclipse.cdt.debug.mi.core.cdi.Session;
@ -85,14 +85,14 @@ public abstract class Breakpoint extends CObject implements ICDIBreakpoint {
* @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#isHardware() * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#isHardware()
*/ */
public boolean isHardware() { public boolean isHardware() {
return (type == ICBreakpointTyped.HARDWARE); return (type == ICBreakpointType.HARDWARE);
} }
/** /**
* @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#isTemporary() * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#isTemporary()
*/ */
public boolean isTemporary() { public boolean isTemporary() {
return (type == ICBreakpointTyped.TEMPORARY); return (type == ICBreakpointType.TEMPORARY);
} }
/** /**

4
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java
View file

@ -14,7 +14,7 @@ import java.util.Arrays;
import org.eclipse.cdt.debug.core.cdi.ICDICondition; import org.eclipse.cdt.debug.core.cdi.ICDICondition;
import org.eclipse.cdt.debug.core.cdi.model.ICDIEventBreakpoint; import org.eclipse.cdt.debug.core.cdi.model.ICDIEventBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.mi.core.output.MIBreakpoint; import org.eclipse.cdt.debug.mi.core.output.MIBreakpoint;
public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint { public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint {
@ -29,7 +29,7 @@ public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint {
private String arg; private String arg;
public EventBreakpoint(Target target, String event, String arg, ICDICondition cond, boolean enabled) { public EventBreakpoint(Target target, String event, String arg, ICDICondition cond, boolean enabled) {
super(target, ICBreakpointTyped.REGULAR, cond, enabled); super(target, ICBreakpointType.REGULAR, cond, enabled);
this.eventType = event; this.eventType = event;
this.arg = arg==null?"":arg; this.arg = arg==null?"":arg;
} }

4
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java
View file

@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model;
import org.eclipse.cdt.debug.core.cdi.ICDICondition; import org.eclipse.cdt.debug.core.cdi.ICDICondition;
import org.eclipse.cdt.debug.core.cdi.model.ICDIExceptionpoint; import org.eclipse.cdt.debug.core.cdi.model.ICDIExceptionpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
/** /**
* Exceptionpoint * Exceptionpoint
@ -27,7 +27,7 @@ public class Exceptionpoint extends Breakpoint implements ICDIExceptionpoint {
/** /**
*/ */
public Exceptionpoint(Target target, String clazz, boolean stopOnThrow, boolean stopOnCatch, ICDICondition cond, boolean enabled) { public Exceptionpoint(Target target, String clazz, boolean stopOnThrow, boolean stopOnCatch, ICDICondition cond, boolean enabled) {
super(target, ICBreakpointTyped.REGULAR, cond, enabled); super(target, ICBreakpointType.REGULAR, cond, enabled);
fClazz = clazz; fClazz = clazz;
fStopOnThrow = stopOnThrow; fStopOnThrow = stopOnThrow;
fStopOnCatch = stopOnCatch; fStopOnCatch = stopOnCatch;

6
debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/EventBreakpointTests.java
View file

@ -22,7 +22,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDILocator;
import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint; import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint;
import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement3; import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpointManagement3;
import org.eclipse.cdt.debug.core.cdi.model.ICDIEventBreakpoint; import org.eclipse.cdt.debug.core.cdi.model.ICDIEventBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.mi.core.MIException; import org.eclipse.cdt.debug.mi.core.MIException;
import org.eclipse.cdt.debug.mi.core.cdi.model.EventBreakpoint; import org.eclipse.cdt.debug.mi.core.cdi.model.EventBreakpoint;
@ -55,7 +55,7 @@ public class EventBreakpointTests extends AbstractDebugTest {
void setBreakOnMain() throws CDIException { void setBreakOnMain() throws CDIException {
ICDILocation location = null; ICDILocation location = null;
location = currentTarget.createFunctionLocation("", "main"); //$NON-NLS-1$ location = currentTarget.createFunctionLocation("", "main"); //$NON-NLS-1$
currentTarget.setFunctionBreakpoint(ICBreakpointTyped.TEMPORARY, (ICDIFunctionLocation) location, null, false); currentTarget.setFunctionBreakpoint(ICBreakpointType.TEMPORARY, (ICDIFunctionLocation) location, null, false);
} }
@ -81,7 +81,7 @@ public class EventBreakpointTests extends AbstractDebugTest {
currentTarget.deleteAllBreakpoints(); currentTarget.deleteAllBreakpoints();
pause(); pause();
assertTrue(currentTarget instanceof ICDIBreakpointManagement3); assertTrue(currentTarget instanceof ICDIBreakpointManagement3);
((ICDIBreakpointManagement3) currentTarget).setEventBreakpoint(type, arg, ICBreakpointTyped.REGULAR, null, false, true); ((ICDIBreakpointManagement3) currentTarget).setEventBreakpoint(type, arg, ICBreakpointType.REGULAR, null, false, true);
pause(); pause();
breakpoints = currentTarget.getBreakpoints(); breakpoints = currentTarget.getBreakpoints();
assertNotNull(breakpoints); assertNotNull(breakpoints);

4
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogs/AddEventBreakpointDialog.java
View file

@ -16,7 +16,7 @@ import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.eclipse.cdt.debug.core.CDIDebugModel; import org.eclipse.cdt.debug.core.CDIDebugModel;
import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.core.model.ICEventBreakpoint; import org.eclipse.cdt.debug.core.model.ICEventBreakpoint;
import org.eclipse.cdt.debug.internal.core.breakpoints.CEventBreakpoint; import org.eclipse.cdt.debug.internal.core.breakpoints.CEventBreakpoint;
import org.eclipse.cdt.debug.internal.ui.propertypages.CBreakpointPreferenceStore; import org.eclipse.cdt.debug.internal.ui.propertypages.CBreakpointPreferenceStore;
@ -82,7 +82,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener,
for (ICBreakpointsUIContribution con : cons) { for (ICBreakpointsUIContribution con : cons) {
if (con.getId().equals(ICEventBreakpoint.EVENT_TYPE_ID)) continue; if (con.getId().equals(ICEventBreakpoint.EVENT_TYPE_ID)) continue;
if (con.getId().equals(ICBreakpointTyped.TYPE)) continue; if (con.getId().equals(ICBreakpointType.TYPE)) continue;
FieldEditor fieldEditor = con.getFieldEditor(con.getId(), con.getLabel(), FieldEditor fieldEditor = con.getFieldEditor(con.getId(), con.getLabel(),
parent); parent);
getPreferenceStore().setValue(con.getId(),""); getPreferenceStore().setValue(con.getId(),"");