From b78e2165a24b61be42acf33edc2cd80cef274d49 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Mon, 12 Jul 2004 13:56:05 +0000 Subject: [PATCH] 2004-07-12 Alain Magloire Remove some compiler warnings. * cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java * cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java * cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java * mi/org/eclipse/cdt/debug/mi/core/command/CygwinMIEnvirnmentDirectory.java * src/org/eclipse/cdt/debug/mi/core/CygwinGDBDebugger.java * src/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java * src/org/eclipse/cdt/debug/mi/core/MIPlugin.java --- debug/org.eclipse.cdt.debug.mi.core/ChangeLog | 13 +++++++++++++ .../cdt/debug/mi/core/cdi/model/Register.java | 4 ++-- .../eclipse/cdt/debug/mi/core/cdi/model/Thread.java | 2 +- .../cdt/debug/mi/core/cdi/model/Variable.java | 11 +++++------ .../core/command/CygwinMIEnvironmentDirectory.java | 6 +++--- .../cdt/debug/mi/core/CygwinGDBDebugger.java | 5 ----- .../eclipse/cdt/debug/mi/core/GDBTypeParser.java | 2 +- .../src/org/eclipse/cdt/debug/mi/core/MIPlugin.java | 8 ++++---- 8 files changed, 29 insertions(+), 22 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog index 05206cf1f36..f22d5269084 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog @@ -1,3 +1,16 @@ +2004-07-12 Alain Magloire + + Remove some compiler warnings. + + * cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java + * cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java + * cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java + + * mi/org/eclipse/cdt/debug/mi/core/command/CygwinMIEnvirnmentDirectory.java + * src/org/eclipse/cdt/debug/mi/core/CygwinGDBDebugger.java + * src/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java + * src/org/eclipse/cdt/debug/mi/core/MIPlugin.java + 2004-07-09 Alain Magloire Patch from gwatson to deal with Mac diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java index fcd5e54145a..1fff84fda98 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Register.java @@ -67,10 +67,10 @@ public class Register extends Variable implements ICDIRegister { if ((exp.equals("private") || exp.equals("public") || exp.equals("protected"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ fn = getFullName(); } else { - fn = getFullName() + "." + exp; + fn = getFullName() + "." + exp; //$NON-NLS-1$ } } else { - fn = getFullName() + "." + exp; + fn = getFullName() + "." + exp; //$NON-NLS-1$ } RegisterObject regObj = new RegisterObject(getTarget(), exp, fn, getPosition()); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java index 9b460055c6a..bdcac2fe406 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java @@ -71,7 +71,7 @@ public class Thread extends CObject implements ICDIThread { public String toString() { String str = Integer.toString(id); if (name != null) { - str += " " + name; + str += " " + name; //$NON-NLS-1$ } return str; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java index c161e728bf0..e39f0e5f120 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java @@ -98,12 +98,11 @@ public class Variable extends VariableObject implements ICDIVariable { Variable variable = (Variable) children[i]; if (name.equals(variable.getMIVar().getVarName())) { return variable; - } else { - // Look also in the grandchildren. - Variable grandChild = variable.getChild(name); - if (grandChild != null) { - return grandChild; - } + } + // Look also in the grandchildren. + Variable grandChild = variable.getChild(name); + if (grandChild != null) { + return grandChild; } } return null; diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CygwinMIEnvironmentDirectory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CygwinMIEnvironmentDirectory.java index 0d28058a693..2028bb45ef3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CygwinMIEnvironmentDirectory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CygwinMIEnvironmentDirectory.java @@ -25,17 +25,17 @@ public class CygwinMIEnvironmentDirectory extends MIEnvironmentDirectory { for (int i = 0; i < paths.length; i++) { // Use the cygpath utility to convert the path CommandLauncher launcher = new CommandLauncher(); - ByteArrayOutputStream output = new ByteArrayOutputStream(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); launcher.execute( new Path("cygpath"), //$NON-NLS-1$ new String[] { "-u", paths[i] }, //$NON-NLS-1$ new String[0], new Path(".")); //$NON-NLS-1$ - if (launcher.waitAndRead(output, output) != CommandLauncher.OK) + if (launcher.waitAndRead(out, out) != CommandLauncher.OK) newpaths[i] = paths[i]; else - newpaths[i] = output.toString().trim(); + newpaths[i] = out.toString().trim(); } setParameters(newpaths); 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 15b9bb703e0..0d0ea8b34fb 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 @@ -4,20 +4,15 @@ */ package org.eclipse.cdt.debug.mi.core; -import java.util.Collections; -import java.util.List; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDISession; -import org.eclipse.cdt.debug.core.cdi.ICDISharedLibraryManager; import org.eclipse.cdt.debug.mi.core.cdi.Session; -import org.eclipse.cdt.debug.mi.core.cdi.SharedLibraryManager; import org.eclipse.cdt.debug.mi.core.command.CommandFactory; import org.eclipse.cdt.debug.mi.core.command.CygwinCommandFactory; import org.eclipse.cdt.debug.mi.core.command.MIGDBSet; import org.eclipse.cdt.debug.mi.core.output.MIInfo; import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.debug.core.ILaunchConfiguration; diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java index 3a0d1abff7d..8639ff908cc 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBTypeParser.java @@ -60,7 +60,7 @@ public class GDBTypeParser { if (s == null) { s = new String(); } - s = Pattern.compile("\\bconst\\b").matcher(s).replaceAll(""); + s = Pattern.compile("\\bconst\\b").matcher(s).replaceAll(""); //$NON-NLS-1$//$NON-NLS-2$ s = s.trim(); // Initialize. diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java index 55f66e0ed61..d5400d9b96e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java @@ -100,8 +100,8 @@ public class MIPlugin extends Plugin { * @return MISession */ public MISession createMISession(Process process, PTY pty, int type) throws MIException { - MIPlugin plugin = getDefault(); - Preferences prefs = plugin.getPluginPreferences(); + MIPlugin miPlugin = getDefault(); + Preferences prefs = miPlugin.getPluginPreferences(); int timeout = prefs.getInt(IMIConstants.PREF_REQUEST_TIMEOUT); int launchTimeout = prefs.getInt(IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT); return createMISession(process, pty, timeout, type, launchTimeout); @@ -389,8 +389,8 @@ public class MIPlugin extends Plugin { syncStartup.start(); synchronized (pgdb) { - MIPlugin plugin = getDefault(); - Preferences prefs = plugin.getPluginPreferences(); + MIPlugin miPlugin = getDefault(); + Preferences prefs = miPlugin.getPluginPreferences(); int launchTimeout = prefs.getInt(IMIConstants.PREF_REQUEST_LAUNCH_TIMEOUT); while (syncStartup.isAlive()) { try {