From 9e3779f05c234e9fa183c3e1953c474ae188b5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 4 Jan 2024 10:11:52 +0200 Subject: [PATCH] Various warning fixes in debug examples Reduces compiler warnings in workspace and I-build reports. --- .../examples/pdavm/PDAVirtualMachine.java | 80 ++++++++----------- .../core/pda/model/PDADebugTarget.java | 23 +++--- .../memory/core/SampleDebugTarget.java | 2 +- .../memory/core/SampleMemoryBlock.java | 57 +++++-------- .../internal/memory/engine/SampleEngine.java | 37 ++++----- .../pda/adapters/PDAThreadEventHandler.java | 10 +-- 6 files changed, 91 insertions(+), 118 deletions(-) diff --git a/debug/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java b/debug/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java index 0eee77278db..60922b11532 100644 --- a/debug/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java +++ b/debug/org.eclipse.debug.examples.core/pdavm/src/org/eclipse/debug/examples/pdavm/PDAVirtualMachine.java @@ -496,8 +496,8 @@ void run() { PDAThread[] threadsCopy = fThreads.values().toArray(new PDAThread[fThreads.size()]); allThreadsSuspended = true; - for (int i = 0; i < threadsCopy.length; i++) { - PDAThread thread = threadsCopy[i]; + for (PDAThread element : threadsCopy) { + PDAThread thread = element; if (thread.fSuspend == null) { allThreadsSuspended = false; @@ -562,33 +562,33 @@ void doOneInstruction(PDAThread thread, String instr) { boolean opValid = true; if (op.equals("add")) { //$NON-NLS-1$ - iAdd(thread, args); + iAdd(thread); } else if (op.equals("branch_not_zero")) { //$NON-NLS-1$ iBranchNotZero(thread, args); } else if (op.equals("call")) { //$NON-NLS-1$ iCall(thread, args); } else if (op.equals("dec")) { //$NON-NLS-1$ - iDec(thread, args); + iDec(thread); } else if (op.equals("def")) { //$NON-NLS-1$ - iDef(thread, args); + iDef(args); } else if (op.equals("dup")) { //$NON-NLS-1$ - iDup(thread, args); + iDup(thread); } else if (op.equals("exec")) { //$NON-NLS-1$ iExec(thread, args); } else if (op.equals("halt")) { //$NON-NLS-1$ - iHalt(thread, args); + iHalt(thread); } else if (op.equals("output")) { //$NON-NLS-1$ - iOutput(thread, args); + iOutput(thread); } else if (op.equals("pop")) { //$NON-NLS-1$ iPop(thread, args); } else if (op.equals("push")) { //$NON-NLS-1$ iPush(thread, args); } else if (op.equals("return")) { //$NON-NLS-1$ - iReturn(thread, args); + iReturn(thread); } else if (op.equals("var")) { //$NON-NLS-1$ iVar(thread, args); } else if (op.equals("xyzzy")) { //$NON-NLS-1$ - iInternalEndEval(thread, args); + iInternalEndEval(thread); } else if (op.startsWith(":")) {} // label //$NON-NLS-1$ else if (op.startsWith("#")) {} // comment //$NON-NLS-1$ else { @@ -614,8 +614,7 @@ else if (op.startsWith("#")) {} // comment //$NON-NLS-1$ void checkForBreakpoint() { if (fDebug) { - for (Iterator itr = fThreads.values().iterator(); itr.hasNext();) { - PDAThread thread = itr.next(); + for (PDAThread thread : fThreads.values()) { Integer pc = Integer.valueOf(thread.fCurrentFrame.fPC); // Suspend for breakpoint if: // - the VM is not yet set to suspend, for e.g. as a result of step end, @@ -669,8 +668,7 @@ void debugUI() { // Clear all stepping flags. In case the VM suspended while // a step operation was being performed for the VM or some thread. fStepVM = fStepReturnVM = false; - for (Iterator itr = fThreads.values().iterator(); itr.hasNext();) { - PDAThread thread = itr.next(); + for (PDAThread thread : fThreads.values()) { thread.fSuspend = null; thread.fStep = thread.fStepReturn = thread.fPerformingEval = false; } @@ -722,7 +720,7 @@ void processDebugCommand(String line) { } else if ("frame".equals(command)) { //$NON-NLS-1$ debugFrame(args); } else if ("groups".equals(command)) { //$NON-NLS-1$ - debugGroups(args); + debugGroups(); } else if ("popdata".equals(command)) { //$NON-NLS-1$ debugPopData(args); } else if ("pushdata".equals(command)) { //$NON-NLS-1$ @@ -730,7 +728,7 @@ void processDebugCommand(String line) { } else if ("registers".equals(command)) { //$NON-NLS-1$ debugRegisters(args); } else if ("restart".equals(command)) { //$NON-NLS-1$ - debugRestart(args); + debugRestart(); } else if ("resume".equals(command)) { //$NON-NLS-1$ debugResume(args); } else if ("set".equals(command)) { //$NON-NLS-1$ @@ -783,8 +781,7 @@ void debugChildren(Args args) { String varDot = var + "."; //$NON-NLS-1$ List children = new ArrayList<>(); - for (Iterator itr = frame.fLocalVariables.keySet().iterator(); itr.hasNext();) { - String localVar = itr.next(); + for (String localVar : frame.fLocalVariables.keySet()) { if (localVar.startsWith(varDot) && localVar.indexOf('.', varDot.length() + 1) == -1) { children.add(localVar); } @@ -932,10 +929,9 @@ void debugFrame(Args args) { sendCommandResponse(printFrame(frame) + "\n"); //$NON-NLS-1$ } - void debugGroups(Args args) { + void debugGroups() { TreeSet groups = new TreeSet<>(); - for (Iterator itr = fRegisters.values().iterator(); itr.hasNext();) { - Register reg = itr.next(); + for (Register reg : fRegisters.values()) { groups.add(reg.fGroup); } StringBuilder response = new StringBuilder(); @@ -974,14 +970,12 @@ void debugRegisters(Args args) { String group = args.getNextStringArg(); StringBuilder response = new StringBuilder(); - for (Iterator itr = fRegisters.values().iterator(); itr.hasNext();) { - Register reg = itr.next(); + for (Register reg : fRegisters.values()) { if (group.equals(reg.fGroup)) { response.append(reg.fName); response.append(' '); response.append(reg.fIsWriteable); - for (Iterator itr2 = reg.fBitFields.values().iterator(); itr2.hasNext();) { - BitField bitField = itr2.next(); + for (BitField bitField : reg.fBitFields.values()) { response.append('|'); response.append(bitField.fName); response.append(' '); @@ -989,8 +983,7 @@ void debugRegisters(Args args) { response.append(' '); response.append(bitField.fBitCount); response.append(' '); - for (Iterator> itr3 = bitField.fMnemonics.entrySet().iterator(); itr3.hasNext();) { - Entry mnemonicEntry = itr3.next(); + for (Entry mnemonicEntry : bitField.fMnemonics.entrySet()) { response.append(mnemonicEntry.getKey()); response.append(' '); response.append(mnemonicEntry.getValue()); @@ -1005,11 +998,10 @@ void debugRegisters(Args args) { sendCommandResponse(response.toString()); } - void debugRestart(Args args) { + void debugRestart() { fSuspendVM = "restart"; //$NON-NLS-1$ - for (Iterator itr = fThreads.keySet().iterator(); itr.hasNext();) { - Integer id = itr.next(); + for (Integer id : fThreads.keySet()) { sendDebugEvent("exited " + id, false); //$NON-NLS-1$ } fThreads.clear(); @@ -1101,8 +1093,7 @@ void debugStack(Args args) { StringBuilder result = new StringBuilder(); - for (Iterator itr = thread.fFrames.iterator(); itr.hasNext();) { - Frame frame = itr.next(); + for (Frame frame : thread.fFrames) { result.append(printFrame(frame)); result.append('#'); } @@ -1132,8 +1123,7 @@ private String printFrame(Frame frame) { buf.append(frame.fPC); buf.append('|'); buf.append(frame.fFunction); - for (Iterator itr = frame.fLocalVariables.keySet().iterator(); itr.hasNext();) { - String var = itr.next(); + for (String var : frame.fLocalVariables.keySet()) { if (var.indexOf('.') == -1) { buf.append('|'); buf.append(var); @@ -1287,12 +1277,12 @@ void debugWatch(Args args) { sendCommandResponse("ok\n"); //$NON-NLS-1$ } - void iAdd(PDAThread thread, Args args) { + void iAdd(PDAThread thread) { Object val1 = thread.fStack.pop(); Object val2 = thread.fStack.pop(); - if (val1 instanceof Integer && val2 instanceof Integer) { - int intVal1 = ((Integer) val1).intValue(); - int intVal2 = ((Integer) val2).intValue(); + if (val1 instanceof Integer int1 && val2 instanceof Integer int2) { + int intVal1 = int1.intValue(); + int intVal2 = int2.intValue(); thread.fStack.push( Integer.valueOf(intVal1 + intVal2) ); } else { thread.fStack.push( Integer.valueOf(-1) ); @@ -1330,7 +1320,7 @@ void iCall(PDAThread thread, Args args) { } } - void iDec(PDAThread thread, Args args) { + void iDec(PDAThread thread) { Object val = thread.fStack.pop(); if (val instanceof Integer) { val = Integer.valueOf(((Integer) val).intValue() - 1); @@ -1338,7 +1328,7 @@ void iDec(PDAThread thread, Args args) { thread.fStack.push(val); } - void iDef(PDAThread thread, Args args) { + void iDef(Args args) { String type = args.getNextStringArg(); String name = args.getNextStringArg(); @@ -1390,7 +1380,7 @@ private String getBitFieldPartOfName(String name) { return null; } - void iDup(PDAThread thread, Args args) { + void iDup(PDAThread thread) { Object val = thread.fStack.pop(); thread.fStack.push(val); thread.fStack.push(val); @@ -1411,11 +1401,11 @@ void iExec(PDAThread thread, Args args) { } } - void iHalt(PDAThread thread, Args args) { + void iHalt(PDAThread thread) { thread.fRun = false; } - void iOutput(PDAThread thread, Args args) { + void iOutput(PDAThread thread) { System.out.println(thread.fStack.pop()); } @@ -1467,7 +1457,7 @@ void iPush(PDAThread thread, Args args) { } } - void iReturn(PDAThread thread, Args args) { + void iReturn(PDAThread thread) { if (!thread.fFrames.isEmpty()) { thread.fCurrentFrame = thread.fFrames.remove(thread.fFrames.size() - 1); } else { @@ -1482,7 +1472,7 @@ void iVar(PDAThread thread, Args args) { thread.fCurrentFrame.set(var, Integer.valueOf(0)); } - void iInternalEndEval(PDAThread thread, Args args) { + void iInternalEndEval(PDAThread thread) { Object result = thread.fStack.pop(); thread.fThreadCode = fCode; thread.fThreadLabels = fLabels; diff --git a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java index e94cbd24f9c..d663bdcfff5 100644 --- a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java +++ b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java @@ -235,8 +235,7 @@ public boolean supportsBreakpoint(IBreakpoint breakpoint) { String program = getLaunch().getLaunchConfiguration().getAttribute(DebugCorePlugin.ATTR_PDA_PROGRAM, (String)null); if (program != null) { IResource resource = null; - if (breakpoint instanceof PDARunToLineBreakpoint) { - PDARunToLineBreakpoint rtl = (PDARunToLineBreakpoint) breakpoint; + if (breakpoint instanceof PDARunToLineBreakpoint rtl) { resource = rtl.getSourceFile(); } else { IMarker marker = breakpoint.getMarker(); @@ -375,7 +374,7 @@ public IMemoryBlock getMemoryBlock(long startAddress, long length) throws DebugE * Notification we have connected to the VM and it has started. * Resume the VM. */ - private void vmStarted(PDAVMStartedEvent event) { + private void vmStarted() { fireCreationEvent(); installDeferredBreakpoints(); try { @@ -496,18 +495,18 @@ public void breakpointManagerEnablementChanged(boolean enabled) { @Override public void handleEvent(PDAEvent event) { - if (event instanceof PDAStartedEvent) { - started((PDAStartedEvent)event); - } else if (event instanceof PDAExitedEvent) { - exited((PDAExitedEvent)event); + if (event instanceof PDAStartedEvent startedEvent) { + started(startedEvent); + } else if (event instanceof PDAExitedEvent exitedEvent) { + exited(exitedEvent); } else if (event instanceof PDAVMStartedEvent) { - vmStarted((PDAVMStartedEvent)event); + vmStarted(); } else if (event instanceof PDAVMTerminatedEvent) { vmTerminated(); - } else if (event instanceof PDAVMSuspendedEvent) { - vmSuspended((PDAVMSuspendedEvent)event); - } else if (event instanceof PDAVMResumedEvent) { - vmResumed((PDAVMResumedEvent)event); + } else if (event instanceof PDAVMSuspendedEvent suspendedEvent) { + vmSuspended(suspendedEvent); + } else if (event instanceof PDAVMResumedEvent resumedEvent) { + vmResumed(resumedEvent); } } diff --git a/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleDebugTarget.java b/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleDebugTarget.java index 540181d6b2e..c81a7466bbe 100644 --- a/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleDebugTarget.java +++ b/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleDebugTarget.java @@ -217,7 +217,7 @@ public String getModelIdentifier() { public IMemoryBlockExtension getExtendedMemoryBlock(String expression, Object context) throws DebugException { // ask debug engine for an address - BigInteger address = getEngine().evaluateExpression(expression, context); + BigInteger address = getEngine().evaluateExpression(expression); // if address can be evaluated to an address, create memory block if (address != null) { diff --git a/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleMemoryBlock.java b/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleMemoryBlock.java index b9b0a616774..d25eb137da2 100644 --- a/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleMemoryBlock.java +++ b/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/core/SampleMemoryBlock.java @@ -16,7 +16,6 @@ import java.math.BigInteger; import java.util.ArrayList; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugEvent; @@ -57,22 +56,18 @@ public SampleMemoryBlock(SampleDebugTarget debugTarget, String expression, BigIn @Override public BigInteger getBigBaseAddress() throws DebugException { - fBaseAddress = fDebugTarget.getEngine().evaluateExpression(fExpression, null); + fBaseAddress = fDebugTarget.getEngine().evaluateExpression(fExpression); return fBaseAddress; } @Override public boolean supportBaseAddressModification() throws DebugException { - return fDebugTarget.getEngine().suppostsBaseAddressModification(this); + return fDebugTarget.getEngine().suppostsBaseAddressModification(); } @Override public void setBaseAddress(BigInteger address) throws DebugException { - try { fDebugTarget.getEngine().setBaseAddress(this, address); - } catch (CoreException e) { - throw new DebugException(e.getStatus()); - } } @Override @@ -84,29 +79,25 @@ synchronized public MemoryByte[] getBytesFromOffset(BigInteger offset, long leng @Override public MemoryByte[] getBytesFromAddress(BigInteger address, long length) throws DebugException { - try { - MemoryByte[] bytes = new MemoryByte[(int) length * fDebugTarget.getEngine().getAddressableSize()]; - BigInteger addressCnt = address; - int lengthCnt = (int) length; - int i = 0; - - // asks engine to get bytes from address - MemoryByte[] engineBytes = fDebugTarget.getEngine().getBytesFromAddress(addressCnt, lengthCnt); - System.arraycopy(engineBytes, 0, bytes, i, engineBytes.length); - - // if engine did not return enough memory, pad with dummy memory - for (int j = i + engineBytes.length; j < bytes.length; j++) { - MemoryByte mb = new MemoryByte((byte) 0); - mb.setReadable(false); - mb.setWritable(false); - mb.setBigEndian(fDebugTarget.getEngine().isBigEndian(address.add(BigInteger.valueOf(j)))); - bytes[j] = mb; - } - - return bytes; - } catch (RuntimeException e) { - throw e; + MemoryByte[] bytes = new MemoryByte[(int) length * fDebugTarget.getEngine().getAddressableSize()]; + BigInteger addressCnt = address; + int lengthCnt = (int) length; + int i = 0; + + // asks engine to get bytes from address + MemoryByte[] engineBytes = fDebugTarget.getEngine().getBytesFromAddress(addressCnt, lengthCnt); + System.arraycopy(engineBytes, 0, bytes, i, engineBytes.length); + + // if engine did not return enough memory, pad with dummy memory + for (int j = i + engineBytes.length; j < bytes.length; j++) { + MemoryByte mb = new MemoryByte((byte) 0); + mb.setReadable(false); + mb.setWritable(false); + mb.setBigEndian(fDebugTarget.getEngine().isBigEndian(address.add(BigInteger.valueOf(j)))); + bytes[j] = mb; } + + return bytes; } @Override @@ -172,7 +163,7 @@ public byte[] getBytes() throws DebugException { @Override public boolean supportsValueModification() { - return fDebugTarget.getEngine().supportsValueModification(this); + return fDebugTarget.getEngine().supportsValueModification(); } @Override @@ -258,11 +249,7 @@ public int getAddressableSize() throws DebugException { @Override public int getAddressSize() throws DebugException { - try { - return fDebugTarget.getEngine().getAddressSize(); - } catch (CoreException e) { - throw new DebugException(e.getStatus()); - } + return fDebugTarget.getEngine().getAddressSize(); } @Override diff --git a/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleEngine.java b/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleEngine.java index 065730b1cd4..7d55a907abf 100644 --- a/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleEngine.java +++ b/debug/org.eclipse.debug.examples.memory/src/org/eclipse/debug/examples/internal/memory/engine/SampleEngine.java @@ -15,11 +15,10 @@ package org.eclipse.debug.examples.internal.memory.engine; import java.math.BigInteger; -import java.util.Enumeration; -import java.util.Hashtable; +import java.util.HashMap; +import java.util.Map; import java.util.Random; -import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.model.MemoryByte; import org.eclipse.debug.examples.internal.memory.core.SampleDebugTarget; import org.eclipse.debug.examples.internal.memory.core.SampleMemoryBlock; @@ -35,10 +34,10 @@ public class SampleEngine { Random fRandom = new Random(); byte[] fMemory; - Hashtable memoryBlockTable; - Hashtable expressionAddressTable = new Hashtable<>(); - Hashtable threadTable = new Hashtable<>(); - Hashtable stackframeTable = new Hashtable<>(); + Map memoryBlockTable; + Map expressionAddressTable = new HashMap<>(); + Map threadTable = new HashMap<>(); + Map stackframeTable = new HashMap<>(); Random random = new Random(); @@ -47,11 +46,11 @@ public class SampleEngine { * * @return memory byte from an address */ - synchronized public MemoryByte[] getBytesFromAddress(BigInteger address, long length) throws RuntimeException { + public synchronized MemoryByte[] getBytesFromAddress(BigInteger address, long length) { if (memoryBlockTable == null) { // create new memoryBlock table - memoryBlockTable = new Hashtable<>(); + memoryBlockTable = new HashMap<>(); byte[] bytes = new byte[(int) length * getAddressableSize()]; BigInteger addressKey = address; @@ -128,25 +127,23 @@ public void resume() { * Convenience function to cause changes in a memoryBlock block. Changes * could result from running the program, changing a variable, etc. */ - synchronized public void changeValue() { + public synchronized void changeValue() { if (memoryBlockTable == null) { return; } - Enumeration enumeration = memoryBlockTable.keys(); long randomChange = random.nextInt(37); while (randomChange <= 5) { randomChange = random.nextInt(37); } - while (enumeration.hasMoreElements()) { - BigInteger key = enumeration.nextElement(); + for (BigInteger key : memoryBlockTable.keySet()) { if (key.remainder(BigInteger.valueOf(randomChange)).equals(BigInteger.ZERO)) { byte[] x = new byte[getAddressableSize()]; random.nextBytes(x); - MemoryByte unitBytes[] = new MemoryByte[getAddressableSize()]; + MemoryByte[] unitBytes = new MemoryByte[getAddressableSize()]; for (int i = 0; i < x.length; i++) { MemoryByte oneByte = new MemoryByte(); oneByte.setValue(x[i]); @@ -185,7 +182,7 @@ synchronized public void changeValue() { * * @return the address the expression is evaluated to */ - public BigInteger evaluateExpression(String expression, Object evalContext) { + public BigInteger evaluateExpression(String expression) { BigInteger expAddress = expressionAddressTable.get(expression); if (expAddress == null) { int address = random.nextInt(); @@ -213,7 +210,7 @@ public boolean supportsStorageRetrieval() { /** * Simulates modifying memory using BigInteger as the address */ - public void setValue(BigInteger address, byte[] bytes) throws RuntimeException { + public void setValue(BigInteger address, byte[] bytes) { BigInteger convertedAddress = address; for (int i = 0; i < bytes.length; i = i + getAddressableSize()) { @@ -309,7 +306,7 @@ private SampleStackFrame[] createStackframes(SampleThread thread) { * @return true if memory block is to support base address modification, * false otherwise */ - public boolean suppostsBaseAddressModification(SampleMemoryBlock mb) { + public boolean suppostsBaseAddressModification() { return false; } @@ -319,21 +316,21 @@ public boolean suppostsBaseAddressModification(SampleMemoryBlock mb) { * @param mb the memory block to change base address * @param address the new base address of the memory block */ - public void setBaseAddress(SampleMemoryBlock mb, BigInteger address) throws CoreException { + public void setBaseAddress(SampleMemoryBlock mb, BigInteger address) { } /** * @return true if this memory block supports value modification, false * otherwise */ - public boolean supportsValueModification(SampleMemoryBlock mb) { + public boolean supportsValueModification() { return true; } /** * @return address size of the debuggee */ - public int getAddressSize() throws CoreException { + public int getAddressSize() { return 4; } } diff --git a/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java b/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java index 957cd11aab1..484645d4c4a 100644 --- a/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java +++ b/debug/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/pda/adapters/PDAThreadEventHandler.java @@ -65,17 +65,17 @@ private boolean isEqual(Object o1, Object o2) { @Override protected void handleResume(DebugEvent event) { IThread thread = (IThread) event.getSource(); - fireDeltaAndClearTopFrame(thread, IModelDelta.STATE | IModelDelta.CONTENT); + fireDeltaAndClearTopFrame(thread); } @Override protected void handleCreate(DebugEvent event) { - fireDeltaAndClearTopFrame((IThread) event.getSource(), IModelDelta.ADDED); + fireDeltaAndClearTopFrame((IThread) event.getSource()); } @Override protected void handleTerminate(DebugEvent event) { - fireDeltaAndClearTopFrame((IThread) event.getSource(), IModelDelta.REMOVED); + fireDeltaAndClearTopFrame((IThread) event.getSource()); } @Override @@ -92,7 +92,7 @@ protected void handleLateSuspend(DebugEvent suspend, DebugEvent resume) { @Override protected void handleSuspendTimeout(DebugEvent event) { IThread thread = (IThread) event.getSource(); - fireDeltaAndClearTopFrame(thread, IModelDelta.CONTENT); + fireDeltaAndClearTopFrame(thread); } private ModelDelta buildRootDelta() { @@ -116,7 +116,7 @@ protected ModelDelta addTarget(ModelDelta delta, IThread thread) { return newdelta.addNode(debugTarget, indexOf(children, debugTarget), IModelDelta.NO_CHANGE, numFrames); } - private void fireDeltaAndClearTopFrame(IThread thread, int flags) { + private void fireDeltaAndClearTopFrame(IThread thread) { ModelDelta delta = buildRootDelta(); addTarget(delta, thread); synchronized (this) {