From 79aa62cd9773852ca64c25f12e832ecd16fdafbf Mon Sep 17 00:00:00 2001 From: John Cortell Date: Wed, 7 May 2008 23:29:25 +0000 Subject: [PATCH] Renamed ICBreakpointTyped to ICBreakpointType --- .../cdt/debug/core/cdi/model/ICDIBreakpoint.java | 8 ++++---- .../org/eclipse/cdt/debug/core/CDIDebugModel.java | 4 ++-- .../src/org/eclipse/cdt/debug/core/CDebugUtils.java | 10 +++++----- ...{ICBreakpointTyped.java => ICBreakpointType.java} | 2 +- .../cdt/debug/internal/core/CBreakpointManager.java | 8 ++++---- .../debug/internal/core/breakpoints/CBreakpoint.java | 4 ++-- .../cdt/debug/internal/core/model/CDebugTarget.java | 8 ++++---- .../cdt/debug/mi/core/cdi/BreakpointManager.java | 12 ++++++------ .../cdt/debug/mi/core/cdi/model/Breakpoint.java | 6 +++--- .../cdt/debug/mi/core/cdi/model/EventBreakpoint.java | 4 ++-- .../cdt/debug/mi/core/cdi/model/Exceptionpoint.java | 4 ++-- .../cdt/debug/core/tests/EventBreakpointTests.java | 6 +++--- .../ui/dialogs/AddEventBreakpointDialog.java | 4 ++-- 13 files changed, 40 insertions(+), 40 deletions(-) rename debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/{ICBreakpointTyped.java => ICBreakpointType.java} (99%) diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java index 987f3c739e7..7d0d55f0296 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java @@ -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.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 { /** @deprecated use ICBreakpointTyped.REGULAR */ - final static public int REGULAR = ICBreakpointTyped.REGULAR; + final static public int REGULAR = ICBreakpointType.REGULAR; /** @deprecated use ICBreakpointTyped.TEMPORARY */ - final static public int TEMPORARY = ICBreakpointTyped.TEMPORARY; + final static public int TEMPORARY = ICBreakpointType.TEMPORARY; /** @deprecated use ICBreakpointTyped.HARDWARE */ - final static public int HARDWARE = ICBreakpointTyped.HARDWARE; + final static public int HARDWARE = ICBreakpointType.HARDWARE; /** * Returns whether this breakpoint is temporary. * diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java index db3f3e7261b..f5e910a0ab8 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java @@ -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.model.ICAddressBreakpoint; 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.ICFunctionBreakpoint; 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.CONDITION, condition ); attributes.put( ICBreakpoint.SOURCE_HANDLE, sourceHandle ); - attributes.put( ICBreakpointTyped.TYPE, ICBreakpointTyped.REGULAR ); + attributes.put( ICBreakpointType.TYPE, ICBreakpointType.REGULAR ); return new CLineBreakpoint( resource, attributes, register ); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java index 187f59af086..986bcfbf13e 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java @@ -31,7 +31,7 @@ import javax.xml.transform.stream.StreamResult; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; 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.ICLineBreakpoint; 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 { - if (breakpoint instanceof ICBreakpointTyped) { + if (breakpoint instanceof ICBreakpointType) { String typeString = null; - int type = ((ICBreakpointTyped) breakpoint).getType(); + int type = ((ICBreakpointType) breakpoint).getType(); switch (type) { - case ICBreakpointTyped.HARDWARE: + case ICBreakpointType.HARDWARE: typeString = DebugCoreMessages.getString("CDebugUtils.10"); break; - case ICBreakpointTyped.TEMPORARY: + case ICBreakpointType.TEMPORARY: typeString = DebugCoreMessages.getString("CDebugUtils.11"); break; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointTyped.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointType.java similarity index 99% rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointTyped.java rename to debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointType.java index de151d8d459..c6927234690 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointTyped.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointType.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.core.model; import org.eclipse.core.runtime.CoreException; -public interface ICBreakpointTyped { +public interface ICBreakpointType { /** * Breakpoint attribute storing the type of the breakpoint * This attribute is a int. Strictly speaking, diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java index 8d17686be26..592985a8b19 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java @@ -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.ICBreakpoint; 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.ICEventBreakpoint; 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 ) { try { ICDIBreakpoint b = null; - int breakpointType = ICBreakpointTyped.REGULAR; + int breakpointType = ICBreakpointType.REGULAR; ICBreakpoint icbreakpoint = breakpoints[i]; - if (icbreakpoint instanceof ICBreakpointTyped) { - breakpointType = ((ICBreakpointTyped) icbreakpoint).getType(); + if (icbreakpoint instanceof ICBreakpointType) { + breakpointType = ((ICBreakpointType) icbreakpoint).getType(); } if ( icbreakpoint instanceof ICFunctionBreakpoint ) { ICFunctionBreakpoint breakpoint = (ICFunctionBreakpoint)icbreakpoint; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java index 11a0dcd860d..2190c84d78c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpoint.java @@ -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.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.IResource; 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. */ -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 diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java index 623eca2057c..e8dfd5594ce 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java @@ -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.model.CDebugElementState; 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.ICDebugElementStatus; 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 { try { 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) { - getCDITarget().setLineBreakpoint( ICBreakpointTyped.TEMPORARY, (ICDILineLocation)location, null, false ); + getCDITarget().setLineBreakpoint( ICBreakpointType.TEMPORARY, (ICDILineLocation)location, null, false ); } else if (location instanceof ICDIAddressLocation) { - getCDITarget().setAddressBreakpoint( ICBreakpointTyped.TEMPORARY, (ICDIAddressLocation)location, null, false ); + getCDITarget().setAddressBreakpoint( ICBreakpointType.TEMPORARY, (ICDIAddressLocation)location, null, false ); } else { // ??? targetRequestFailed("not_a_location", null); //$NON-NLS-1$ diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java index 549f2e0aee7..449f412e4ad 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java @@ -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.ICDILineBreakpoint; 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.MIFormat; import org.eclipse.cdt.debug.mi.core.MIPlugin; @@ -424,11 +424,11 @@ public class BreakpointManager extends Manager { } } else { // add the new breakpoint and fire CreatedEvent - int type = ICBreakpointTyped.REGULAR; + int type = ICBreakpointType.REGULAR; if (miBreakpoint.isHardware()) { - type = ICBreakpointTyped.HARDWARE; + type = ICBreakpointType.HARDWARE; } else if (miBreakpoint.isTemporary()) { - type = ICBreakpointTyped.TEMPORARY; + type = ICBreakpointType.TEMPORARY; } String[] tids = null; String tid = miBreakpoint.getThreadId(); @@ -861,7 +861,7 @@ public class BreakpointManager extends Manager { int id = EXCEPTION_THROW_IDX; if (exceptionBps[EXCEPTION_THROW_IDX] == null) { 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); exceptionBps[id] = bp; miBreakpoints = bp.getMIBreakpoints(); @@ -873,7 +873,7 @@ public class BreakpointManager extends Manager { int id = EXCEPTION_THROW_IDX; if (exceptionBps[id] == null) { 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); exceptionBps[id] = bp; if (miBreakpoints != null) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java index cbd63506e06..99b6bebeb86 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Breakpoint.java @@ -16,7 +16,7 @@ import java.util.List; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDICondition; 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.Condition; 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() */ public boolean isHardware() { - return (type == ICBreakpointTyped.HARDWARE); + return (type == ICBreakpointType.HARDWARE); } /** * @see org.eclipse.cdt.debug.core.cdi.ICDIBreakpoint#isTemporary() */ public boolean isTemporary() { - return (type == ICBreakpointTyped.TEMPORARY); + return (type == ICBreakpointType.TEMPORARY); } /** diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java index 7d8f01abe2d..df45548b852 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/EventBreakpoint.java @@ -14,7 +14,7 @@ import java.util.Arrays; import org.eclipse.cdt.debug.core.cdi.ICDICondition; 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; public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint { @@ -29,7 +29,7 @@ public class EventBreakpoint extends Breakpoint implements ICDIEventBreakpoint { private String arg; 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.arg = arg==null?"":arg; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java index ef8638de4f1..a81ec99f7d6 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Exceptionpoint.java @@ -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.model.ICDIExceptionpoint; -import org.eclipse.cdt.debug.core.model.ICBreakpointTyped; +import org.eclipse.cdt.debug.core.model.ICBreakpointType; /** * 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) { - super(target, ICBreakpointTyped.REGULAR, cond, enabled); + super(target, ICBreakpointType.REGULAR, cond, enabled); fClazz = clazz; fStopOnThrow = stopOnThrow; fStopOnCatch = stopOnCatch; diff --git a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/EventBreakpointTests.java b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/EventBreakpointTests.java index 5635693c3c4..c71bd13dd7e 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/EventBreakpointTests.java +++ b/debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/EventBreakpointTests.java @@ -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.ICDIBreakpointManagement3; 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.cdi.model.EventBreakpoint; @@ -55,7 +55,7 @@ public class EventBreakpointTests extends AbstractDebugTest { void setBreakOnMain() throws CDIException { ICDILocation location = null; 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(); pause(); 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(); breakpoints = currentTarget.getBreakpoints(); assertNotNull(breakpoints); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogs/AddEventBreakpointDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogs/AddEventBreakpointDialog.java index f9e3619205f..4d2b25f3957 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogs/AddEventBreakpointDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/dialogs/AddEventBreakpointDialog.java @@ -16,7 +16,7 @@ import java.util.LinkedHashMap; import java.util.Map; 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.internal.core.breakpoints.CEventBreakpoint; import org.eclipse.cdt.debug.internal.ui.propertypages.CBreakpointPreferenceStore; @@ -82,7 +82,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, for (ICBreakpointsUIContribution con : cons) { 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(), parent); getPreferenceStore().setValue(con.getId(),"");