diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java index edabd741fac..98b63b4d09a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HoldsOptions.java @@ -549,9 +549,9 @@ public abstract class HoldsOptions extends BuildObject implements IHoldsOptions, IStatus.ERROR, ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.OK, - "Cannot get OptionToSet for option " + - option.getId() + " @ holder " + - option.getOptionHolder().getId() + "\nI'm holder " + + "Cannot get OptionToSet for option " + //$NON-NLS-1$ + option.getId() + " @ holder " + //$NON-NLS-1$ + option.getOptionHolder().getId() + "\nI'm holder " + //$NON-NLS-1$ getId(), null) ); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedCommandLineGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedCommandLineGenerator.java index d96033ece98..e68ab77b50f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedCommandLineGenerator.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedCommandLineGenerator.java @@ -35,7 +35,7 @@ public class ManagedCommandLineGenerator implements public final String EMPTY = ""; //$NON-NLS-1$ public final String VAR_FIRST_CHAR = "$"; //$NON-NLS-1$ - public final char VAR_SECOND_CHAR = '{'; //$NON-NLS-1$ + public final char VAR_SECOND_CHAR = '{'; public final String VAR_FINAL_CHAR = "}"; //$NON-NLS-1$ public final String CLASS_PROPERTY_PREFIX = "get"; //$NON-NLS-1$ @@ -115,7 +115,7 @@ public class ManagedCommandLineGenerator implements { // if the input resource isn't a variable then quote it if(inputResources[k].indexOf("$(") != 0) //$NON-NLS-1$ - tempBuffer.append(DOUBLE_QUOTE + inputResources[k] + DOUBLE_QUOTE + WHITESPACE); //$NON-NLS-1$ //$NON-NLS-2$ + tempBuffer.append(DOUBLE_QUOTE + inputResources[k] + DOUBLE_QUOTE + WHITESPACE); else tempBuffer.append(inputResources[k] + WHITESPACE); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MultiFileInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MultiFileInfo.java index 01df1a52816..2119a5357be 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MultiFileInfo.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/MultiFileInfo.java @@ -88,7 +88,7 @@ public class MultiFileInfo extends MultiResourceInfo implements IFileInfo { * @see org.eclipse.cdt.managedbuilder.core.IResourceConfiguration#removeTool(org.eclipse.cdt.managedbuilder.core.ITool) */ public void removeTool(ITool tool) { - System.out.println("MultiFileInfo.removeTool() does not work OK !"); + System.out.println("MultiFileInfo.removeTool() does not work OK !"); //$NON-NLS-1$ for (IResourceInfo ri : fRis) { if (ri instanceof IFileInfo) { IFileInfo fi = (IFileInfo)ri; @@ -125,7 +125,7 @@ public class MultiFileInfo extends MultiResourceInfo implements IFileInfo { * @see org.eclipse.cdt.managedbuilder.core.IResourceConfiguration#setToolCommand(org.eclipse.cdt.managedbuilder.core.ITool, java.lang.String) */ public void setToolCommand(ITool tool, String command) { - System.out.println("MultiFileInfo.setToolCommand() does not work OK !"); + System.out.println("MultiFileInfo.setToolCommand() does not work OK !"); //$NON-NLS-1$ for (IResourceInfo ri : fRis) { if (ri instanceof IFileInfo) { IFileInfo fi = (IFileInfo)ri; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java index 8e69af018d4..fafd0af6e36 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java @@ -192,7 +192,7 @@ public class ProjectType extends BuildObject implements IProjectType, IBuildProp } // Is this a test project type - String isTestStr = element.getAttribute(IS_TEST); //$NON-NLS-1$ + String isTestStr = element.getAttribute(IS_TEST); if (isTestStr != null){ isTest = new Boolean("true".equals(isTestStr)); //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildLanguageData.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildLanguageData.java index db71c961873..676147ad7a7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildLanguageData.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildLanguageData.java @@ -77,7 +77,7 @@ public class BuildLanguageData extends CLanguageData { // typeId = extType.getId(); // else // typeId = inType.getId(); - fId = inType.getId();//new StringBuffer(fTool.getId()).append(".").append(typeId).toString(); //$NON-NLS-1$ + fId = inType.getId();//new StringBuffer(fTool.getId()).append(".").append(typeId).toString(); } else { fInputType = null; fId = new StringBuffer(fTool.getId()).append(".").append("languagedata").toString(); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java index 0e1b5ddb08f..755dcb9c3e0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java @@ -96,7 +96,7 @@ public class FileInfoModification extends IFolderInfo parentFo = rcInfo.getParentFolderInfo(); String ext = rcInfo.getPath().getFileExtension(); if(ext == null) - ext = ""; + ext = ""; //$NON-NLS-1$ ITool tool = parentFo.getToolFromInputExtension(ext); ITool realTool = ManagedBuildManager.getRealTool(tool); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java index e4bfebe7532..2788b0f0358 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java @@ -1562,8 +1562,8 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 { if (buildTargetExt.length() > 0) { completeBuildTargetName = completeBuildTargetName + DOT + buildTargetExt; } - if (completeBuildTargetName.contains(" ")) { - buffer.append(WHITESPACE + "\"" + completeBuildTargetName + "\""); + if (completeBuildTargetName.contains(" ")) { //$NON-NLS-1$ + buffer.append(WHITESPACE + "\"" + completeBuildTargetName + "\""); //$NON-NLS-1$ //$NON-NLS-2$ } else { buffer.append(WHITESPACE + completeBuildTargetName); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java index 341bc4438e0..d6af00889d2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java @@ -609,7 +609,7 @@ class UpdateManagedProject12 { continue; try{ - Integer.decode(curToolId.substring(curToolId.lastIndexOf('.')+1)); //$NON-NLS-1$ + Integer.decode(curToolId.substring(curToolId.lastIndexOf('.')+1)); } catch(IndexOutOfBoundsException e){ continue; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java index 9365efc4e48..069303ea854 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java @@ -334,7 +334,7 @@ class UpdateManagedProject20 { continue; try{ - Integer.decode(curToolId.substring(curToolId.lastIndexOf('.')+1)); //$NON-NLS-1$ + Integer.decode(curToolId.substring(curToolId.lastIndexOf('.')+1)); } catch(IndexOutOfBoundsException e){ continue; diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/templates/SimpleMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/templates/SimpleMakefileGenerator.java index 6dde9a9aab3..20f467190fc 100644 --- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/templates/SimpleMakefileGenerator.java +++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/templates/SimpleMakefileGenerator.java @@ -77,7 +77,7 @@ public class SimpleMakefileGenerator extends ProcessRunner { } Map macros = new HashMap(template.getValueStore()); - macros.put("exe", Platform.getOS().equals(Platform.OS_WIN32) ? ".exe" : ""); //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ + macros.put("exe", Platform.getOS().equals(Platform.OS_WIN32) ? ".exe" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ fileContents = replaceMacros(fileContents, macros); contents = new ByteArrayInputStream(fileContents.getBytes()); @@ -95,8 +95,8 @@ public class SimpleMakefileGenerator extends ProcessRunner { } } - private static final String START = "{{"; - private static final String END = "}}"; + private static final String START = "{{"; //$NON-NLS-1$ + private static final String END = "}}"; //$NON-NLS-1$ private String replaceMacros(String fileContents, Map valueStore) { StringBuffer buffer = new StringBuffer(fileContents); 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 11e1f0e8f0c..b0b78048e13 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 @@ -230,7 +230,7 @@ public class CDebugUtils { TransformerFactory factory = TransformerFactory.newInstance(); Transformer transformer = factory.newTransformer(); transformer.setOutputProperty( OutputKeys.METHOD, "xml" ); //$NON-NLS-1$ - transformer.setOutputProperty( OutputKeys.INDENT, indent ? "yes" : "no" ); //$NON-NLS-1$ + transformer.setOutputProperty( OutputKeys.INDENT, indent ? "yes" : "no" ); //$NON-NLS-1$ //$NON-NLS-2$ DOMSource source = new DOMSource( doc ); StreamResult outputTarget = new StreamResult( s ); transformer.transform( source, outputTarget ); @@ -461,7 +461,7 @@ public class CDebugUtils { private static void appendWatchRange( ICWatchpoint2 watchpoint, StringBuffer label ) throws CoreException { String range = watchpoint.getRange().toString(); - if ( range.length() > 0 && !range.equals( "0" ) ) { + if ( range.length() > 0 && !range.equals( "0" ) ) { //$NON-NLS-1$ label.append( ' ' ); label.append( MessageFormat.format( DebugCoreMessages.getString( "CDebugUtils.7" ), new String[]{ range } ) ); //$NON-NLS-1$ } @@ -469,17 +469,17 @@ public class CDebugUtils { protected static StringBuffer appendBreakpointType( ICBreakpoint breakpoint, StringBuffer label ) throws CoreException { if (breakpoint instanceof ICBreakpointType) { - String typeString = ""; + String typeString = ""; //$NON-NLS-1$ int type = ((ICBreakpointType) breakpoint).getType(); // Need to filter out the TEMPORARY bit-flag to get the real type // The REGULAR type is implicit so we don't report that. switch (type & ~ICBreakpointType.TEMPORARY) { case ICBreakpointType.HARDWARE: - typeString = DebugCoreMessages.getString("CDebugUtils.Hardware"); + typeString = DebugCoreMessages.getString("CDebugUtils.Hardware"); //$NON-NLS-1$ break; case ICBreakpointType.SOFTWARE: - typeString = DebugCoreMessages.getString("CDebugUtils.Software"); + typeString = DebugCoreMessages.getString("CDebugUtils.Software"); //$NON-NLS-1$ break; } @@ -488,9 +488,9 @@ public class CDebugUtils { // here as a just-in-case. if ((type & ICBreakpointType.TEMPORARY) != 0) { if (typeString.length() > 0) { - typeString += "/"; + typeString += "/"; //$NON-NLS-1$ } - typeString += DebugCoreMessages.getString("CDebugUtils.Temporary"); + typeString += DebugCoreMessages.getString("CDebugUtils.Temporary"); //$NON-NLS-1$ } if (typeString.length() > 0) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java index 1df5de7c943..43c8750a0db 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java @@ -103,7 +103,7 @@ public class BreakpointActionManager { if (breakpoint != null) { IMarker marker = breakpoint.getMarker(); String actionNames = marker.getAttribute(BREAKPOINT_ACTION_ATTRIBUTE, ""); //$NON-NLS-1$ - final String[] actions = actionNames.split(","); + final String[] actions = actionNames.split(","); //$NON-NLS-1$ if (actions.length > 0){ Job job = new Job("Execute breakpoint actions") { public IStatus run(final IProgressMonitor monitor) { 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 cd5214808a5..531c58b6dac 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 @@ -1185,7 +1185,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana ILineBreakpoint l = (ILineBreakpoint) breakpoint; line = l.getLineNumber(); } - int oldLine = ( delta != null ) ? delta.getAttribute( IMarker.LINE_NUMBER, 0 ) : 0; //$NON-NLS-1$ + int oldLine = ( delta != null ) ? delta.getAttribute( IMarker.LINE_NUMBER, 0 ) : 0; boolean basic = oldLine>0 && oldLine != line; if (basic) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java index f9650e291a3..d589031e42d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugAdapter.java @@ -92,7 +92,7 @@ public class CDebugAdapter implements ICDIDebugger { String format = "{0} ({1})"; //$NON-NLS-1$ String timestamp = DateFormat.getInstance().format(new Date(System.currentTimeMillis())); String message = InternalDebugCoreMessages.getString("CDebugAdapter.1"); //$NON-NLS-1$ - return MessageFormat.format(format, new String[]{message, timestamp}); //$NON-NLS-1$ + return MessageFormat.format(format, new String[]{message, timestamp}); } protected void abort(String message, Throwable exception, int code) throws CoreException { 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 9a0732770b9..26da7616058 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 @@ -383,20 +383,20 @@ public abstract class CBreakpoint extends Breakpoint implements ICBreakpoint, IC IConfigurationElement[] elements = ep.getConfigurationElements(); for (int i= 0; i < elements.length; i++) { if ( elements[i].getName().equals(CDebugCorePlugin.BREAKPOINT_EXTENSION_ELEMENT) ) { - String elementDebugModelId = elements[i].getAttribute("debugModelId"); - String elementMarkerType = elements[i].getAttribute("markerType"); + String elementDebugModelId = elements[i].getAttribute("debugModelId"); //$NON-NLS-1$ + String elementMarkerType = elements[i].getAttribute("markerType"); //$NON-NLS-1$ if (elementDebugModelId == null) { CDebugCorePlugin.log(new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "Extension " + elements[i].getDeclaringExtension().getUniqueIdentifier() + " missing required attribute: markerType", null)); //$NON-NLS-1$ //$NON-NLS-2$ } else if (elementMarkerType == null){ CDebugCorePlugin.log(new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "Extension " + elements[i].getDeclaringExtension().getUniqueIdentifier() + " missing required attribute: debugModelId", null)); //$NON-NLS-1$ //$NON-NLS-2$ } else if ( debugModelId.equals(elementDebugModelId) && marker.isSubtypeOf(elementMarkerType)) { - String className = elements[i].getAttribute("class"); + String className = elements[i].getAttribute("class"); //$NON-NLS-1$ if (className == null){ CDebugCorePlugin.log(new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "Extension " + elements[i].getDeclaringExtension().getUniqueIdentifier() + " missing required attribute: className", null)); //$NON-NLS-1$ //$NON-NLS-2$ } else { ICBreakpointExtension extension; try { - extension = (ICBreakpointExtension)elements[i].createExecutableExtension("class"); + extension = (ICBreakpointExtension)elements[i].createExecutableExtension("class"); //$NON-NLS-1$ extension.initialize(this); extensions.add(extension); } catch (CoreException e) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java index b38d88c32b3..1c475878253 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CWatchpoint.java @@ -108,12 +108,12 @@ public class CWatchpoint extends CBreakpoint implements ICWatchpoint2 { } public String getMemorySpace() throws CoreException { - return ensureMarker().getAttribute( MEMORYSPACE, "" ); + return ensureMarker().getAttribute( MEMORYSPACE, "" ); //$NON-NLS-1$ } public BigInteger getRange() throws CoreException { - String attr = ensureMarker().getAttribute( RANGE, "0" ); - return new BigInteger( attr.length() > 0 ? attr : "0" ); + String attr = ensureMarker().getAttribute( RANGE, "0" ); //$NON-NLS-1$ + return new BigInteger( attr.length() > 0 ? attr : "0" ); //$NON-NLS-1$ } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java index e7ee89f9391..6c7022c11d1 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java @@ -615,7 +615,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart */ public String getFile() { final ICDIStackFrame cdiFrame = getCDIStackFrame(); - return cdiFrame != null ? cdiFrame.getLocator().getFile() : ""; + return cdiFrame != null ? cdiFrame.getLocator().getFile() : ""; //$NON-NLS-1$ } /* (non-Javadoc) @@ -623,7 +623,7 @@ public class CStackFrame extends CDebugElement implements ICStackFrame, IRestart */ public String getFunction() { final ICDIStackFrame cdiFrame = getCDIStackFrame(); - return cdiFrame != null ? cdiFrame.getLocator().getFunction() : ""; + return cdiFrame != null ? cdiFrame.getLocator().getFunction() : ""; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java index 213d7b6ab4a..625a1108086 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java @@ -378,7 +378,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum */ public String getName() throws DebugException { final ICDIThread cdiThread = getCDIThread(); - return cdiThread != null ? cdiThread.toString() : ""; + return cdiThread != null ? cdiThread.toString() : ""; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java index 0bc2ecb77be..fd944a008e1 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java @@ -568,7 +568,7 @@ public class CValue extends AbstractCValue { } catch (CharacterCodingException e) { stringValue = e.toString(); } - StringBuffer sb = new StringBuffer("'"); + StringBuffer sb = new StringBuffer("'"); //$NON-NLS-1$ sb.append(stringValue); sb.append('\''); return sb.toString(); @@ -601,7 +601,7 @@ public class CValue extends AbstractCValue { } catch (CharacterCodingException e) { stringValue = e.toString(); } - StringBuffer sb = new StringBuffer("'"); + StringBuffer sb = new StringBuffer("'"); //$NON-NLS-1$ sb.append(stringValue); sb.append('\''); return sb.toString(); @@ -639,13 +639,13 @@ public class CValue extends AbstractCValue { return bigValue.toString(10); } else if ( CVariableFormat.HEXADECIMAL.equals( format ) ) { - StringBuffer sb = new StringBuffer("0x"); + StringBuffer sb = new StringBuffer("0x"); //$NON-NLS-1$ BigInteger bigValue = value.bigIntegerValue(); sb.append(bigValue.toString(16)); return sb.toString(); } else if ( CVariableFormat.BINARY.equals( format ) ) { - StringBuffer sb = new StringBuffer("0b"); + StringBuffer sb = new StringBuffer("0b"); //$NON-NLS-1$ BigInteger bigValue = value.bigIntegerValue(); sb.append(bigValue.toString(2)); return sb.toString(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java index 5bbda236ec0..a59775a7549 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Value.java @@ -79,7 +79,7 @@ public class Value extends CObject implements ICDIValue { // format is, by example (for a float&): "@0x22cc98: 3.19616001e-39" // We need to dig out the latter. if (fIsReference) { - if (result.startsWith("@0x")) { + if (result.startsWith("@0x")) { //$NON-NLS-1$ int index = result.indexOf(':'); if (index > 0 && ((index + 1) < result.length())) { result = result.substring(index+1).trim(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java index da23fa2b2bf..3f7a5801a9c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Watchpoint.java @@ -30,7 +30,7 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { public Watchpoint(Target target, String expression, int type, int watchType, ICDICondition condition, boolean enabled) { - this(target, expression, "", BigInteger.ZERO, type, watchType, condition, enabled); + this(target, expression, "", BigInteger.ZERO, type, watchType, condition, enabled); //$NON-NLS-1$ } public Watchpoint(Target target, String expression, String memorySpace, @@ -44,22 +44,22 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { // If the range and/or memory space are specified, cast the expression, e.g., // (@data char[4])(*0x402000) - derivedExpression = ""; + derivedExpression = ""; //$NON-NLS-1$ boolean doSpecifyMemorySpace = memorySpace.length() > 0; boolean doSpecifyRange = range.compareTo(BigInteger.ZERO) > 0; boolean doSpecify = doSpecifyMemorySpace || doSpecifyRange; if ( doSpecify ) { - derivedExpression += "("; + derivedExpression += "("; //$NON-NLS-1$ if ( doSpecifyMemorySpace ) { - derivedExpression += "@" + memorySpace; + derivedExpression += "@" + memorySpace; //$NON-NLS-1$ if ( doSpecifyRange ) { - derivedExpression += " "; + derivedExpression += " "; //$NON-NLS-1$ } } if ( doSpecifyRange ) { - derivedExpression += "char[" + range.toString() + "]"; + derivedExpression += "char[" + range.toString() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } - derivedExpression += ")("; + derivedExpression += ")("; //$NON-NLS-1$ } try { @@ -70,7 +70,7 @@ public class Watchpoint extends Breakpoint implements ICDIWatchpoint2 { } derivedExpression += expression; if ( doSpecify ) { - derivedExpression += ")"; + derivedExpression += ")"; //$NON-NLS-1$ } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CLIProcessor.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CLIProcessor.java index ea79cd32dc3..b97373aa513 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CLIProcessor.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/CLIProcessor.java @@ -223,7 +223,7 @@ public class CLIProcessor { // only function breakpoints can be set using rbreak return MIBreakpointChangedEvent.HINT_NEW_FUNCTION_BREAKPOINT; } - if (op.equals("catch")) { + if (op.equals("catch")) { //$NON-NLS-1$ return MIBreakpointChangedEvent.HINT_NEW_EVENTBREAKPOINT; } if ( !st.hasMoreTokens() ) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetNewConsole.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetNewConsole.java index 895a4baff60..6bcb3cce8ef 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetNewConsole.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetNewConsole.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.mi.core.command; public class MIGDBSetNewConsole extends MIGDBSet { public MIGDBSetNewConsole(String miVersion) { - this(miVersion, "on"); + this(miVersion, "on"); //$NON-NLS-1$ } public MIGDBSetNewConsole(String miVersion, String param) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinMIEnvironmentCD.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinMIEnvironmentCD.java index 1948e510d13..8b121ccec9f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinMIEnvironmentCD.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinMIEnvironmentCD.java @@ -33,12 +33,12 @@ public class CygwinMIEnvironmentCD extends WinMIEnvironmentCD { try { launcher.execute( new Path( "cygpath" ), //$NON-NLS-1$ new String[]{ "-u", path }, //$NON-NLS-1$ - new String[0], new Path( "." ), + new String[0], new Path( "." ), //$NON-NLS-1$ null); } catch (CoreException e1) { // TODO Auto-generated catch block e1.printStackTrace(); - } //$NON-NLS-1$ + } if ( launcher.waitAndRead( out, err ) == ICommandLauncher.OK ) { newPath = out.toString(); if ( newPath != null ) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinMIEnvironmentDirectory.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinMIEnvironmentDirectory.java index ecc80be1388..bb87cf8c342 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinMIEnvironmentDirectory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/win32/CygwinMIEnvironmentDirectory.java @@ -94,11 +94,11 @@ public class CygwinMIEnvironmentDirectory extends MIEnvironmentDirectory { new Path("cygpath"), //$NON-NLS-1$ new String[] { "-p", "-u", path }, //$NON-NLS-1$ //$NON-NLS-2$ new String[0], - new Path("."), null); + new Path("."), null); //$NON-NLS-1$ } catch (CoreException e) { // TODO Auto-generated catch block e.printStackTrace(); - } //$NON-NLS-1$ + } if (launcher.waitAndRead(out, out) == ICommandLauncher.OK) result = out.toString().trim(); return result; diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/CLIInfoLineInfo.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/CLIInfoLineInfo.java index 428604858a2..68e9c691798 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/CLIInfoLineInfo.java +++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/CLIInfoLineInfo.java @@ -71,7 +71,7 @@ public class CLIInfoLineInfo extends MIInfo { } protected void parseLineInfo(String str, List aList) { - if (str.endsWith(".")) + if (str.endsWith(".")) //$NON-NLS-1$ str = str.substring(0, str.length()-1); String[] strbits = str.split("\\s"); //$NON-NLS-1$ for (int i = 0; i < strbits.length; i++) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java index 6bd705b2d18..cdebd9caeef 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger.java @@ -263,7 +263,7 @@ public class GDBCDIDebugger implements ICDIDebugger { } catch( CoreException e ) { } - return MessageFormat.format(format, new String[]{label, timestamp}); //$NON-NLS-1$ + return MessageFormat.format(format, new String[]{label, timestamp}); } /** diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java index 25f3cf4fa5d..d4108121748 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java @@ -102,7 +102,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob String gdbCommand = null; if (Platform.getOS().equals(Platform.OS_LINUX) && - Platform.getOSArch().equals("ppc64")) { + Platform.getOSArch().equals("ppc64")) { //$NON-NLS-1$ // On SLES 9 and 10 for ppc64 arch, there is a separate // 64-bit capable gdb called gdb64. It can // also debug 32-bit executables, so let's see if it exists. @@ -110,7 +110,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob Process unameProcess; int interruptedRetryCount = 5; - String cmd[] = {"gdb64", "--version"}; + String cmd[] = {"gdb64", "--version"}; //$NON-NLS-1$ //$NON-NLS-2$ gdb64ExistsIsCached = true; diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/IMiConsoleImagesConst.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/IMiConsoleImagesConst.java index d04f579db62..4c1ffc0f2c4 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/IMiConsoleImagesConst.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/IMiConsoleImagesConst.java @@ -12,6 +12,6 @@ package org.eclipse.cdt.debug.mi.ui.console.actions; public interface IMiConsoleImagesConst { - public static final String IMG_SAVE_CONSOLE = "icons/obj16/save_console.gif"; - public static final String IMG_VERBOSE_CONSOLE = "icons/obj16/verbose_mode_co.gif"; + public static final String IMG_SAVE_CONSOLE = "icons/obj16/save_console.gif"; //$NON-NLS-1$ + public static final String IMG_VERBOSE_CONSOLE = "icons/obj16/verbose_mode_co.gif"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleMessages.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleMessages.java index e795ddfe2a5..696373d254c 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleMessages.java +++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/console/actions/MiConsoleMessages.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.mi.ui.console.actions; import org.eclipse.osgi.util.NLS; public class MiConsoleMessages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.mi.ui.console.actions.MiConsoleMessages"; + private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.mi.ui.console.actions.MiConsoleMessages"; //$NON-NLS-1$ public static String saveActionTooltip; public static String verboseActionTooltip; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java index ad8a4edc957..71985837ded 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/ErrorStatusHandler.java @@ -28,7 +28,7 @@ public class ErrorStatusHandler implements IStatusHandler { */ public Object handleStatus( final IStatus status, Object source ) throws CoreException { if ( status != null && source != null ) { - String title = ""; + String title = ""; //$NON-NLS-1$ if (source instanceof IDebugElement) { IDebugTarget target = ((IDebugElement)source).getDebugTarget(); title = target.getName(); @@ -36,7 +36,7 @@ public class ErrorStatusHandler implements IStatusHandler { else { // Source is sometimes an action delegate instance. Can't gather // anything useful from it. Use a generic title - title = CDebugUIMessages.getString("ErrorStatusHandler.1"); + title = CDebugUIMessages.getString("ErrorStatusHandler.1"); //$NON-NLS-1$ } final String title_f = title; CDebugUIPlugin.getStandardDisplay().asyncExec( new Runnable() { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddEventBreakpointActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddEventBreakpointActionDelegate.java index cb8d1266955..91eccdb25b7 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddEventBreakpointActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddEventBreakpointActionDelegate.java @@ -54,8 +54,8 @@ public class AddEventBreakpointActionDelegate extends ActionDelegate implements public void run(IAction action) { AddEventBreakpointDialog dlg = new AddEventBreakpointDialog(CDebugUIPlugin.getActiveWorkbenchShell()); if (dlg.isActive() == false) { - String message = ActionMessages.getString("AddEventBreakpointActionDelegate.2"); - MessageDialog.openError( getView().getSite().getShell(), UIMessages.getString( "CDebugUIPlugin.0" ), message); + String message = ActionMessages.getString("AddEventBreakpointActionDelegate.2"); //$NON-NLS-1$ + MessageDialog.openError( getView().getSite().getShell(), UIMessages.getString( "CDebugUIPlugin.0" ), message); //$NON-NLS-1$ } else { if (dlg.open() == Window.OK) { addEventBreakpoint(dlg.getEventTypeId(), dlg.getEventArgument()); @@ -67,7 +67,7 @@ public class AddEventBreakpointActionDelegate extends ActionDelegate implements if (getResource() == null) return; try { - CDIDebugModel.createEventBreakpoint(id, arg, true); //$NON-NLS-1$ + CDIDebugModel.createEventBreakpoint(id, arg, true); } catch (CoreException ce) { CDebugUIPlugin.errorDialog(ActionMessages.getString("AddEventBreakpointActionDelegate.0"), ce); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java index 1fa7e8e54a1..134543ddc1a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddGlobalsActionDelegate.java @@ -282,7 +282,7 @@ public class AddGlobalsActionDelegate extends ActionDelegate implements IViewAct if ( info != null && gvm != null ) { fGlobals = info.getGlobals(); ListSelectionDialog dlg = createDialog(); - dlg.setTitle(ActionMessages.getString("AddGlobalsActionDelegate.title")); + dlg.setTitle(ActionMessages.getString("AddGlobalsActionDelegate.title")); //$NON-NLS-1$ dlg.setInitialSelections( gvm.getDescriptors() ); if ( dlg.open() == Window.OK ) { List list = Arrays.asList( dlg.getResult() ); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java index 428f6fb4d07..df1012b4bcf 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointDialog.java @@ -179,7 +179,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec new AccessibleAdapter() { @Override public void getName(AccessibleEvent e) { - e.result = ActionMessages.getString( "AddWatchpointDialog.5" ); + e.result = ActionMessages.getString( "AddWatchpointDialog.5" ); //$NON-NLS-1$ } }); @@ -210,7 +210,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec // second character must be x if preceded by a 0, otherwise 0-9 will do if ( text.length() == 1 ) { - if ( text.equals( "0" ) ) { + if ( text.equals( "0" ) ) { //$NON-NLS-1$ return c == 'x'; } return Character.isDigit( c ); @@ -218,7 +218,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec // all subsequent characters must be 0-9 or a-f if started with 0x return Character.isDigit( c ) - || text.startsWith( "0x" ) && 'a' <= c && c <= 'f'; + || text.startsWith( "0x" ) && 'a' <= c && c <= 'f'; //$NON-NLS-1$ } /** @@ -234,7 +234,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec return true; } if ( text.length() == 2 ) { - return !text.equals("0x"); + return !text.equals("0x"); //$NON-NLS-1$ } return true; } @@ -267,7 +267,7 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec new AccessibleAdapter() { @Override public void getName(AccessibleEvent e) { - e.result = ActionMessages.getString( "AddWatchpointDialog.6" ); + e.result = ActionMessages.getString( "AddWatchpointDialog.6" ); //$NON-NLS-1$ } }); @@ -310,9 +310,9 @@ public class AddWatchpointDialog extends Dialog implements ModifyListener, Selec addHistory( fExpression ); } if ( fHasMemorySpaceControls ) { - fMemorySpace = fMemorySpaceEnableButton.getSelection() ? fMemorySpaceInput.getText().trim() : ""; + fMemorySpace = fMemorySpaceEnableButton.getSelection() ? fMemorySpaceInput.getText().trim() : ""; //$NON-NLS-1$ } - fRange = fRangeEnableButton.getSelection() ? fRangeField.getText().trim() : "0"; + fRange = fRangeEnableButton.getSelection() ? fRangeField.getText().trim() : "0"; //$NON-NLS-1$ fRead = fChkBtnRead.getSelection(); fWrite = fChkBtnWrite.getSelection(); super.okPressed(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CanFormatObjectTester.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CanFormatObjectTester.java index 5fc6b2da5e2..eafc57d4489 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CanFormatObjectTester.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CanFormatObjectTester.java @@ -29,7 +29,7 @@ public class CanFormatObjectTester extends PropertyTester { } public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { - if (property.equals("canFormatObject")) { + if (property.equals("canFormatObject")) { //$NON-NLS-1$ if (receiver instanceof ICVariable) { return expectedValue == Boolean.TRUE; } if (receiver instanceof IWatchExpression) { IWatchExpression w = (IWatchExpression) receiver; 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 4d2b25f3957..3d7dc2fc1a1 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 @@ -66,7 +66,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, setPreferenceStore(new CBreakpointPreferenceStore() { @Override public String getDefaultString(String name) { - return ""; + return ""; //$NON-NLS-1$ } }); } @@ -85,7 +85,7 @@ public class AddEventBreakpointDialog extends Dialog implements ModifyListener, if (con.getId().equals(ICBreakpointType.TYPE)) continue; FieldEditor fieldEditor = con.getFieldEditor(con.getId(), con.getLabel(), parent); - getPreferenceStore().setValue(con.getId(),""); + getPreferenceStore().setValue(con.getId(),""); //$NON-NLS-1$ if (fieldEditor != null) addField(fieldEditor); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorInput.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorInput.java index f82c41ffdb8..32784a990fe 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorInput.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/disassembly/editor/DisassemblyEditorInput.java @@ -46,7 +46,7 @@ public class DisassemblyEditorInput implements IEditorInput { */ public String getName() { // TODO Auto-generated method stub - return ""; + return ""; //$NON-NLS-1$ } /* (non-Javadoc) @@ -62,7 +62,7 @@ public class DisassemblyEditorInput implements IEditorInput { */ public String getToolTipText() { // TODO Auto-generated method stub - return ""; + return ""; //$NON-NLS-1$ } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java index 140ff82c89c..33d7d39d729 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java @@ -238,8 +238,8 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement } private void createMainLabel(ICBreakpoint breakpoint) { - addField( createLabelEditor( getFieldEditorParent(), PropertyPageMessages.getString( "CBreakpointPropertyPage.18" ), - getBreakpointMainLabel(breakpoint) ) ); //$NON-NLS-1$ + addField( createLabelEditor( getFieldEditorParent(), PropertyPageMessages.getString( "CBreakpointPropertyPage.18" ), //$NON-NLS-1$ + getBreakpointMainLabel(breakpoint) ) ); } /** @@ -325,13 +325,13 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement private String getBreakpointMainLabel(ICBreakpoint breakpoint) { if (breakpoint instanceof ICFunctionBreakpoint) - return PropertyPageMessages.getString("CBreakpointPropertyPage.3"); + return PropertyPageMessages.getString("CBreakpointPropertyPage.3"); //$NON-NLS-1$ if (breakpoint instanceof ICAddressBreakpoint) - return PropertyPageMessages.getString("CBreakpointPropertyPage.4"); + return PropertyPageMessages.getString("CBreakpointPropertyPage.4"); //$NON-NLS-1$ if (breakpoint instanceof ICLineBreakpoint) - return PropertyPageMessages.getString("CBreakpointPropertyPage.8"); + return PropertyPageMessages.getString("CBreakpointPropertyPage.8"); //$NON-NLS-1$ if (breakpoint instanceof ICEventBreakpoint) - return PropertyPageMessages.getString("CBreakpointPropertyPage.21"); + return PropertyPageMessages.getString("CBreakpointPropertyPage.21"); //$NON-NLS-1$ if (breakpoint instanceof ICWatchpoint) { ICWatchpoint watchpoint = (ICWatchpoint) breakpoint; String type = ""; //$NON-NLS-1$ @@ -358,7 +358,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement return type; } protected void createLineNumberEditor( Composite parent ) { - String title = PropertyPageMessages.getString( "CBreakpointPropertyPage.9" ); + String title = PropertyPageMessages.getString( "CBreakpointPropertyPage.9" ); //$NON-NLS-1$ BreakpointIntegerFieldEditor labelFieldEditor =new BreakpointIntegerFieldEditor( CBreakpointPreferenceStore.LINE ,title, parent); labelFieldEditor.setValidRange( 1, Integer.MAX_VALUE ); addField( labelFieldEditor ); @@ -479,11 +479,11 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement .getBreakpointUIContributions(breakpoint); for (ICBreakpointsUIContribution con : cons) { - FieldEditor fieldEditor = con.getFieldEditor(con.getId(), con.getLabel()+":", parent); + FieldEditor fieldEditor = con.getFieldEditor(con.getId(), con.getLabel()+":", parent); //$NON-NLS-1$ if (fieldEditor != null) addField(fieldEditor); Object o = breakpoint.getMarker().getAttribute(con.getId()); - String value = o==null?"":o.toString(); + String value = o==null?"":o.toString(); //$NON-NLS-1$ getPreferenceStore().setValue(con.getId(), value); } } catch (CoreException ce) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java index 59495eae8f2..6c4cec51ac3 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/CSourceNotFoundEditor.java @@ -184,13 +184,13 @@ public class CSourceNotFoundEditor extends CommonSourceNotFoundEditor { data.grabExcessHorizontalSpace = false; data.grabExcessVerticalSpace = false; editLookupButton.setLayoutData(data); - editLookupButton.setText(SourceLookupUIMessages.getString( "CSourceNotFoundEditor.5" )); + editLookupButton.setText(SourceLookupUIMessages.getString( "CSourceNotFoundEditor.5" )); //$NON-NLS-1$ editLookupButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { editSourceLookupPath(); } }); - editLookupButton.setData(UID_KEY, UID_EDIT_LOOKUP_BUTTON); //$NON-NLS-1$ + editLookupButton.setData(UID_KEY, UID_EDIT_LOOKUP_BUTTON); } syncButtons(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewer.java index 2ab02427338..bc5f2135c42 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewer.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewer.java @@ -155,7 +155,7 @@ public class ExecutablesViewer extends BaseViewer implements IExecutablesChangeL protected ViewerComparator getViewerComparator(int sortType) { if (sortType == ExecutablesView.PROJECT) { return new ExecutablesViewerComparator(sortType, column_sort_order[ExecutablesView.PROJECT]) { - @SuppressWarnings("unchecked") //$NON-NLS-1$ + @SuppressWarnings("unchecked") public int compare(Viewer viewer, Object e1, Object e2) { Executable entry1 = (Executable) e1; Executable entry2 = (Executable) e2; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewerComparator.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewerComparator.java index 00f68a7ab86..f259de38176 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewerComparator.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/executables/ExecutablesViewerComparator.java @@ -36,7 +36,7 @@ class ExecutablesViewerComparator extends ViewerComparator { return 0; } - @SuppressWarnings("unchecked") //$NON-NLS-1$ + @SuppressWarnings("unchecked") public int compare(Viewer viewer, Object e1, Object e2) { if (category(e1) == 1 && category(e2) == 1) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPane.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPane.java index 4f589278b39..631b17c6d3f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPane.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleDetailPane.java @@ -76,7 +76,7 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, * The ID, name and description of this pane are stored in constants so that the class * does not have to be instantiated to access them. */ - public static final String ID = "ModuleDetailPane"; + public static final String ID = "ModuleDetailPane"; //$NON-NLS-1$ public static final String NAME = "Module Viewer"; public static final String DESCRIPTION = "A detail pane that is based on a source viewer. Displays as text and has actions for assigning values, content assist and text modifications."; @@ -102,7 +102,7 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, protected IStatus run(IProgressMonitor monitor) { fMonitor = monitor; - String detail = ""; + String detail = ""; //$NON-NLS-1$ if ( fElement instanceof ICModule ) { detail = getModuleDetail( ((ICModule)fElement) ); } @@ -293,13 +293,13 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, private void createActions() { TextViewerAction textAction= new TextViewerAction(fSourceViewer, ITextOperationTarget.SELECT_ALL); - textAction.configureAction("Select &All", "", ""); + textAction.configureAction("Select &All", "", ""); //$NON-NLS-2$ //$NON-NLS-3$ textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.SELECT_ALL); PlatformUI.getWorkbench().getHelpSystem().setHelp(textAction, ICDebugHelpContextIds.MODULE_DETAIL_PANE_SELECT_ALL_ACTION); setAction(DETAIL_SELECT_ALL_ACTION, textAction); textAction= new TextViewerAction(fSourceViewer, ITextOperationTarget.COPY); - textAction.configureAction("&Copy", "", ""); + textAction.configureAction("&Copy", "", ""); //$NON-NLS-2$ //$NON-NLS-3$ textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.COPY); PlatformUI.getWorkbench().getHelpSystem().setHelp(textAction, ICDebugHelpContextIds.MODULE_DETAIL_PANE_COPY_ACTION); setAction(DETAIL_COPY_ACTION, textAction); @@ -455,7 +455,7 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, if (fDetailJob != null) { fDetailJob.cancel(); } - fDetailDocument.set(""); + fDetailDocument.set(""); //$NON-NLS-1$ fSourceViewer.setEditable(false); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionComposite.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionComposite.java index c179131bccb..c04495d8c94 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionComposite.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/ExternalToolActionComposite.java @@ -212,7 +212,7 @@ public class ExternalToolActionComposite extends Composite { } } if (type != null) { - if (!priv && type.supportsMode(ILaunchManager.RUN_MODE) && equalCategories(type.getCategory(), "org.eclipse.ui.externaltools") //$NON-NLS-1$ //$NON-NLS-2$ + if (!priv && type.supportsMode(ILaunchManager.RUN_MODE) && equalCategories(type.getCategory(), "org.eclipse.ui.externaltools") //$NON-NLS-1$ && !WorkbenchActivityHelper.filterItem(new LaunchConfigurationTypeContribution(type))) onlyExternalTools.add(launchConfigurations[i]); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointUIContributionFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointUIContributionFactory.java index 478126f45fa..fb5ad942b0a 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointUIContributionFactory.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointUIContributionFactory.java @@ -28,8 +28,8 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.IBreakpoint; public class CBreakpointUIContributionFactory { - private static final String EXTENSION_POINT_NAME = "breakpointContribution"; - private static final String MAIN_ELEMENT = "breakpointLabels"; + private static final String EXTENSION_POINT_NAME = "breakpointContribution"; //$NON-NLS-1$ + private static final String MAIN_ELEMENT = "breakpointLabels"; //$NON-NLS-1$ private static CBreakpointUIContributionFactory instance; protected ArrayList contributions; @@ -94,11 +94,11 @@ public class CBreakpointUIContributionFactory { for (int i = 0; i < elements.length; i++) { IConfigurationElement configurationElement = elements[i]; if (configurationElement.getName().equals(MAIN_ELEMENT)) { - String modelId = configurationElement.getAttribute("debugModelId"); - String markerType = getRequired(configurationElement, "markerType"); + String modelId = configurationElement.getAttribute("debugModelId"); //$NON-NLS-1$ + String markerType = getRequired(configurationElement, "markerType"); //$NON-NLS-1$ if (markerType == null) continue; - IConfigurationElement[] children = configurationElement.getChildren("attribute"); + IConfigurationElement[] children = configurationElement.getChildren("attribute"); //$NON-NLS-1$ for (IConfigurationElement att : children) { DefaultCBreakpointUIContribution adapter = new DefaultCBreakpointUIContribution(); @@ -114,11 +114,11 @@ public class CBreakpointUIContributionFactory { } private boolean processAttribute(IConfigurationElement attrElement, DefaultCBreakpointUIContribution adapter) { - String attrId = getRequired(attrElement, "name"); - String attrLabel = getRequired(attrElement, "label"); - String className = attrElement.getAttribute("fieldEditor"); - String type = attrElement.getAttribute("type"); - String svisible = attrElement.getAttribute("visible"); + String attrId = getRequired(attrElement, "name"); //$NON-NLS-1$ + String attrLabel = getRequired(attrElement, "label"); //$NON-NLS-1$ + String className = attrElement.getAttribute("fieldEditor"); //$NON-NLS-1$ + String type = attrElement.getAttribute("type"); //$NON-NLS-1$ + String svisible = attrElement.getAttribute("visible"); //$NON-NLS-1$ if (attrId == null) { return false; @@ -127,10 +127,10 @@ public class CBreakpointUIContributionFactory { return false; } if (type == null) { - type = "string"; + type = "string"; //$NON-NLS-1$ } boolean visible = true; - if (svisible != null && svisible.equalsIgnoreCase("false")) { + if (svisible != null && svisible.equalsIgnoreCase("false")) { //$NON-NLS-1$ visible = false; } adapter.setId(attrId); @@ -140,7 +140,7 @@ public class CBreakpointUIContributionFactory { adapter.setVisible(visible); addContribution(adapter); - IConfigurationElement[] children = attrElement.getChildren("value"); + IConfigurationElement[] children = attrElement.getChildren("value"); //$NON-NLS-1$ for (IConfigurationElement value : children) { processValue(value, adapter); } @@ -148,14 +148,14 @@ public class CBreakpointUIContributionFactory { } private void processValue(IConfigurationElement valueElement, DefaultCBreakpointUIContribution adapter) { - String valueId = getRequired(valueElement, "value"); - String valueLabel = getRequired(valueElement, "label"); + String valueId = getRequired(valueElement, "value"); //$NON-NLS-1$ + String valueLabel = getRequired(valueElement, "label"); //$NON-NLS-1$ if (valueId == null) return; if (valueLabel == null) return; adapter.addValue(valueId, valueLabel); - IConfigurationElement[] children = valueElement.getChildren("attribute"); + IConfigurationElement[] children = valueElement.getChildren("attribute"); //$NON-NLS-1$ for (IConfigurationElement att : children) { DefaultCBreakpointUIContribution adapter2 = new DefaultCBreakpointUIContribution(); // inherit values diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java index 0929361cd72..177329d5a24 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/DefaultCBreakpointUIContribution.java @@ -147,7 +147,7 @@ class DefaultCBreakpointUIContribution implements ICBreakpointsUIContribution { @Override public String toString() { - return attId + " " + attLabel; + return attId + " " + attLabel; //$NON-NLS-1$ } public String getFieldEditorClassName() { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageOne.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageOne.java index 36e5b3764f7..290974f22d3 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageOne.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageOne.java @@ -100,7 +100,7 @@ public class ImportExecutablePageOne extends WizardPage { private Combo binaryParserCombo; public ImportExecutablePageOne(AbstractImportExecutableWizard wizard) { - super("ImportApplicationPageOne"); + super("ImportApplicationPageOne"); //$NON-NLS-1$ this.wizard = wizard; setPageComplete(false); setTitle(wizard.getPageOneTitle()); @@ -398,7 +398,7 @@ public class ImportExecutablePageOne extends WizardPage { IConfigurationElement[] children = elements[i].getChildren("run"); //$NON-NLS-1$ for (int j = 0; j < children.length; j++) { try { - parser = (IBinaryParser)children[j].createExecutableExtension("class"); + parser = (IBinaryParser)children[j].createExecutableExtension("class"); //$NON-NLS-1$ } catch (CoreException e) { CDebugUIPlugin.log(e); } @@ -434,7 +434,7 @@ public class ImportExecutablePageOne extends WizardPage { } ); // Set the data name field so Abbot based tests can find it. - singleExecutablePathField.setData("name", "singleExecutablePathField"); + singleExecutablePathField.setData("name", "singleExecutablePathField"); //$NON-NLS-1$ //$NON-NLS-2$ singleExecutablePathField.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -455,12 +455,12 @@ public class ImportExecutablePageOne extends WizardPage { wizard.setupFileDialog(dialog); String res = dialog.open(); if (res != null) { - if (Platform.getOS().equals(Platform.OS_MACOSX) && res.endsWith(".app")) + if (Platform.getOS().equals(Platform.OS_MACOSX) && res.endsWith(".app")) //$NON-NLS-1$ { // On Mac OS X the file dialog will let you select the // package but not the executable inside. Path macPath = new Path(res); - res = res + "/Contents/MacOS/" + macPath.lastSegment(); + res = res + "/Contents/MacOS/" + macPath.lastSegment(); //$NON-NLS-1$ res = res.substring(0, res.length() - 4); } singleExecutablePathField.setText(res); @@ -554,7 +554,7 @@ public class ImportExecutablePageOne extends WizardPage { executables = new File[0]; executablesViewer.refresh(true); executablesViewer.setAllChecked(false); - previouslySearchedDirectory = ""; + previouslySearchedDirectory = ""; //$NON-NLS-1$ setPageComplete(false); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java index b8af9ef93eb..dcac6735cb2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/importexecutable/ImportExecutablePageTwo.java @@ -75,11 +75,11 @@ public class ImportExecutablePageTwo extends WizardPage { private boolean shouldUpdateButtons = true; public ImportExecutablePageTwo(AbstractImportExecutableWizard wizard) { - super("ImportExecutablePageTwo"); + super("ImportExecutablePageTwo"); //$NON-NLS-1$ this.wizard = wizard; setTitle(Messages.ImportExecutablePageTwo_ChooseProject); setDescription(Messages.ImportExecutablePageTwo_ChooseExisting); - filterPlatform = "*"; + filterPlatform = "*"; //$NON-NLS-1$ } private void addLaunchConfigTypes() { @@ -94,7 +94,7 @@ public class ImportExecutablePageTwo extends WizardPage { if (wizard.supportsConfigurationType(type)) { configTypes.add(configTypeName); - if (type.getIdentifier().equals("org.eclipse.cdt.launch.applicationLaunchType")) { + if (type.getIdentifier().equals("org.eclipse.cdt.launch.applicationLaunchType")) { //$NON-NLS-1$ capp = j; } j++;