From f8dc87532707ca487d1c8d6829129d572fddcc2c Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 26 Nov 2003 16:56:55 +0000 Subject: [PATCH] Cleanup. --- debug/org.eclipse.cdt.debug.mi.core/ChangeLog | 18 ++++++++++++++++++ .../cdt/debug/mi/core/CygwinGDBDebugger.java | 2 +- .../eclipse/cdt/debug/mi/core/GDBDebugger.java | 2 +- .../cdt/debug/mi/core/GDBServerDebugger.java | 2 +- .../debug/mi/core/cdi/BreakpointManager.java | 4 ++-- .../debug/mi/core/cdi/event/ResumedEvent.java | 2 +- .../cdt/debug/mi/core/cdi/model/Target.java | 2 +- .../debug/mi/core/command/MIBreakAfter.java | 2 +- .../mi/core/event/MIFunctionFinishedEvent.java | 2 +- .../core/event/MIInferiorSignalExitEvent.java | 4 ++-- .../cdt/debug/mi/core/event/MISignalEvent.java | 4 ++-- .../core/event/MIWatchpointTriggerEvent.java | 1 - .../core/output/MIGDBShowDirectoriesInfo.java | 2 +- .../output/MIGDBShowSolibSearchPathInfo.java | 2 +- .../cdt/debug/mi/core/output/MIList.java | 2 +- 15 files changed, 34 insertions(+), 17 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog index 5c99f302ee5..9a83b0f04e7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog @@ -1,3 +1,21 @@ +2003-11-26 Mikhail Khodjaiants + Cleanup. + + * src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java + * src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java + * src/org/eclipse/cdt/debug/mi/core/CygwinGDBDebugger.java + * src/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java + * src/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java + * src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java + * src/org/eclipse/cdt/debug/mi/core/command/MIBreakAfter.java + * src/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java + * src/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java + * src/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java + * src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java + * src/org/eclipse/cdt/debug/mi/core/output/MIGDBShowDirectoriesInfo.java + * src/org/eclipse/cdt/debug/mi/core/output/MIGDBShowSolibSearchPathInfo.java + * src/org/eclipse/cdt/debug/mi/core/output/MIList.java + 2003-11-25 Alain Magloire Process the suspend event even if there is not threads diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBDebugger.java index 4a371189762..2a0673121f6 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBDebugger.java @@ -57,7 +57,7 @@ public class CygwinGDBDebugger extends GDBDebugger { if (p.size() > 0) { String[] oldPaths = manager.getSharedLibraryPaths(); String[] paths = new String[oldPaths.length + p.size()]; - System.arraycopy((String[]) p.toArray(new String[p.size()]), 0, paths, 0, p.size()); + System.arraycopy(p.toArray(new String[p.size()]), 0, paths, 0, p.size()); System.arraycopy(oldPaths, 0, paths, p.size(), oldPaths.length); manager.setSharedLibraryPaths(paths); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java index 596142daab2..ad8f071fdc8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBDebugger.java @@ -51,7 +51,7 @@ public class GDBDebugger implements ICDebugger { if (p.size() > 0) { String[] oldPaths = manager.getSharedLibraryPaths(); String[] paths = new String[oldPaths.length + p.size()]; - System.arraycopy((String[])p.toArray(new String[p.size()]), 0, paths, 0, p.size()); + System.arraycopy(p.toArray(new String[p.size()]), 0, paths, 0, p.size()); System.arraycopy(oldPaths, 0, paths, p.size(), oldPaths.length); manager.setSharedLibraryPaths(paths); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java index 96c74584e6e..c168ee6ded8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBServerDebugger.java @@ -59,7 +59,7 @@ public class GDBServerDebugger implements ICDebugger { Session session = null; boolean failed = false; try { - String gdb = config.getAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); + String gdb = config.getAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, "gdb"); File cwd = exe.getProject().getLocation().toFile(); String gdbinit = config.getAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT, ".gdbinit"); if (config.getAttribute(IGDBServerMILaunchConfigurationConstants.ATTR_REMOTE_TCP, false)) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java index b54c7be1206..5b531d9e522 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java @@ -86,7 +86,7 @@ public class BreakpointManager extends SessionObject implements ICDIBreakpointMa } public Breakpoint getBreakpoint(int number) { - Breakpoint[] bkpts = (Breakpoint[]) breakList.toArray(new Breakpoint[0]);; + Breakpoint[] bkpts = (Breakpoint[]) breakList.toArray(new Breakpoint[0]); for (int i = 0; i < bkpts.length; i++) { MIBreakpoint miBreak = bkpts[i].getMIBreakpoint(); if (miBreak.getNumber() == number) { @@ -126,7 +126,7 @@ public class BreakpointManager extends SessionObject implements ICDIBreakpointMa } public void deleteBreakpoint (int no) { - Breakpoint[] points = (Breakpoint[]) breakList.toArray(new Breakpoint[0]);; + Breakpoint[] points = (Breakpoint[]) breakList.toArray(new Breakpoint[0]); for (int i = 0; i < points.length; i++) { if (points[i].getMIBreakpoint().getNumber() == no) { breakList.remove(points[i]); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java index 60d6cbe0419..8c90eda720f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java @@ -33,7 +33,7 @@ public class ResumedEvent implements ICDIResumedEvent { * @see org.eclipse.cdt.debug.core.cdi.event.ICDIResumedEvent#getType() */ public int getType() { - MIRunningEvent running = (MIRunningEvent)event; + MIRunningEvent running = event; int type = running.getType(); int cdiType = 0; switch (type) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java index cb8538311de..1b241562cfa 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java @@ -292,7 +292,7 @@ public class Target implements ICDITarget { Thread th = null; if (currentThreads != null) { for (int i = 0; i < currentThreads.length; i++) { - Thread cthread = (Thread)currentThreads[i]; + Thread cthread = currentThreads[i]; if (cthread.getId() == tid) { th = cthread; break; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIBreakAfter.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIBreakAfter.java index ec13e9e38c9..4db162c6c09 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIBreakAfter.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIBreakAfter.java @@ -22,7 +22,7 @@ public class MIBreakAfter extends MICommand { public MIBreakAfter(int brknum, int count) { super("-break-after",new String[]{Integer.toString(brknum), - Integer.toString(count)});; + Integer.toString(count)}); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java index cbcc21ef075..a30599704b5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java @@ -41,7 +41,7 @@ public class MIFunctionFinishedEvent extends MIStoppedEvent { public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("gdb-result-var=" + gdbResult + "\n");; + buffer.append("gdb-result-var=" + gdbResult + "\n"); buffer.append("return-value=" + returnValue + "\n"); buffer.append("thread-id=").append(getThreadId()).append('\n'); MIFrame f = getFrame(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java index 570cd60c1df..c2fd9bf2c28 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java @@ -47,8 +47,8 @@ public class MIInferiorSignalExitEvent extends MIDestroyedEvent { public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("signal-name=" + sigName + "\n");; - buffer.append("signal-meaning=" + sigMeaning + "\n");; + buffer.append("signal-name=" + sigName + "\n"); + buffer.append("signal-meaning=" + sigMeaning + "\n"); return buffer.toString(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java index 13148fba49b..fbc653b1bfd 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java @@ -42,8 +42,8 @@ public class MISignalEvent extends MIStoppedEvent { public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("signal-name=" + sigName + "\n");; - buffer.append("signal-meaning=" + sigMeaning + "\n");; + buffer.append("signal-name=" + sigName + "\n"); + buffer.append("signal-meaning=" + sigMeaning + "\n"); buffer.append("thread-id=").append(getThreadId()).append('\n'); MIFrame f = getFrame(); if (f != null) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java index 3a9f93b5a4f..70494e47d7f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java @@ -55,7 +55,6 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent { StringBuffer buffer = new StringBuffer(); buffer.append("number=").append(number).append('\n'); buffer.append("expression=" + exp + "\n"); - ; buffer.append("old=" + oldValue + "\n"); buffer.append("new=" + newValue + "\n"); buffer.append("thread-id=").append(getThreadId()).append('\n'); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIGDBShowDirectoriesInfo.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIGDBShowDirectoriesInfo.java index 03534253071..b8755345ac1 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIGDBShowDirectoriesInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIGDBShowDirectoriesInfo.java @@ -53,7 +53,7 @@ public class MIGDBShowDirectoriesInfo extends MIInfo { int count = st.countTokens(); dirs = new String[count]; for (int i = 0; st.hasMoreTokens() && i < count; i++) { - dirs[i] = (String)st.nextToken(); + dirs[i] = st.nextToken(); } } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIGDBShowSolibSearchPathInfo.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIGDBShowSolibSearchPathInfo.java index 413030a030f..41282c0892e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIGDBShowSolibSearchPathInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIGDBShowSolibSearchPathInfo.java @@ -40,7 +40,7 @@ public class MIGDBShowSolibSearchPathInfo extends MIGDBShowInfo { int count = st.countTokens(); dirs = new String[count]; for (int i = 0; st.hasMoreTokens() && i < count; i++) { - dirs[i] = (String)st.nextToken(); + dirs[i] = st.nextToken(); } } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIList.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIList.java index 54c84c21fae..262100851b4 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIList.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/output/MIList.java @@ -12,7 +12,7 @@ public class MIList extends MIValue { final static MIResult[] nullResults = new MIResult[0]; final static MIValue[] nullValues = new MIValue[0]; - MIResult[] results = nullResults;; + MIResult[] results = nullResults; MIValue[] values = nullValues; public MIResult[] getMIResults() {