diff options
| author | Darin Wright | 2005-08-05 15:58:57 +0000 |
|---|---|---|
| committer | Darin Wright | 2005-08-05 15:58:57 +0000 |
| commit | 14470073fafec9a2ca8fb7e8f221fb2e1e25083f (patch) | |
| tree | 29da69739c2acb79ee6a226d83f65b6fce46fa6b | |
| parent | a5ce3fddca1d1a44014433923c23e8cdf6377e73 (diff) | |
| download | eclipse.platform.debug-14470073fafec9a2ca8fb7e8f221fb2e1e25083f.tar.gz eclipse.platform.debug-14470073fafec9a2ca8fb7e8f221fb2e1e25083f.tar.xz eclipse.platform.debug-14470073fafec9a2ca8fb7e8f221fb2e1e25083f.zip | |
Bug 106178 - Remove uneccessary NLS tags
191 files changed, 676 insertions, 676 deletions
diff --git a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/DynamicVariable.java b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/DynamicVariable.java index 10e192e0b..bc3fc9571 100644 --- a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/DynamicVariable.java +++ b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/DynamicVariable.java @@ -36,7 +36,7 @@ public class DynamicVariable extends StringVariable implements IDynamicVariable if (!supportsArgument()) { // check for an argument - not supported if (argument != null && argument.length() > 0) { - throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.DynamicVariable_0, new String[]{argument, getName()}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.DynamicVariable_0, new String[]{argument, getName()}), null)); } } if (fResolver == null) { diff --git a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java index 9a8e5df44..6f7788ab4 100644 --- a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java +++ b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringSubstitutionEngine.java @@ -31,8 +31,8 @@ public class StringSubstitutionEngine { // delimiters private static final String VARIABLE_START = "${"; //$NON-NLS-1$ - private static final char VARIABLE_END = '}'; //$NON-NLS-1$ - private static final char VARIABLE_ARG = ':'; //$NON-NLS-1$ + private static final char VARIABLE_END = '}'; + private static final char VARIABLE_ARG = ':'; // parsing states private static final int SCAN_FOR_START = 0; private static final int SCAN_FOR_END = 1; @@ -103,7 +103,7 @@ public class StringSubstitutionEngine { problemVariableList.append(", "); //$NON-NLS-1$ } problemVariableList.setLength(problemVariableList.length()-2); //truncate the last ", " - throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.REFERENCE_CYCLE_ERROR, MessageFormat.format(VariablesMessages.StringSubstitutionEngine_4, new String[]{problemVariableList.toString()}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.REFERENCE_CYCLE_ERROR, MessageFormat.format(VariablesMessages.StringSubstitutionEngine_4, new String[]{problemVariableList.toString()}), null)); } } @@ -256,7 +256,7 @@ public class StringSubstitutionEngine { if (dynamicVariable == null) { // no variables with the given name if (reportUndefinedVariables) { - throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.StringSubstitutionEngine_3, new String[]{name}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.StringSubstitutionEngine_3, new String[]{name}), null)); } // leave as is return getOriginalVarText(var); @@ -279,7 +279,7 @@ public class StringSubstitutionEngine { return getOriginalVarText(var); } // error - an argument specified for a value variable - throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.StringSubstitutionEngine_4, new String[]{valueVariable.getName()}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.StringSubstitutionEngine_4, new String[]{valueVariable.getName()}), null)); } private String getOriginalVarText(VariableReference var) { diff --git a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java index d2a0867d2..323e84fa9 100644 --- a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java +++ b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java @@ -364,11 +364,11 @@ public class StringVariableManager implements IStringVariableManager, IPropertyC */ public synchronized void addVariables(IValueVariable[] variables) throws CoreException { initialize(); - MultiStatus status = new MultiStatus(VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, VariablesMessages.StringVariableManager_26, null); //$NON-NLS-1$ + MultiStatus status = new MultiStatus(VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, VariablesMessages.StringVariableManager_26, null); for (int i = 0; i < variables.length; i++) { IValueVariable variable = variables[i]; if (getValueVariable(variable.getName()) != null) { - status.add(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.StringVariableManager_27, new String[]{variable.getName()}), null)); //$NON-NLS-1$ + status.add(new Status(IStatus.ERROR, VariablesPlugin.getUniqueIdentifier(), VariablesPlugin.INTERNAL_ERROR, MessageFormat.format(VariablesMessages.StringVariableManager_27, new String[]{variable.getName()}), null)); } } if (status.isOK()) { diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugEvent.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugEvent.java index af63e560e..1c5154470 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugEvent.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugEvent.java @@ -305,9 +305,9 @@ public final class DebugEvent extends EventObject { public DebugEvent(Object eventSource, int kind, int detail) { super(eventSource); if ((kind & (RESUME | SUSPEND | CREATE | TERMINATE | CHANGE | MODEL_SPECIFIC)) == 0) - throw new IllegalArgumentException(DebugCoreMessages.DebugEvent_illegal_kind); //$NON-NLS-1$ + throw new IllegalArgumentException(DebugCoreMessages.DebugEvent_illegal_kind); if (kind != MODEL_SPECIFIC && detail != UNSPECIFIED && (detail & (STEP_END | STEP_INTO | STEP_OVER | STEP_RETURN | BREAKPOINT | CLIENT_REQUEST |EVALUATION | EVALUATION_IMPLICIT | STATE | CONTENT)) == 0) - throw new IllegalArgumentException(DebugCoreMessages.DebugEvent_illegal_detail); //$NON-NLS-1$ + throw new IllegalArgumentException(DebugCoreMessages.DebugEvent_illegal_detail); fKind= kind; fDetail= detail; } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java index a6d5ea948..44d388f7f 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java @@ -323,7 +323,7 @@ public class DebugPlugin extends Plugin { * Creates a new event dispatch job. */ public EventDispatchJob() { - super(DebugCoreMessages.DebugPlugin_1); //$NON-NLS-1$ + super(DebugCoreMessages.DebugPlugin_1); setPriority(Job.INTERACTIVE); setSystem(true); } @@ -514,7 +514,7 @@ public class DebugPlugin extends Plugin { if (handler instanceof IStatusHandler) { return (IStatusHandler)handler; } - invalidStatusHandler(null, MessageFormat.format(DebugCoreMessages.DebugPlugin_Registered_status_handler__0__does_not_implement_required_interface_IStatusHandler__1, new String[] {config.getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$ + invalidStatusHandler(null, MessageFormat.format(DebugCoreMessages.DebugPlugin_Registered_status_handler__0__does_not_implement_required_interface_IStatusHandler__1, new String[] {config.getDeclaringExtension().getUniqueIdentifier()})); } catch (CoreException e) { log(e); } @@ -749,11 +749,11 @@ public class DebugPlugin extends Plugin { if (p != null) { p.destroy(); } - Status status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_Exception_occurred_executing_command_line__1, e); //$NON-NLS-1$ + Status status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_Exception_occurred_executing_command_line__1, e); throw new CoreException(status); } catch (NoSuchMethodError e) { //attempting launches on 1.2.* - no ability to set working directory - IStatus status = new Status(IStatus.ERROR, getUniqueIdentifier(), ERR_WORKING_DIRECTORY_NOT_SUPPORTED, DebugCoreMessages.DebugPlugin_Eclipse_runtime_does_not_support_working_directory_2, e); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, getUniqueIdentifier(), ERR_WORKING_DIRECTORY_NOT_SUPPORTED, DebugCoreMessages.DebugPlugin_Eclipse_runtime_does_not_support_working_directory_2, e); IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(status); if (handler != null) { @@ -921,13 +921,13 @@ public class DebugPlugin extends Plugin { } else { // invalid process factory String badDefiner= infos[i].getNamespace(); - log(new Status(IStatus.ERROR, DebugPlugin.PI_DEBUG_CORE, INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.DebugPlugin_31, new String[] {badDefiner, id}), null)); //$NON-NLS-1$ + log(new Status(IStatus.ERROR, DebugPlugin.PI_DEBUG_CORE, INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.DebugPlugin_31, new String[] {badDefiner, id}), null)); } } } private void invalidStatusHandler(Exception e, String id) { - log(new Status(IStatus.ERROR, DebugPlugin.PI_DEBUG_CORE, INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.DebugPlugin_Invalid_status_handler_extension___0__2, new String[] {id}), e)); //$NON-NLS-1$ + log(new Status(IStatus.ERROR, DebugPlugin.PI_DEBUG_CORE, INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.DebugPlugin_Invalid_status_handler_extension___0__2, new String[] {id}), e)); } /** @@ -996,7 +996,7 @@ public class DebugPlugin extends Plugin { class AsynchJob extends Job { public AsynchJob() { - super(DebugCoreMessages.DebugPlugin_Debug_async_queue_1); //$NON-NLS-1$ + super(DebugCoreMessages.DebugPlugin_Debug_async_queue_1); setPriority(Job.INTERACTIVE); setSystem(true); } @@ -1019,7 +1019,7 @@ public class DebugPlugin extends Plugin { fRunnables = new Vector(5); } MultiStatus failed = null; - monitor.beginTask(DebugCoreMessages.DebugPlugin_Debug_async_queue_1, v.size()); //$NON-NLS-1$ + monitor.beginTask(DebugCoreMessages.DebugPlugin_Debug_async_queue_1, v.size()); Iterator iter = v.iterator(); while (iter.hasNext() && !fShuttingDown && !monitor.isCanceled()) { Runnable r = (Runnable)iter.next(); @@ -1027,9 +1027,9 @@ public class DebugPlugin extends Plugin { r.run(); } catch (Exception e) { if (failed == null) { - failed = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_0, null); //$NON-NLS-1$ + failed = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_0, null); } - failed.add(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_0, e)); //$NON-NLS-1$ + failed.add(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_0, e)); } monitor.worked(1); } @@ -1059,11 +1059,11 @@ public class DebugPlugin extends Plugin { public void handleException(Throwable exception) { switch (fMode) { case NOTIFY_FILTERS: - IStatus status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_An_exception_occurred_while_filtering_debug_events__3, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_An_exception_occurred_while_filtering_debug_events__3, exception); log(status); break; case NOTIFY_EVENTS: - status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_An_exception_occurred_while_dispatching_debug_events__2, exception); //$NON-NLS-1$ + status = new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, DebugCoreMessages.DebugPlugin_An_exception_occurred_while_dispatching_debug_events__2, exception); log(status); break; } @@ -1134,7 +1134,7 @@ public class DebugPlugin extends Plugin { try { return LaunchManager.getDocument(); } catch (ParserConfigurationException e) { - abort(SourceLookupMessages.SourceLookupUtils_3, e); //$NON-NLS-1$ + abort(SourceLookupMessages.SourceLookupUtils_3, e); } return null; } @@ -1151,9 +1151,9 @@ public class DebugPlugin extends Plugin { try { return LaunchManager.serializeDocument(document); } catch (TransformerException e) { - abort(SourceLookupMessages.SourceLookupUtils_4, e); //$NON-NLS-1$ + abort(SourceLookupMessages.SourceLookupUtils_4, e); } catch (IOException e) { - abort(SourceLookupMessages.SourceLookupUtils_5, e); //$NON-NLS-1$ + abort(SourceLookupMessages.SourceLookupUtils_5, e); } return null; } @@ -1176,18 +1176,18 @@ public class DebugPlugin extends Plugin { stream = new ByteArrayInputStream(document.getBytes()); root = parser.parse(stream).getDocumentElement(); } catch (ParserConfigurationException e) { - abort(SourceLookupMessages.SourceLookupUtils_6, e); //$NON-NLS-1$ + abort(SourceLookupMessages.SourceLookupUtils_6, e); } catch (FactoryConfigurationError e) { - abort(SourceLookupMessages.SourceLookupUtils_7, e); //$NON-NLS-1$ + abort(SourceLookupMessages.SourceLookupUtils_7, e); } catch (SAXException e) { - abort(SourceLookupMessages.SourceLookupUtils_8, e); //$NON-NLS-1$ + abort(SourceLookupMessages.SourceLookupUtils_8, e); } catch (IOException e) { - abort(SourceLookupMessages.SourceLookupUtils_9, e); //$NON-NLS-1$ + abort(SourceLookupMessages.SourceLookupUtils_9, e); } finally { try{ stream.close(); } catch(IOException e) { - abort(SourceLookupMessages.SourceLookupUtils_10, e); //$NON-NLS-1$ + abort(SourceLookupMessages.SourceLookupUtils_10, e); } } return root; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java index ae92c728f..4572ce6e9 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java @@ -230,7 +230,7 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau */ public void terminate() throws DebugException { MultiStatus status= - new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, DebugCoreMessages.Launch_terminate_failed, null); //$NON-NLS-1$ + new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, DebugCoreMessages.Launch_terminate_failed, null); // terminate the system processes IProcess[] processes = getProcesses(); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java index aa53b5604..3fd04ff38 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java @@ -266,7 +266,7 @@ public abstract class Breakpoint extends PlatformObject implements IBreakpoint { IMarker m = getMarker(); if (m == null || !m.exists()) { throw new DebugException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, - DebugCoreMessages.Breakpoint_no_associated_marker, null)); //$NON-NLS-1$ + DebugCoreMessages.Breakpoint_no_associated_marker, null)); } return m; } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java index 9eedd689c..dfc730928 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java @@ -132,10 +132,10 @@ public abstract class LaunchConfigurationDelegate implements ILaunchConfiguratio } boolean continueLaunch = true; - monitor.subTask(DebugCoreMessages.LaunchConfigurationDelegate_6); //$NON-NLS-1$ + monitor.subTask(DebugCoreMessages.LaunchConfigurationDelegate_6); List errors = new ArrayList(); for (int i = 0; i < projects.length; i++) { - monitor.subTask(MessageFormat.format(DebugCoreMessages.LaunchConfigurationDelegate_7, new String[]{projects[i].getName()})); //$NON-NLS-1$ + monitor.subTask(MessageFormat.format(DebugCoreMessages.LaunchConfigurationDelegate_7, new String[]{projects[i].getName()})); if (existsProblems(projects[i])) { errors.add(projects[i]); } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java index 0ba58c502..0c587eb2c 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java @@ -219,7 +219,7 @@ public class RuntimeProcess extends PlatformObject implements IProcess { fMonitor.killThread(); fMonitor = null; } - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.TARGET_REQUEST_FAILED, DebugCoreMessages.RuntimeProcess_terminate_failed, null); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.TARGET_REQUEST_FAILED, DebugCoreMessages.RuntimeProcess_terminate_failed, null); throw new DebugException(status); } } @@ -349,7 +349,7 @@ public class RuntimeProcess extends PlatformObject implements IProcess { if (isTerminated()) { return fExitValue; } - throw new DebugException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.TARGET_REQUEST_FAILED, DebugCoreMessages.RuntimeProcess_Exit_value_not_available_until_process_terminates__1, null)); //$NON-NLS-1$ + throw new DebugException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.TARGET_REQUEST_FAILED, DebugCoreMessages.RuntimeProcess_Exit_value_not_available_until_process_terminates__1, null)); } /** @@ -411,7 +411,7 @@ public class RuntimeProcess extends PlatformObject implements IProcess { * termination. */ public ProcessMonitorThread(RuntimeProcess process) { - super(DebugCoreMessages.ProcessMonitorJob_0); //$NON-NLS-1$ + super(DebugCoreMessages.ProcessMonitorJob_0); setDaemon(true); fRuntimeProcess= process; fOSProcess= process.getSystemProcess(); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java index 17d8d3cbd..f3d947230 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java @@ -138,7 +138,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec if (single == null) { single = e; } else if (multiStatus == null) { - multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[]{single.getStatus()}, SourceLookupMessages.AbstractSourceLookupDirector_19, null); //$NON-NLS-1$ + multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[]{single.getStatus()}, SourceLookupMessages.AbstractSourceLookupDirector_19, null); multiStatus.add(e.getStatus()); } else { multiStatus.add(e.getStatus()); @@ -233,15 +233,15 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec Element element = (Element)list.item(i); String typeId = element.getAttribute(CONTAINER_TYPE_ATTR); if (typeId == null || typeId.equals("")) { //$NON-NLS-1$ - abort(SourceLookupMessages.AbstractSourceLookupDirector_11, null); //$NON-NLS-1$ + abort(SourceLookupMessages.AbstractSourceLookupDirector_11, null); } ISourceContainerType type = DebugPlugin.getDefault().getLaunchManager().getSourceContainerType(typeId); if(type == null) { - abort(MessageFormat.format(SourceLookupMessages.AbstractSourceLookupDirector_12, new String[]{typeId}), null); //$NON-NLS-1$ + abort(MessageFormat.format(SourceLookupMessages.AbstractSourceLookupDirector_12, new String[]{typeId}), null); } String memento = element.getAttribute(CONTAINER_MEMENTO_ATTR); if (memento == null || memento.equals("")) { //$NON-NLS-1$ - abort(SourceLookupMessages.AbstractSourceLookupDirector_13, null); //$NON-NLS-1$ + abort(SourceLookupMessages.AbstractSourceLookupDirector_13, null); } ISourceContainer container = type.createSourceContainer(memento); containers.add(container); @@ -390,7 +390,7 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec } Element rootElement = DebugPlugin.parseDocument(memento); if (!rootElement.getNodeName().equalsIgnoreCase(DIRECTOR_ROOT_NODE)) { - abort(SourceLookupMessages.AbstractSourceLookupDirector_14, null); //$NON-NLS-1$ + abort(SourceLookupMessages.AbstractSourceLookupDirector_14, null); } NodeList list = rootElement.getChildNodes(); int length = list.getLength(); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupParticipant.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupParticipant.java index 987045704..2da790604 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupParticipant.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupParticipant.java @@ -82,7 +82,7 @@ public abstract class AbstractSourceLookupParticipant implements ISourceLookupPa if (single == null) { single = e; } else if (multiStatus == null) { - multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[]{single.getStatus()}, SourceLookupMessages.CompositeSourceContainer_0, null); //$NON-NLS-1$ + multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[]{single.getStatus()}, SourceLookupMessages.CompositeSourceContainer_0, null); multiStatus.add(e.getStatus()); } else { multiStatus.add(e.getStatus()); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java index 0179fb0b5..db91cac03 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/CompositeSourceContainer.java @@ -92,7 +92,7 @@ public abstract class CompositeSourceContainer extends AbstractSourceContainer { if (single == null) { single = e; } else if (multiStatus == null) { - multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[]{single.getStatus()}, SourceLookupMessages.CompositeSourceContainer_0, null); //$NON-NLS-1$ + multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[]{single.getStatus()}, SourceLookupMessages.CompositeSourceContainer_0, null); multiStatus.add(e.getStatus()); } else { multiStatus.add(e.getStatus()); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java index 91ea2ccda..fead34c5a 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java @@ -98,7 +98,7 @@ public class DefaultSourceContainer extends CompositeSourceContainer { * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName() */ public String getName() { - return SourceLookupMessages.DefaultSourceContainer_0; //$NON-NLS-1$ + return SourceLookupMessages.DefaultSourceContainer_0; } /* (non-Javadoc) diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ExternalArchiveSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ExternalArchiveSourceContainer.java index 543de4767..249412604 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ExternalArchiveSourceContainer.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ExternalArchiveSourceContainer.java @@ -177,7 +177,7 @@ public class ExternalArchiveSourceContainer extends AbstractSourceContainer { } } } catch (IllegalStateException e) { - abort(MessageFormat.format(SourceLookupMessages.ExternalArchiveSourceContainer_1, new String[] {getName()}), e); //$NON-NLS-1$ + abort(MessageFormat.format(SourceLookupMessages.ExternalArchiveSourceContainer_1, new String[] {getName()}), e); } } return null; @@ -192,7 +192,7 @@ public class ExternalArchiveSourceContainer extends AbstractSourceContainer { try { return SourceLookupUtils.getZipFile(fArchivePath); } catch (IOException e) { - abort(MessageFormat.format(SourceLookupMessages.ExternalArchiveSourceContainer_2, new String[]{fArchivePath}), e); //$NON-NLS-1$ + abort(MessageFormat.format(SourceLookupMessages.ExternalArchiveSourceContainer_2, new String[]{fArchivePath}), e); } return null; } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java index 29b7e578a..ccc54e881 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java @@ -57,7 +57,7 @@ public class LocalFileStorage extends PlatformObject implements IStorage { try { return new FileInputStream(getFile()); } catch (IOException e){ - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.LocalFileStorage_0, e)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.LocalFileStorage_0, e)); } } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java index 8f7fcac80..3f14bb51c 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java @@ -41,7 +41,7 @@ public class WorkspaceSourceContainer extends CompositeSourceContainer { * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName() */ public String getName() { - return SourceLookupMessages.WorkspaceSourceContainer_0; //$NON-NLS-1$ + return SourceLookupMessages.WorkspaceSourceContainer_0; } /* (non-Javadoc) diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java index de406fe21..e3e2cd646 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java @@ -65,7 +65,7 @@ public class ZipEntryStorage extends PlatformObject implements IStorage { try { return getArchive().getInputStream(getZipEntry()); } catch (IOException e) { - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.ZipEntryStorage_0, e)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.ZipEntryStorage_0, e)); } } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java index 9057dbc9c..67d83d0c9 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java @@ -234,9 +234,9 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis String markerType = elements[i].getAttribute(MARKER_TYPE); String className = elements[i].getAttribute(CLASS); if (markerType == null) { - invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.BreakpointManager_Breakpoint_extension__0__missing_required_attribute__markerType_1, new String[]{elements[i].getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$ + invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.BreakpointManager_Breakpoint_extension__0__missing_required_attribute__markerType_1, new String[]{elements[i].getDeclaringExtension().getUniqueIdentifier()})); } else if (className == null){ - invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.BreakpointManager_Breakpoint_extension__0__missing_required_attribute__class_2, new String[]{elements[i].getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$ + invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.BreakpointManager_Breakpoint_extension__0__missing_required_attribute__class_2, new String[]{elements[i].getDeclaringExtension().getUniqueIdentifier()})); } else { fBreakpointExtensions.put(markerType, elements[i]); } @@ -402,14 +402,14 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis IConfigurationElement config = (IConfigurationElement)fBreakpointExtensions.get(marker.getType()); if (config == null) { throw new DebugException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.CONFIGURATION_INVALID, MessageFormat.format(DebugCoreMessages.BreakpointManager_Missing_breakpoint_definition, new String[] {marker.getType()}), null)); //$NON-NLS-1$ + DebugException.CONFIGURATION_INVALID, MessageFormat.format(DebugCoreMessages.BreakpointManager_Missing_breakpoint_definition, new String[] {marker.getType()}), null)); } Object object = config.createExecutableExtension(CLASS); if (object instanceof IBreakpoint) { breakpoint = (IBreakpoint)object; breakpoint.setMarker(marker); } else { - invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.BreakpointManager_Class__0__specified_by_breakpoint_extension__1__does_not_implement_required_interface_IBreakpoint__3, new String[]{config.getAttribute(CLASS), config.getDeclaringExtension().getUniqueIdentifier()})); //$NON-NLS-1$ + invalidBreakpointExtension(MessageFormat.format(DebugCoreMessages.BreakpointManager_Class__0__specified_by_breakpoint_extension__1__does_not_implement_required_interface_IBreakpoint__3, new String[]{config.getAttribute(CLASS), config.getDeclaringExtension().getUniqueIdentifier()})); } return breakpoint; } catch (CoreException e) { @@ -514,7 +514,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis String id= breakpoint.getModelIdentifier(); if (id == null) { throw new DebugException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.CONFIGURATION_INVALID, DebugCoreMessages.BreakpointManager_Missing_model_identifier, null)); //$NON-NLS-1$ + DebugException.CONFIGURATION_INVALID, DebugCoreMessages.BreakpointManager_Missing_model_identifier, null)); } } catch (CoreException e) { throw new DebugException(e.getStatus()); @@ -776,7 +776,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ public void handleException(Throwable exception) { - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__4, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__4, exception); DebugPlugin.log(status); } @@ -840,7 +840,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ public void handleException(Throwable exception) { - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__5, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__5, exception); DebugPlugin.log(status); } @@ -943,7 +943,7 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ public void handleException(Throwable exception) { - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__5, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.BreakpointManager_An_exception_occurred_during_breakpoint_change_notification__5, exception); DebugPlugin.log(status); } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ContributedDelegate.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ContributedDelegate.java index b3da6b6d2..bebe58a8b 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ContributedDelegate.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ContributedDelegate.java @@ -104,7 +104,7 @@ public class ContributedDelegate { if (object instanceof ILaunchConfigurationDelegate) { fDelegate = (ILaunchConfigurationDelegate)object; } else { - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_Launch_delegate_for__0__does_not_implement_required_interface_ILaunchConfigurationDelegate__1, new String[]{getIdentifier()}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_Launch_delegate_for__0__does_not_implement_required_interface_ILaunchConfigurationDelegate__1, new String[]{getIdentifier()}), null)); } } return fDelegate; diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java index ba4595bfa..b3f1f6c8a 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java @@ -33,7 +33,7 @@ public class EnvironmentVariableResolver implements IDynamicVariableResolver { */ public String resolveValue(IDynamicVariable variable, String argument) throws CoreException { if (argument == null) { - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), IStatus.ERROR, DebugCoreMessages.EnvironmentVariableResolver_0, null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), IStatus.ERROR, DebugCoreMessages.EnvironmentVariableResolver_0, null)); } Map map= DebugPlugin.getDefault().getLaunchManager().getNativeEnvironmentCasePreserved(); String value= (String) map.get(argument); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java index 913b1a3c3..2c5e24082 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/ExpressionManager.java @@ -477,7 +477,7 @@ public class ExpressionManager extends PlatformObject implements IExpressionMana * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ public void handleException(Throwable exception) { - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.ExpressionManager_An_exception_occurred_during_expression_change_notification__1, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.ExpressionManager_An_exception_occurred_during_expression_change_notification__1, exception); DebugPlugin.log(status); } @@ -539,7 +539,7 @@ public class ExpressionManager extends PlatformObject implements IExpressionMana * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ public void handleException(Throwable exception) { - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.ExpressionManager_An_exception_occurred_during_expression_change_notification__1, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.ExpressionManager_An_exception_occurred_during_expression_change_notification__1, exception); DebugPlugin.log(status); } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/InputStreamMonitor.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/InputStreamMonitor.java index 693ed78c6..3aa4e78e3 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/InputStreamMonitor.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/InputStreamMonitor.java @@ -79,7 +79,7 @@ public class InputStreamMonitor { public void run() { write(); } - }, DebugCoreMessages.InputStreamMonitor_label); //$NON-NLS-1$ + }, DebugCoreMessages.InputStreamMonitor_label); fThread.setDaemon(true); fThread.start(); } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java index a0cf26cc2..9243f573c 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java @@ -99,9 +99,9 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig String message = null; if (path == null) { - message = DebugCoreMessages.LaunchConfiguration_Invalid_launch_configuration_memento__missing_path_attribute_3; //$NON-NLS-1$ + message = DebugCoreMessages.LaunchConfiguration_Invalid_launch_configuration_memento__missing_path_attribute_3; } else if (localString == null) { - message = DebugCoreMessages.LaunchConfiguration_Invalid_launch_configuration_memento__missing_local_attribute_4; //$NON-NLS-1$ + message = DebugCoreMessages.LaunchConfiguration_Invalid_launch_configuration_memento__missing_local_attribute_4; } if (message != null) { IStatus s = newStatus(message, DebugException.INTERNAL_ERROR, null); @@ -117,7 +117,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig } setLocation(location); if (location == null) { - IStatus s = newStatus(MessageFormat.format(DebugCoreMessages.LaunchConfiguration_Unable_to_restore_location_for_launch_configuration_from_memento___0__1, new String[]{path}), DebugPlugin.INTERNAL_ERROR, null); //$NON-NLS-1$ + IStatus s = newStatus(MessageFormat.format(DebugCoreMessages.LaunchConfiguration_Unable_to_restore_location_for_launch_configuration_from_memento___0__1, new String[]{path}), DebugPlugin.INTERNAL_ERROR, null); throw new CoreException(s); } return; @@ -128,7 +128,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig } catch (IOException e) { ex = e; } - IStatus s = newStatus(DebugCoreMessages.LaunchConfiguration_Exception_occurred_parsing_memento_5, DebugException.INTERNAL_ERROR, ex); //$NON-NLS-1$ + IStatus s = newStatus(DebugCoreMessages.LaunchConfiguration_Exception_occurred_parsing_memento_5, DebugException.INTERNAL_ERROR, ex); throw new CoreException(s); } @@ -311,7 +311,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig if (!(getLocation().toFile().delete())) { throw new DebugException( new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfiguration_Failed_to_delete_launch_configuration__1, null) //$NON-NLS-1$ + DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfiguration_Failed_to_delete_launch_configuration__1, null) ); } // manually update the launch manager cache since there @@ -385,7 +385,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig IFile file = getFile(); if (file == null) { // cannot generate memento - missing file - IStatus status = newStatus(MessageFormat.format(DebugCoreMessages.LaunchConfiguration_Unable_to_generate_memento_for__0___shared_file_does_not_exist__1, new String[]{getName()}), DebugException.INTERNAL_ERROR, null); //$NON-NLS-1$ + IStatus status = newStatus(MessageFormat.format(DebugCoreMessages.LaunchConfiguration_Unable_to_generate_memento_for__0___shared_file_does_not_exist__1, new String[]{getName()}), DebugException.INTERNAL_ERROR, null); throw new CoreException(status); } relativePath = getFile().getFullPath(); @@ -406,7 +406,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig e= te; } if (e != null) { - IStatus status = newStatus(DebugCoreMessages.LaunchConfiguration_Exception_occurred_creating_launch_configuration_memento_9, DebugException.INTERNAL_ERROR, e); //$NON-NLS-1$ + IStatus status = newStatus(DebugCoreMessages.LaunchConfiguration_Exception_occurred_creating_launch_configuration_memento_9, DebugException.INTERNAL_ERROR, e); throw new CoreException(status); } //execution will never reach here @@ -537,7 +537,7 @@ public class LaunchConfiguration extends PlatformObject implements ILaunchConfig // ensure the launch mode is valid if (!mode.equals(launch.getLaunchMode())) { IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, - MessageFormat.format(DebugCoreMessages.LaunchConfiguration_13, new String[]{mode, launch.getLaunchMode()}), null); //$NON-NLS-1$ + MessageFormat.format(DebugCoreMessages.LaunchConfiguration_13, new String[]{mode, launch.getLaunchMode()}), null); throw new CoreException(status); } } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java index b84edf23a..ff0bc6095 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationInfo.java @@ -117,7 +117,7 @@ public class LaunchConfigurationInfo { throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_lang_String__1, new String[] {key}), null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_lang_String__1, new String[] {key}), null ) ); } @@ -142,7 +142,7 @@ public class LaunchConfigurationInfo { throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_int__2, new String[] {key}), null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_int__2, new String[] {key}), null ) ); } @@ -167,7 +167,7 @@ public class LaunchConfigurationInfo { throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_boolean__3, new String[] {key}), null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_boolean__3, new String[] {key}), null ) ); } @@ -192,7 +192,7 @@ public class LaunchConfigurationInfo { throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_util_List__1, new String[] {key}), null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_util_List__1, new String[] {key}), null ) ); } @@ -217,7 +217,7 @@ public class LaunchConfigurationInfo { throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_util_Map__1, new String[] {key}), null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_Attribute__0__is_not_of_type_java_util_Map__1, new String[] {key}), null ) ); } @@ -303,7 +303,7 @@ public class LaunchConfigurationInfo { throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationInfo_36, null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationInfo_36, null ) ); } @@ -385,7 +385,7 @@ public class LaunchConfigurationInfo { ILaunchConfigurationType type = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(id); if (type == null) { - String message= MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_missing_type, new Object[]{id}); //$NON-NLS-1$ + String message= MessageFormat.format(DebugCoreMessages.LaunchConfigurationInfo_missing_type, new Object[]{id}); throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), @@ -500,7 +500,7 @@ public class LaunchConfigurationInfo { new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationInfo_Invalid_launch_configuration_XML__10, null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationInfo_Invalid_launch_configuration_XML__10, null ) ); } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java index 6097eb03c..9e057c90c 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java @@ -229,7 +229,7 @@ public class LaunchConfigurationType extends PlatformObject implements ILaunchCo */ public ILaunchConfigurationDelegate getDelegate(String mode) throws CoreException { if (!supportsMode(mode)) { - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_9, new String[] {mode, getIdentifier()}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_9, new String[] {mode, getIdentifier()}), null)); } if (fDelegates == null) { // initialize delegate table with base modes @@ -247,7 +247,7 @@ public class LaunchConfigurationType extends PlatformObject implements ILaunchCo } return (ILaunchConfigurationDelegate)object; } - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_Launch_delegate_for__0__does_not_implement_required_interface_ILaunchConfigurationDelegate__1, new String[]{getName()}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_Launch_delegate_for__0__does_not_implement_required_interface_ILaunchConfigurationDelegate__1, new String[]{getName()}), null)); } // contributed modes List contributed = ((LaunchManager)DebugPlugin.getDefault().getLaunchManager()).getContributedDelegates(); @@ -269,7 +269,7 @@ public class LaunchConfigurationType extends PlatformObject implements ILaunchCo } else { return delegate; } - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_10, new String[] {getIdentifier(), mode}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchConfigurationType_10, new String[] {getIdentifier(), mode}), null)); } /* (non-Javadoc) diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java index d2859fc10..a1b69d2c8 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationWorkingCopy.java @@ -216,7 +216,7 @@ public class LaunchConfigurationWorkingCopy extends LaunchConfiguration implemen throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationWorkingCopy__0__occurred_generating_launch_configuration_XML__1, new String[]{e.toString()}), null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationWorkingCopy__0__occurred_generating_launch_configuration_XML__1, new String[]{e.toString()}), null ) ); } @@ -244,7 +244,7 @@ public class LaunchConfigurationWorkingCopy extends LaunchConfiguration implemen throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationWorkingCopy__0__occurred_generating_launch_configuration_XML__1, new String[]{ie.toString()}), null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, MessageFormat.format(DebugCoreMessages.LaunchConfigurationWorkingCopy__0__occurred_generating_launch_configuration_XML__1, new String[]{ie.toString()}), null ) ); } @@ -256,7 +256,7 @@ public class LaunchConfigurationWorkingCopy extends LaunchConfiguration implemen throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationWorkingCopy_Specified_container_for_launch_configuration_does_not_exist_2, null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationWorkingCopy_Specified_container_for_launch_configuration_does_not_exist_2, null ) ); } @@ -267,7 +267,7 @@ public class LaunchConfigurationWorkingCopy extends LaunchConfiguration implemen throw new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationWorkingCopy_5, null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchConfigurationWorkingCopy_5, null )); } if (!file.exists()) { diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java index bada14051..15dcd78d7 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java @@ -564,7 +564,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe } else { IFile file = ((LaunchConfiguration) config).getFile(); if (file == null) { - throw createDebugException(MessageFormat.format(DebugCoreMessages.LaunchManager_30, new String[] {config.getName()}), null); //$NON-NLS-1$ + throw createDebugException(MessageFormat.format(DebugCoreMessages.LaunchManager_30, new String[] {config.getName()}), null); } stream = file.getContents(); } @@ -590,7 +590,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe } else { throw createDebugException( - MessageFormat.format(DebugCoreMessages.LaunchManager_does_not_exist, new String[]{config.getName(), config.getLocation().toOSString()}), null); //$NON-NLS-1$ + MessageFormat.format(DebugCoreMessages.LaunchManager_does_not_exist, new String[]{config.getName(), config.getLocation().toOSString()}), null); } } return info; @@ -602,7 +602,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe */ private void throwException(ILaunchConfiguration config, Throwable e) throws DebugException { IPath path = config.getLocation(); - throw createDebugException(MessageFormat.format(DebugCoreMessages.LaunchManager__0__occurred_while_reading_launch_configuration_file__1___1, new String[]{e.toString(), path.toOSString()}), e); //$NON-NLS-1$ + throw createDebugException(MessageFormat.format(DebugCoreMessages.LaunchManager__0__occurred_while_reading_launch_configuration_file__1___1, new String[]{e.toString(), path.toOSString()}), e); } /** @@ -1026,7 +1026,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe new DebugException( new Status( IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), - DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchManager_Invalid_launch_configuration_index__18, null //$NON-NLS-1$ + DebugException.REQUEST_FAILED, DebugCoreMessages.LaunchManager_Invalid_launch_configuration_index__18, null ) ); @@ -1212,7 +1212,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe } else { // invalid status handler IStatus s = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.INTERNAL_ERROR, - MessageFormat.format(DebugCoreMessages.LaunchManager_Invalid_source_locator_extentsion_defined_by_plug_in____0_______id___not_specified_12, new String[] {configurationElement.getNamespace()} ), null); //$NON-NLS-1$ + MessageFormat.format(DebugCoreMessages.LaunchManager_Invalid_source_locator_extentsion_defined_by_plug_in____0_______id___not_specified_12, new String[] {configurationElement.getNamespace()} ), null); DebugPlugin.log(s); } } @@ -1236,7 +1236,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe } else { // invalid status handler IStatus s = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.INTERNAL_ERROR, - MessageFormat.format(DebugCoreMessages.LaunchManager_Invalid_launch_configuration_comparator_extension_defined_by_plug_in__0____attribute_not_specified_1, new String[] {configurationElement.getNamespace()}), null); //$NON-NLS-1$ + MessageFormat.format(DebugCoreMessages.LaunchManager_Invalid_launch_configuration_comparator_extension_defined_by_plug_in__0____attribute_not_specified_1, new String[] {configurationElement.getNamespace()}), null); DebugPlugin.log(s); } } @@ -1251,7 +1251,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe IConfigurationElement config = (IConfigurationElement)fSourceLocators.get(identifier); if (config == null) { throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.INTERNAL_ERROR, - MessageFormat.format(DebugCoreMessages.LaunchManager_Source_locator_does_not_exist___0__13, new String[] {identifier} ), null)); //$NON-NLS-1$ + MessageFormat.format(DebugCoreMessages.LaunchManager_Source_locator_does_not_exist___0__13, new String[] {identifier} ), null)); } IPersistableSourceLocator sourceLocator = (IPersistableSourceLocator)config.createExecutableExtension("class"); //$NON-NLS-1$ if (sourceLocator instanceof AbstractSourceLookupDirector) { @@ -1416,7 +1416,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ public void handleException(Throwable exception) { - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LaunchManager_An_exception_occurred_during_launch_change_notification__1, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LaunchManager_An_exception_occurred_during_launch_change_notification__1, exception); DebugPlugin.log(status); } @@ -1478,7 +1478,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ public void handleException(Throwable exception) { - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LaunchManager_An_exception_occurred_during_launch_change_notification__1, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LaunchManager_An_exception_occurred_during_launch_change_notification__1, exception); DebugPlugin.log(status); } @@ -1568,7 +1568,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ public void handleException(Throwable exception) { - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LaunchManager_An_exception_occurred_during_launch_configuration_change_notification__3, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LaunchManager_An_exception_occurred_during_launch_configuration_change_notification__3, exception); DebugPlugin.log(status); } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java index b4bfc5ddf..741afd8c2 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java @@ -57,7 +57,7 @@ public class LaunchMode implements ILaunchMode { } private void missingAttribute(String attrName) throws CoreException { - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchMode_1,new String[]{attrName}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LaunchMode_1,new String[]{attrName}), null)); } /* (non-Javadoc) diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureProvider.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureProvider.java index b52129231..8e47b4b7a 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureProvider.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureProvider.java @@ -34,11 +34,11 @@ public class LogicalStructureProvider { fConfigurationElement= element; fModelIdentifier= fConfigurationElement.getAttribute("modelIdentifier"); //$NON-NLS-1$ if (fModelIdentifier == null) { - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LogicalStructureProvider_0, null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LogicalStructureProvider_0, null)); } String className= fConfigurationElement.getAttribute("class"); //$NON-NLS-1$ if (className == null) { - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LogicalStructureProvider_1, null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, DebugCoreMessages.LogicalStructureProvider_1, null)); } } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java index 10f81bb55..1832f7012 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java @@ -69,7 +69,7 @@ public class LogicalStructureType implements ILogicalStructureType { } private void missingAttribute(String attrName) throws CoreException { - throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LogicalStructureType_7,new String[]{attrName}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.LogicalStructureType_7,new String[]{attrName}), null)); } /* (non-Javadoc) @@ -133,7 +133,7 @@ public class LogicalStructureType implements ILogicalStructureType { } String description = getDescription(); if (description == null) { - return DebugCoreMessages.LogicalStructureType_0; //$NON-NLS-1$ + return DebugCoreMessages.LogicalStructureType_0; } return description; } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java index 50cda6fc1..5d0dab378 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java @@ -71,7 +71,7 @@ public class NullStreamsProxy implements IStreamsProxy2 { } catch (IOException e) { } } - }, DebugCoreMessages.NullStreamsProxy_0); //$NON-NLS-1$ + }, DebugCoreMessages.NullStreamsProxy_0); thread.setDaemon(true); thread.start(); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java index 32419d542..a88012ade 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java @@ -192,7 +192,7 @@ public class OutputStreamMonitor implements IFlushableStreamMonitor { public void run() { read(); } - }, DebugCoreMessages.OutputStreamMonitor_label); //$NON-NLS-1$ + }, DebugCoreMessages.OutputStreamMonitor_label); fThread.setDaemon(true); fThread.setPriority(Thread.MIN_PRIORITY); fThread.start(); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java index 0b2334347..dec0a24ec 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java @@ -93,7 +93,7 @@ public class WatchExpression implements IWatchExpression { return true; } public String[] getErrorMessages() { - return new String[] { DebugCoreMessages.WatchExpression_0 }; //$NON-NLS-1$ + return new String[] { DebugCoreMessages.WatchExpression_0 }; } public String getExpressionText() { return WatchExpression.this.getExpressionText(); diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java index f361a9f19..cb2b6eb7f 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java @@ -54,7 +54,7 @@ public class SourceContainerType implements ISourceContainerType { if (this.equals(container.getType())) { return getDelegate().getMemento(container); } - IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.SourceContainerType_3, null); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, SourceLookupMessages.SourceContainerType_3, null); throw new CoreException(status); } /* (non-Javadoc) diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java index 6d3f67382..27c6d768f 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java @@ -39,16 +39,16 @@ public class ArchiveSourceContainerType extends AbstractSourceContainerTypeDeleg if ("archive".equals(element.getNodeName())) { //$NON-NLS-1$ String string = element.getAttribute("path"); //$NON-NLS-1$ if (string == null || string.length() == 0) { - abort(SourceLookupMessages.ExternalArchiveSourceContainerType_10, null); //$NON-NLS-1$ + abort(SourceLookupMessages.ExternalArchiveSourceContainerType_10, null); } String detect = element.getAttribute("detectRoot"); //$NON-NLS-1$ boolean auto = "true".equals(detect); //$NON-NLS-1$ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(string)); return new ArchiveSourceContainer(file, auto); } - abort(SourceLookupMessages.ExternalArchiveSourceContainerType_11, null); //$NON-NLS-1$ + abort(SourceLookupMessages.ExternalArchiveSourceContainerType_11, null); } - abort(SourceLookupMessages.ExternalArchiveSourceContainerType_12, null); //$NON-NLS-1$ + abort(SourceLookupMessages.ExternalArchiveSourceContainerType_12, null); return null; } /* (non-Javadoc) diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java index 9cfa78177..bea44536c 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java @@ -47,9 +47,9 @@ public class DefaultSourceContainerType extends AbstractSourceContainerTypeDeleg if ("default".equals(element.getNodeName())) { //$NON-NLS-1$ return new DefaultSourceContainer(); } - abort(SourceLookupMessages.DefaultSourceContainerType_6, null); //$NON-NLS-1$ + abort(SourceLookupMessages.DefaultSourceContainerType_6, null); } - abort(SourceLookupMessages.DefaultSourceContainerType_7, null); //$NON-NLS-1$ + abort(SourceLookupMessages.DefaultSourceContainerType_7, null); return null; } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java index 7734295ae..d25a0ff66 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java @@ -37,15 +37,15 @@ public class DirectorySourceContainerType extends AbstractSourceContainerTypeDel if ("directory".equals(element.getNodeName())) { //$NON-NLS-1$ String string = element.getAttribute("path"); //$NON-NLS-1$ if (string == null || string.length() == 0) { - abort(SourceLookupMessages.DirectorySourceContainerType_10, null); //$NON-NLS-1$ + abort(SourceLookupMessages.DirectorySourceContainerType_10, null); } String nest = element.getAttribute("nest"); //$NON-NLS-1$ boolean nested = "true".equals(nest); //$NON-NLS-1$ return new DirectorySourceContainer(new Path(string), nested); } - abort(SourceLookupMessages.DirectorySourceContainerType_11, null); //$NON-NLS-1$ + abort(SourceLookupMessages.DirectorySourceContainerType_11, null); } - abort(SourceLookupMessages.DirectorySourceContainerType_12, null); //$NON-NLS-1$ + abort(SourceLookupMessages.DirectorySourceContainerType_12, null); return null; } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java index 2734b6b00..43f295ac5 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java @@ -36,15 +36,15 @@ public class ExternalArchiveSourceContainerType extends AbstractSourceContainerT if ("archive".equals(element.getNodeName())) { //$NON-NLS-1$ String string = element.getAttribute("path"); //$NON-NLS-1$ if (string == null || string.length() == 0) { - abort(SourceLookupMessages.ExternalArchiveSourceContainerType_10, null); //$NON-NLS-1$ + abort(SourceLookupMessages.ExternalArchiveSourceContainerType_10, null); } String detect = element.getAttribute("detectRoot"); //$NON-NLS-1$ boolean auto = "true".equals(detect); //$NON-NLS-1$ return new ExternalArchiveSourceContainer(string, auto); } - abort(SourceLookupMessages.ExternalArchiveSourceContainerType_11, null); //$NON-NLS-1$ + abort(SourceLookupMessages.ExternalArchiveSourceContainerType_11, null); } - abort(SourceLookupMessages.ExternalArchiveSourceContainerType_12, null); //$NON-NLS-1$ + abort(SourceLookupMessages.ExternalArchiveSourceContainerType_12, null); return null; } /* (non-Javadoc) diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java index ea83044dd..ce9ea0899 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java @@ -57,7 +57,7 @@ public class FolderSourceContainerType extends AbstractSourceContainerTypeDelega if ("folder".equals(element.getNodeName())) { //$NON-NLS-1$ String string = element.getAttribute("path"); //$NON-NLS-1$ if (string == null || string.length() == 0) { - abort(SourceLookupMessages.FolderSourceContainerType_10, null); //$NON-NLS-1$ + abort(SourceLookupMessages.FolderSourceContainerType_10, null); } String nest = element.getAttribute("nest"); //$NON-NLS-1$ boolean nested = "true".equals(nest); //$NON-NLS-1$ @@ -65,9 +65,9 @@ public class FolderSourceContainerType extends AbstractSourceContainerTypeDelega IFolder folder = workspace.getRoot().getFolder(new Path(string)); return new FolderSourceContainer(folder, nested); } - abort(SourceLookupMessages.FolderSourceContainerType_11, null); //$NON-NLS-1$ + abort(SourceLookupMessages.FolderSourceContainerType_11, null); } - abort(SourceLookupMessages.FolderSourceContainerType_12, null); //$NON-NLS-1$ + abort(SourceLookupMessages.FolderSourceContainerType_12, null); return null; } } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java index ef2ac2185..7dfbb6c40 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java @@ -56,7 +56,7 @@ public class ProjectSourceContainerType extends AbstractSourceContainerTypeDeleg if ("project".equals(element.getNodeName())) { //$NON-NLS-1$ String string = element.getAttribute("name"); //$NON-NLS-1$ if (string == null || string.length() == 0) { - abort(SourceLookupMessages.ProjectSourceContainerType_10, null); //$NON-NLS-1$ + abort(SourceLookupMessages.ProjectSourceContainerType_10, null); } String nest = element.getAttribute("referencedProjects"); //$NON-NLS-1$ boolean ref = "true".equals(nest); //$NON-NLS-1$ @@ -64,9 +64,9 @@ public class ProjectSourceContainerType extends AbstractSourceContainerTypeDeleg IProject project = workspace.getRoot().getProject(string); return new ProjectSourceContainer(project, ref); } - abort(SourceLookupMessages.ProjectSourceContainerType_11, null); //$NON-NLS-1$ + abort(SourceLookupMessages.ProjectSourceContainerType_11, null); } - abort(SourceLookupMessages.ProjectSourceContainerType_12, null); //$NON-NLS-1$ + abort(SourceLookupMessages.ProjectSourceContainerType_12, null); return null; } } diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java index cc7a8d7fe..460fadd1f 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java @@ -36,9 +36,9 @@ public class WorkspaceSourceContainerType extends AbstractSourceContainerTypeDel if ("workspace".equals(element.getNodeName())) { //$NON-NLS-1$ return new WorkspaceSourceContainer(); } - abort(SourceLookupMessages.WorkspaceSourceContainerType_3, null); //$NON-NLS-1$ + abort(SourceLookupMessages.WorkspaceSourceContainerType_3, null); } - abort(SourceLookupMessages.WorkspaceSourceContainerType_4, null); //$NON-NLS-1$ + abort(SourceLookupMessages.WorkspaceSourceContainerType_4, null); return null; } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java index 26bfdc826..b4a0ec96f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java @@ -558,8 +558,8 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener { // cancelled by user return false; } catch (InvocationTargetException e) { - String title= DebugUIMessages.DebugUIPlugin_Run_Debug_1; //$NON-NLS-1$ - String message= DebugUIMessages.DebugUIPlugin_Build_error__Check_log_for_details__2; //$NON-NLS-1$ + String title= DebugUIMessages.DebugUIPlugin_Run_Debug_1; + String message= DebugUIMessages.DebugUIPlugin_Build_error__Check_log_for_details__2; Throwable t = e.getTargetException(); errorDialog(getShell(), title, message, t); return false; @@ -760,7 +760,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener { String waitForBuild = store.getString(IInternalDebugUIConstants.PREF_WAIT_FOR_BUILD); if (waitForBuild.equals(MessageDialogWithToggle.PROMPT)) { - MessageDialogWithToggle dialog = MessageDialogWithToggle.openYesNoCancelQuestion(getShell(), DebugUIMessages.DebugUIPlugin_23, DebugUIMessages.DebugUIPlugin_24, null, false, store, IInternalDebugUIConstants.PREF_WAIT_FOR_BUILD); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialogWithToggle dialog = MessageDialogWithToggle.openYesNoCancelQuestion(getShell(), DebugUIMessages.DebugUIPlugin_23, DebugUIMessages.DebugUIPlugin_24, null, false, store, IInternalDebugUIConstants.PREF_WAIT_FOR_BUILD); // switch (dialog.getReturnCode()) { case IDialogConstants.CANCEL_ID: @@ -845,7 +845,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener { return; } } - DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), DebugUIMessages.DebugUITools_Error_1, DebugUIMessages.DebugUITools_Exception_occurred_during_launch_2, t); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), DebugUIMessages.DebugUITools_Error_1, DebugUIMessages.DebugUITools_Exception_occurred_during_launch_2, t); // } /** @@ -871,7 +871,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener { String waitPref = store.getString(IInternalDebugUIConstants.PREF_WAIT_FOR_BUILD); if (wait) { // if there are build jobs running, do we wait or not?? if (waitPref.equals(MessageDialogWithToggle.PROMPT)) { - MessageDialogWithToggle dialog = MessageDialogWithToggle.openYesNoCancelQuestion(getShell(), DebugUIMessages.DebugUIPlugin_23, DebugUIMessages.DebugUIPlugin_24, null, false, store, IInternalDebugUIConstants.PREF_WAIT_FOR_BUILD); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialogWithToggle dialog = MessageDialogWithToggle.openYesNoCancelQuestion(getShell(), DebugUIMessages.DebugUIPlugin_23, DebugUIMessages.DebugUIPlugin_24, null, false, store, IInternalDebugUIConstants.PREF_WAIT_FOR_BUILD); // switch (dialog.getReturnCode()) { case IDialogConstants.CANCEL_ID: @@ -889,12 +889,12 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener { } final boolean waitInJob = wait; - Job job = new Job(DebugUIMessages.DebugUITools_3) { //$NON-NLS-1$ + Job job = new Job(DebugUIMessages.DebugUITools_3) { public IStatus run(final IProgressMonitor monitor) { try { if(waitInJob) { StringBuffer buffer= new StringBuffer(configuration.getName()); - buffer.append(DebugUIMessages.DebugUIPlugin_0); //$NON-NLS-1$ + buffer.append(DebugUIMessages.DebugUIPlugin_0); ILaunchConfigurationWorkingCopy workingCopy= configuration.copy(buffer.toString()); workingCopy.setAttribute(ATTR_LAUNCHING_CONFIG_HANDLE, configuration.getMemento()); final ILaunch pendingLaunch= new PendingLaunch(workingCopy, mode, this); @@ -956,7 +956,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener { IProgressService progressService = workbench.getProgressService(); job.setPriority(Job.INTERACTIVE); - job.setName(DebugUIMessages.DebugUITools_8); //$NON-NLS-1$ + job.setName(DebugUIMessages.DebugUITools_8); if (wait) { progressService.showInDialog(workbench.getActiveWorkbenchWindow().getShell(), job); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java index 81da510a2..740158199 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java @@ -210,20 +210,20 @@ public class DefaultLabelProvider implements ILabelProvider { if (element instanceof IProcess) { IProcess process = (IProcess)element; int exit = process.getExitValue(); - terminatedMessage= MessageFormat.format(DebugUIMessages.DefaultLabelProvider_16, new String[]{new Integer(exit).toString()}); //$NON-NLS-1$ + terminatedMessage= MessageFormat.format(DebugUIMessages.DefaultLabelProvider_16, new String[]{new Integer(exit).toString()}); } else { - terminatedMessage= DebugUIMessages.DefaultLabelProvider_1; //$NON-NLS-1$ + terminatedMessage= DebugUIMessages.DefaultLabelProvider_1; } label.insert(0, terminatedMessage); } } else if (element instanceof IDisconnect) { if (((IDisconnect) element).isDisconnected()) { - label.insert(0, DebugUIMessages.DefaultLabelProvider__disconnected__1); //$NON-NLS-1$ + label.insert(0, DebugUIMessages.DefaultLabelProvider__disconnected__1); } } } catch (DebugException e) { DebugUIPlugin.log(e); - label.append(DebugUIMessages.DefaultLabelProvider__unknown__1); //$NON-NLS-1$ + label.append(DebugUIMessages.DefaultLabelProvider__unknown__1); } return label.toString(); } @@ -243,7 +243,7 @@ public class DefaultLabelProvider implements ILabelProvider { if (breakpoint instanceof ILineBreakpoint) { try { int lineNumber = ((ILineBreakpoint)breakpoint).getLineNumber(); - label.append(MessageFormat.format(DebugUIMessages.DefaultLabelProvider_17, new String[]{Integer.toString(lineNumber)})); //$NON-NLS-1$ + label.append(MessageFormat.format(DebugUIMessages.DefaultLabelProvider_17, new String[]{Integer.toString(lineNumber)})); } catch (CoreException e) { } } @@ -257,7 +257,7 @@ public class DefaultLabelProvider implements ILabelProvider { return de.getLabel(object); } } - return DebugUIMessages.DefaultLabelProvider__unknown__1; //$NON-NLS-1$ + return DebugUIMessages.DefaultLabelProvider__unknown__1; } /** @@ -265,7 +265,7 @@ public class DefaultLabelProvider implements ILabelProvider { */ protected String getLaunchText(ILaunch launch) { if (launch.getLaunchConfiguration() == null || (!launch.getLaunchConfiguration().exists() && !launch.getLaunchConfiguration().isWorkingCopy())) { - return DebugUIMessages.DefaultLabelProvider__unknown__1; //$NON-NLS-1$ + return DebugUIMessages.DefaultLabelProvider__unknown__1; } // new launch configuration ILaunchConfiguration config = launch.getLaunchConfiguration(); @@ -309,9 +309,9 @@ public class DefaultLabelProvider implements ILabelProvider { StringBuffer result= new StringBuffer(); result.append('"').append(expression.getExpressionText()).append('"'); if (expression.isPending()) { - result.append(DebugUIMessages.DefaultLabelProvider_12); //$NON-NLS-1$ + result.append(DebugUIMessages.DefaultLabelProvider_12); } else if (expression.hasErrors()) { - result.append(DebugUIMessages.DefaultLabelProvider_13); //$NON-NLS-1$ + result.append(DebugUIMessages.DefaultLabelProvider_13); } else { IValue value= expression.getValue(); if (value != null) { @@ -322,7 +322,7 @@ public class DefaultLabelProvider implements ILabelProvider { } } if (!expression.isEnabled()) { - result.append(DebugUIMessages.DefaultLabelProvider_15); //$NON-NLS-1$ + result.append(DebugUIMessages.DefaultLabelProvider_15); } return result.toString(); } @@ -353,7 +353,7 @@ public class DefaultLabelProvider implements ILabelProvider { protected String getMarkerText(IMarker marker) { try { if (marker.exists() && marker.isSubtypeOf(IBreakpoint.BREAKPOINT_MARKER)) { - return DebugUIMessages.DefaultLabelProvider_Breakpoint_1; //$NON-NLS-1$ + return DebugUIMessages.DefaultLabelProvider_Breakpoint_1; } } catch (CoreException e) { DebugUIPlugin.log(e); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ImageDescriptorRegistry.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ImageDescriptorRegistry.java index ac3dcb65a..aa13affbb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ImageDescriptorRegistry.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ImageDescriptorRegistry.java @@ -62,7 +62,7 @@ public class ImageDescriptorRegistry { if (result != null) return result; - Assert.isTrue(fDisplay == DebugUIPlugin.getStandardDisplay(), DebugUIMessages.ImageDescriptorRegistry_0); //$NON-NLS-1$ + Assert.isTrue(fDisplay == DebugUIPlugin.getStandardDisplay(), DebugUIMessages.ImageDescriptorRegistry_0); result= descriptor.createImage(); if (result != null) fRegistry.put(descriptor, result); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerAnnotation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerAnnotation.java index 87c21efc6..1e6a8a242 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerAnnotation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerAnnotation.java @@ -36,7 +36,7 @@ public class InstructionPointerAnnotation extends Annotation { public InstructionPointerAnnotation(IStackFrame stackFrame, boolean isTopFrame) { super(isTopFrame ? IInternalDebugUIConstants.ANN_INSTR_POINTER_CURRENT: IInternalDebugUIConstants.ANN_INSTR_POINTER_SECONDARY, false, - isTopFrame ? DebugUIMessages.InstructionPointerAnnotation_0 : DebugUIMessages.InstructionPointerAnnotation_1); //$NON-NLS-1$ //$NON-NLS-2$ + isTopFrame ? DebugUIMessages.InstructionPointerAnnotation_0 : DebugUIMessages.InstructionPointerAnnotation_1); // fStackFrame = stackFrame; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java index 0fd757d2c..be159d0a6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java @@ -193,11 +193,11 @@ public class MultipleInputDialog extends Dialog { }); } - Button button = createButton(comp, IDialogConstants.IGNORE_ID, DebugUIMessages.MultipleInputDialog_6, false); //$NON-NLS-1$ + Button button = createButton(comp, IDialogConstants.IGNORE_ID, DebugUIMessages.MultipleInputDialog_6, false); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { DirectoryDialog dialog = new DirectoryDialog(getShell()); - dialog.setMessage(DebugUIMessages.MultipleInputDialog_7); //$NON-NLS-1$ + dialog.setMessage(DebugUIMessages.MultipleInputDialog_7); String currentWorkingDir = text.getText(); if (!currentWorkingDir.trim().equals("")) { //$NON-NLS-1$ File path = new File(currentWorkingDir); @@ -257,7 +257,7 @@ public class MultipleInputDialog extends Dialog { }); } - Button button = createButton(comp, IDialogConstants.IGNORE_ID, DebugUIMessages.MultipleInputDialog_8, false); //$NON-NLS-1$ + Button button = createButton(comp, IDialogConstants.IGNORE_ID, DebugUIMessages.MultipleInputDialog_8, false); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java index c6c33ad07..f1530c87b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java @@ -73,7 +73,7 @@ public class ResourceExtender extends PropertyTester { } } } else { - if (PROPERTY_MATCHES_PATTERN.equals(method)) { //$NON-NLS-1$ + if (PROPERTY_MATCHES_PATTERN.equals(method)) { String fileName = resource.getName(); String expected = (String) expectedValue; expected = expected.replaceAll("\\.", "\\\\."); //$NON-NLS-1$//$NON-NLS-2$ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/WorkingDirectoryStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/WorkingDirectoryStatusHandler.java index f496649c8..0c0adf0b9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/WorkingDirectoryStatusHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/WorkingDirectoryStatusHandler.java @@ -28,8 +28,8 @@ public class WorkingDirectoryStatusHandler implements IStatusHandler { final boolean[] result = new boolean[1]; DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() { public void run() { - String title= DebugUIMessages.WorkingDirectoryStatusHandler_Eclipse_Runtime_1; //$NON-NLS-1$ - String message= DebugUIMessages.WorkingDirectoryStatusHandler_Eclipse_is_not_able_to_set_the_working_directory_specified_by_the_program_being_launched_as_the_current_runtime_does_not_support_working_directories__nContinue_launch_without_setting_the_working_directory__2; //$NON-NLS-1$ + String title= DebugUIMessages.WorkingDirectoryStatusHandler_Eclipse_Runtime_1; + String message= DebugUIMessages.WorkingDirectoryStatusHandler_Eclipse_is_not_able_to_set_the_working_directory_specified_by_the_program_being_launched_as_the_current_runtime_does_not_support_working_directories__nContinue_launch_without_setting_the_working_directory__2; result[0]= (MessageDialog.openQuestion(DebugUIPlugin.getShell(), title, message)); } }); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java index 420574ec3..bb5b2a915 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java @@ -81,7 +81,7 @@ public class AddToFavoritesAction extends SelectionListenerAction { setGroup(group); setLaunchConfiguration(configuration); setMode(launch.getLaunchMode()); - setText(MessageFormat.format(ActionMessages.AddToFavoritesAction_1, new String[]{DebugUIPlugin.removeAccelerators(getGroup().getLabel())})); //$NON-NLS-1$ + setText(MessageFormat.format(ActionMessages.AddToFavoritesAction_1, new String[]{DebugUIPlugin.removeAccelerators(getGroup().getLabel())})); } } } @@ -157,7 +157,7 @@ public class AddToFavoritesAction extends SelectionListenerAction { } }); if (ex[0] != null) { - DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.AddToFavoritesAction_2, ActionMessages.AddToFavoritesAction_3, ex[0].getStatus()); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.AddToFavoritesAction_2, ActionMessages.AddToFavoritesAction_3, ex[0].getStatus()); // } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AssignValueAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AssignValueAction.java index 47fc0aeab..ed982db12 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AssignValueAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AssignValueAction.java @@ -40,7 +40,7 @@ public class AssignValueAction extends SelectionProviderAction { private ISourceViewer detailsViewer; public AssignValueAction(VariablesView varView, ISourceViewer detailViewer) { - super(varView.getViewer(), ActionMessages.AssignValueAction_1); //$NON-NLS-1$ + super(varView.getViewer(), ActionMessages.AssignValueAction_1); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.ASSIGN_VALUE_ACTION); variablesView = varView; detailsViewer = detailViewer; @@ -101,7 +101,7 @@ public class AssignValueAction extends SelectionProviderAction { variable.setValue(value); } else { if (activeShell != null) { - DebugUIPlugin.errorDialog(activeShell, ActionMessages.AssignValueAction_2, MessageFormat.format(ActionMessages.AssignValueAction_3, new String[] {value, variable.getName()}), new StatusInfo(IStatus.ERROR, ActionMessages.AssignValueAction_4)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + DebugUIPlugin.errorDialog(activeShell, ActionMessages.AssignValueAction_2, MessageFormat.format(ActionMessages.AssignValueAction_3, new String[] {value, variable.getName()}), new StatusInfo(IStatus.ERROR, ActionMessages.AssignValueAction_4)); // } } } catch (DebugException e) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueAction.java index 3cfe315b3..102b98af4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ChangeVariableValueAction.java @@ -48,8 +48,8 @@ public class ChangeVariableValueAction extends SelectionProviderAction { * @param view the varibles view in which this action will appear */ public ChangeVariableValueAction(VariablesView view) { - super(view.getViewer(), ActionMessages.ChangeVariableValue_title); //$NON-NLS-1$ - setDescription(ActionMessages.ChangeVariableValue_toolTipText); //$NON-NLS-1$ + super(view.getViewer(), ActionMessages.ChangeVariableValue_title); + setDescription(ActionMessages.ChangeVariableValue_toolTipText); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_CHANGE_VARIABLE_VALUE)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_CHANGE_VARIABLE_VALUE)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_CHANGE_VARIABLE_VALUE)); @@ -105,10 +105,10 @@ public class ChangeVariableValueAction extends SelectionProviderAction { name= fVariable.getName(); value= fVariable.getValue().getValueString(); } catch (DebugException exception) { - DebugUIPlugin.errorDialog(shell, ActionMessages.ChangeVariableValue_errorDialogTitle,ActionMessages.ChangeVariableValue_errorDialogMessage, exception); //$NON-NLS-2$ //$NON-NLS-1$ + DebugUIPlugin.errorDialog(shell, ActionMessages.ChangeVariableValue_errorDialogTitle,ActionMessages.ChangeVariableValue_errorDialogMessage, exception); // return; } - ChangeVariableValueInputDialog inputDialog= new ChangeVariableValueInputDialog(shell, ActionMessages.ChangeVariableValue_1, MessageFormat.format(ActionMessages.ChangeVariableValue_2, new String[] {name}), value, new IInputValidator() { //$NON-NLS-1$ //$NON-NLS-2$ + ChangeVariableValueInputDialog inputDialog= new ChangeVariableValueInputDialog(shell, ActionMessages.ChangeVariableValue_1, MessageFormat.format(ActionMessages.ChangeVariableValue_2, new String[] {name}), value, new IInputValidator() { // /** * Returns an error string if the input is invalid */ @@ -118,9 +118,9 @@ public class ChangeVariableValueAction extends SelectionProviderAction { return null; // null means valid } } catch (DebugException exception) { - return ActionMessages.ChangeVariableValue_3; //$NON-NLS-1$ + return ActionMessages.ChangeVariableValue_3; } - return ActionMessages.ChangeVariableValue_4; //$NON-NLS-1$ + return ActionMessages.ChangeVariableValue_4; } }); @@ -132,7 +132,7 @@ public class ChangeVariableValueAction extends SelectionProviderAction { fVariable.setValue(newValue); getSelectionProvider().setSelection(new StructuredSelection(fVariable)); } catch (DebugException de) { - DebugUIPlugin.errorDialog(shell, ActionMessages.ChangeVariableValue_errorDialogTitle,ActionMessages.ChangeVariableValue_errorDialogMessage, de); //$NON-NLS-2$ //$NON-NLS-1$ + DebugUIPlugin.errorDialog(shell, ActionMessages.ChangeVariableValue_errorDialogTitle,ActionMessages.ChangeVariableValue_errorDialogMessage, de); // } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java index bcdf91f17..873e68ff2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java @@ -23,8 +23,8 @@ public class CollapseAllAction extends Action { private AbstractTreeViewer fViewer; public CollapseAllAction(AbstractTreeViewer viewer) { - super(ActionMessages.CollapseAllAction_0, DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COLLAPSE_ALL)); //$NON-NLS-1$ - setToolTipText(ActionMessages.CollapseAllAction_0); //$NON-NLS-1$ + super(ActionMessages.CollapseAllAction_0, DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COLLAPSE_ALL)); + setToolTipText(ActionMessages.CollapseAllAction_0); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COLLAPSE_ALL)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_COLLAPSE_ALL)); fViewer = viewer; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CopyToClipboardActionDelegate.java index f85b5b11f..9d6037c11 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CopyToClipboardActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CopyToClipboardActionDelegate.java @@ -122,7 +122,7 @@ public class CopyToClipboardActionDelegate extends AbstractDebugActionDelegate { if (e.code != DND.ERROR_CANNOT_SET_CLIPBOARD) { throw e; } - if (MessageDialog.openQuestion(getViewer().getControl().getShell(), ActionMessages.CopyToClipboardActionDelegate_Problem_Copying_to_Clipboard_1, ActionMessages.CopyToClipboardActionDelegate_There_was_a_problem_when_accessing_the_system_clipboard__Retry__2)) { //$NON-NLS-1$ //$NON-NLS-2$ + if (MessageDialog.openQuestion(getViewer().getControl().getShell(), ActionMessages.CopyToClipboardActionDelegate_Problem_Copying_to_Clipboard_1, ActionMessages.CopyToClipboardActionDelegate_There_was_a_problem_when_accessing_the_system_clipboard__Retry__2)) { // doCopy(clipboard, plainTextTransfer, buffer); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DisconnectActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DisconnectActionDelegate.java index 7a40d5113..bc2ee1866 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DisconnectActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DisconnectActionDelegate.java @@ -45,14 +45,14 @@ public class DisconnectActionDelegate extends AbstractListenerActionDelegate { * @see AbstractDebugActionDelegate#getStatusMessage() */ protected String getStatusMessage() { - return ActionMessages.DisconnectActionDelegate_Exceptions_occurred_attempting_to_disconnect__2; //$NON-NLS-1$ + return ActionMessages.DisconnectActionDelegate_Exceptions_occurred_attempting_to_disconnect__2; } /** * @see AbstractDebugActionDelegate#getErrorDialogMessage() */ protected String getErrorDialogMessage() { - return ActionMessages.DisconnectActionDelegate_Disconnect_failed_1; //$NON-NLS-1$ + return ActionMessages.DisconnectActionDelegate_Disconnect_failed_1; } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java index a6805ef0e..7296f1ce0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java @@ -87,7 +87,7 @@ public class EditLaunchConfigurationAction extends SelectionListenerAction { } setLaunchConfiguration(configuration); setMode(launch.getLaunchMode()); - setText(MessageFormat.format(ActionMessages.EditLaunchConfigurationAction_1, new String[]{configuration.getName()})); //$NON-NLS-1$ + setText(MessageFormat.format(ActionMessages.EditLaunchConfigurationAction_1, new String[]{configuration.getName()})); ImageDescriptor descriptor = null; try { descriptor = DebugPluginImages.getImageDescriptor(configuration.getType().getIdentifier()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EnableBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EnableBreakpointsAction.java index 6b453e846..4d280c159 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EnableBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EnableBreakpointsAction.java @@ -83,7 +83,7 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen } final Iterator itr= selection.iterator(); - final MultiStatus ms= new MultiStatus(DebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, ActionMessages.EnableBreakpointAction_Enable_breakpoint_s__failed_2, null); //$NON-NLS-1$ + final MultiStatus ms= new MultiStatus(DebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, ActionMessages.EnableBreakpointAction_Enable_breakpoint_s__failed_2, null); IWorkspaceRunnable runnable = new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) { while (itr.hasNext()) { @@ -120,7 +120,7 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen if (!ms.isOK()) { IWorkbenchWindow window= DebugUIPlugin.getActiveWorkbenchWindow(); if (window != null) { - DebugUIPlugin.errorDialog(window.getShell(), ActionMessages.EnableBreakpointAction_Enabling_breakpoints_3, ActionMessages.EnableBreakpointAction_Exceptions_occurred_enabling_the_breakpoint_s___4, ms); //$NON-NLS-2$ //$NON-NLS-1$ + DebugUIPlugin.errorDialog(window.getShell(), ActionMessages.EnableBreakpointAction_Enabling_breakpoints_3, ActionMessages.EnableBreakpointAction_Exceptions_occurred_enabling_the_breakpoint_s___4, ms); // } else { DebugUIPlugin.log(ms); } @@ -186,7 +186,7 @@ public class EnableBreakpointsAction implements IViewActionDelegate, IPartListen private void handleException(CoreException ce) { IWorkbenchWindow window= DebugUIPlugin.getActiveWorkbenchWindow(); if (window != null) { - DebugUIPlugin.errorDialog(window.getShell(), ActionMessages.EnableBreakpointAction_Enabling_breakpoints_3, ActionMessages.EnableBreakpointAction_Exceptions_occurred_enabling_the_breakpoint_s___4, ce); //$NON-NLS-2$ //$NON-NLS-1$ + DebugUIPlugin.errorDialog(window.getShell(), ActionMessages.EnableBreakpointAction_Enabling_breakpoints_3, ActionMessages.EnableBreakpointAction_Exceptions_occurred_enabling_the_breakpoint_s___4, ce); // } else { DebugUIPlugin.log(ce); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindVariableAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindVariableAction.java index c8430375e..f951facf6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindVariableAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindVariableAction.java @@ -57,7 +57,7 @@ public class FindVariableAction extends Action implements IUpdate { private AbstractListenerActionDelegate fDelegate; public FindVariableAction(VariablesView view) { - setText(ActionMessages.FindVariableAction_0); //$NON-NLS-1$ + setText(ActionMessages.FindVariableAction_0); setId(DebugUIPlugin.getUniqueIdentifier() + ".FindVariableAction"); //$NON-NLS-1$ PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.FIND_VARIABLE_ACTION); setActionDefinitionId(IWorkbenchActionDefinitionIds.FIND_REPLACE); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindVariableDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindVariableDialog.java index d7c30c5d2..d819ca1ec 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindVariableDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindVariableDialog.java @@ -110,7 +110,7 @@ public class FindVariableDialog extends Dialog { } catch (DebugException e) { DebugUIPlugin.log(e.getStatus()); } - return ActionMessages.FindVariableDialog_0; //$NON-NLS-1$ + return ActionMessages.FindVariableDialog_0; } public void setAttribute(String attribute, Object value) {} public void computeDetail(IValue value, IValueDetailListener listener) {} @@ -139,7 +139,7 @@ public class FindVariableDialog extends Dialog { Label label= new Label(composite, SWT.NONE); label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); label.setFont(parent.getFont()); - label.setText(ActionMessages.FindVariableDialog_1); //$NON-NLS-1$ + label.setText(ActionMessages.FindVariableDialog_1); fText= new Text(composite, SWT.SINGLE | SWT.BORDER); fText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); @@ -153,7 +153,7 @@ public class FindVariableDialog extends Dialog { label= new Label(composite, SWT.NONE); label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); label.setFont(parent.getFont()); - label.setText(ActionMessages.FindVariableDialog_2); //$NON-NLS-1$ + label.setText(ActionMessages.FindVariableDialog_2); fViewer= new TableViewer(composite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); Table table = fViewer.getTable(); @@ -203,7 +203,7 @@ public class FindVariableDialog extends Dialog { } protected void configureShell(Shell newShell) { - newShell.setText(ActionMessages.FindVariableDialog_3); //$NON-NLS-1$ + newShell.setText(ActionMessages.FindVariableDialog_3); super.configureShell(newShell); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ModifyWatchpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ModifyWatchpointAction.java index 0925f16c3..7a6aedf59 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ModifyWatchpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ModifyWatchpointAction.java @@ -43,7 +43,7 @@ public abstract class ModifyWatchpointAction implements IObjectActionDelegate, I } } } catch (CoreException e) { - DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.ModifyWatchpointAction_0, ActionMessages.ModifyWatchpointAction_1, e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.ModifyWatchpointAction_0, ActionMessages.ModifyWatchpointAction_1, e.getStatus()); // } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenBreakpointMarkerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenBreakpointMarkerAction.java index 9dcee6f5d..904012a0f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenBreakpointMarkerAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/OpenBreakpointMarkerAction.java @@ -33,8 +33,8 @@ public class OpenBreakpointMarkerAction extends SelectionProviderAction { private IEditorInput input; public OpenBreakpointMarkerAction(ISelectionProvider selectionProvider) { - super(selectionProvider, ActionMessages.OpenBreakpointMarkerAction__Go_to_File_1); //$NON-NLS-1$ - setToolTipText(ActionMessages.OpenBreakpointMarkerAction_Go_to_File_for_Breakpoint_2); //$NON-NLS-1$ + super(selectionProvider, ActionMessages.OpenBreakpointMarkerAction__Go_to_File_1); + setToolTipText(ActionMessages.OpenBreakpointMarkerAction_Go_to_File_for_Breakpoint_2); setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ui", "icons/full/elcl16/gotoobj_tsk.gif")); //$NON-NLS-1$ //$NON-NLS-2$ PlatformUI.getWorkbench().getHelpSystem().setHelp( this, @@ -68,7 +68,7 @@ public class OpenBreakpointMarkerAction extends SelectionProviderAction { try { part= page.openEditor(input, editorId); } catch (PartInitException e) { - DebugUIPlugin.errorDialog(dwindow.getShell(), ActionMessages.OpenBreakpointMarkerAction_Go_to_Breakpoint_1, ActionMessages.OpenBreakpointMarkerAction_Exceptions_occurred_attempting_to_open_the_editor_for_the_breakpoint_resource_2, e); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(dwindow.getShell(), ActionMessages.OpenBreakpointMarkerAction_Go_to_Breakpoint_1, ActionMessages.OpenBreakpointMarkerAction_Exceptions_occurred_attempting_to_open_the_editor_for_the_breakpoint_resource_2, e); // } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java index 00f275a3c..d461458a6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchActionDelegate.java @@ -69,13 +69,13 @@ public class RelaunchActionDelegate extends AbstractDebugActionDelegate { * @see AbstractDebugActionDelegate#getErrorDialogMessage() */ protected String getErrorDialogMessage() { - return ActionMessages.RelaunchActionDelegate_Launch_Failed_1; //$NON-NLS-1$ + return ActionMessages.RelaunchActionDelegate_Launch_Failed_1; } /** * @see AbstractDebugActionDelegate#getStatusMessage() */ protected String getStatusMessage() { - return ActionMessages.RelaunchActionDelegate_An_exception_occurred_while_launching_2; //$NON-NLS-1$ + return ActionMessages.RelaunchActionDelegate_An_exception_occurred_while_launching_2; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java index f6341336b..a47d2f0f3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RelaunchLastAction.java @@ -60,8 +60,8 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega DebugUITools.launch(configuration, getMode()); } else { String configName = configuration.getName(); - String title = ActionMessages.RelaunchLastAction_Cannot_relaunch_1; //$NON-NLS-1$ - String message = MessageFormat.format(ActionMessages.RelaunchLastAction_Cannot_relaunch___0___because_it_does_not_support__2__mode_2, new String[] {configName, getMode()}); //$NON-NLS-1$ + String title = ActionMessages.RelaunchLastAction_Cannot_relaunch_1; + String message = MessageFormat.format(ActionMessages.RelaunchLastAction_Cannot_relaunch___0___because_it_does_not_support__2__mode_2, new String[] {configName, getMode()}); MessageDialog.openError(getShell(), title, message); } } else { @@ -69,7 +69,7 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega openLaunchConfigurationDialog(); } } catch (CoreException ce) { - DebugUIPlugin.errorDialog(getShell(), ActionMessages.RelaunchLastAction_Error_relaunching_3, ActionMessages.RelaunchLastAction_Error_encountered_attempting_to_relaunch_4, ce); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(getShell(), ActionMessages.RelaunchLastAction_Error_relaunching_3, ActionMessages.RelaunchLastAction_Error_encountered_attempting_to_relaunch_4, ce); // } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllBreakpointsAction.java index 9272447c6..29213a6c6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveAllBreakpointsAction.java @@ -45,9 +45,9 @@ public class RemoveAllBreakpointsAction extends AbstractRemoveAllActionDelegate if (window == null) { return; } - boolean proceed = MessageDialog.openQuestion(window.getShell(), ActionMessages.RemoveAllBreakpointsAction_0, ActionMessages.RemoveAllBreakpointsAction_1); //$NON-NLS-1$ //$NON-NLS-2$ + boolean proceed = MessageDialog.openQuestion(window.getShell(), ActionMessages.RemoveAllBreakpointsAction_0, ActionMessages.RemoveAllBreakpointsAction_1); // if (proceed) { - new Job(ActionMessages.RemoveAllBreakpointsAction_2) { //$NON-NLS-1$ + new Job(ActionMessages.RemoveAllBreakpointsAction_2) { protected IStatus run(IProgressMonitor monitor) { try { breakpointManager.removeBreakpoints(breakpoints, true); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveBreakpointAction.java index d2572e270..3fb9528de 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RemoveBreakpointAction.java @@ -56,7 +56,7 @@ public class RemoveBreakpointAction extends AbstractRemoveActionDelegate { } else if (next instanceof BreakpointContainer) { if (!deleteContainers) { // Prompt the user to delete containers only once. - deleteContainers = MessageDialog.openConfirm(getView().getSite().getShell(), ActionMessages.RemoveBreakpointAction_0, ActionMessages.RemoveBreakpointAction_1); //$NON-NLS-1$ //$NON-NLS-2$ + deleteContainers = MessageDialog.openConfirm(getView().getSite().getShell(), ActionMessages.RemoveBreakpointAction_0, ActionMessages.RemoveBreakpointAction_1); // if (!deleteContainers) { // User cancelled. Do nothing return; @@ -70,7 +70,7 @@ public class RemoveBreakpointAction extends AbstractRemoveActionDelegate { } } final IBreakpoint[] breakpoints= (IBreakpoint[]) breakpointsToDelete.toArray(new IBreakpoint[0]); - new Job(ActionMessages.RemoveBreakpointAction_2) { //$NON-NLS-1$ + new Job(ActionMessages.RemoveBreakpointAction_2) { protected IStatus run(IProgressMonitor pmonitor) { try { DebugPlugin.getDefault().getBreakpointManager().removeBreakpoints(breakpoints, true); @@ -100,7 +100,7 @@ public class RemoveBreakpointAction extends AbstractRemoveActionDelegate { if (exception[0] != null) { IWorkbenchWindow window= DebugUIPlugin.getActiveWorkbenchWindow(); if (window != null) { - DebugUIPlugin.errorDialog(window.getShell(), ActionMessages.RemoveBreakpointAction_Removing_a_breakpoint_4,ActionMessages.RemoveBreakpointAction_Exceptions_occurred_attempting_to_remove_a_breakpoint__5 , exception[0]); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(window.getShell(), ActionMessages.RemoveBreakpointAction_Removing_a_breakpoint_4,ActionMessages.RemoveBreakpointAction_Exceptions_occurred_attempting_to_remove_a_breakpoint__5 , exception[0]); // } else { DebugUIPlugin.log(exception[0]); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ResumeActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ResumeActionDelegate.java index 6e26f0ce3..3901fe488 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ResumeActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ResumeActionDelegate.java @@ -105,14 +105,14 @@ public class ResumeActionDelegate extends AbstractListenerActionDelegate { * @see AbstractDebugActionDelegate#getStatusMessage() */ protected String getStatusMessage() { - return ActionMessages.ResumeActionDelegate_Exceptions_occurred_attempting_to_resume__2; //$NON-NLS-1$ + return ActionMessages.ResumeActionDelegate_Exceptions_occurred_attempting_to_resume__2; } /** * @see AbstractDebugActionDelegate#getErrorDialogMessage() */ protected String getErrorDialogMessage() { - return ActionMessages.ResumeActionDelegate_Resume_failed__1; //$NON-NLS-1$ + return ActionMessages.ResumeActionDelegate_Resume_failed__1; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java index f2768a7e2..aa1a1810a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RetargetAction.java @@ -95,7 +95,7 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, try { performAction(fTargetAdapter, getTargetSelection(), fActivePart); } catch (CoreException e) { - DebugUIPlugin.errorDialog(fWindow.getShell(), ActionMessages.RetargetAction_2, ActionMessages.RetargetAction_3, e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(fWindow.getShell(), ActionMessages.RetargetAction_2, ActionMessages.RetargetAction_3, e.getStatus()); // } } } @@ -140,8 +140,8 @@ public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, Object adapter = adaptable.getAdapter(getAdapterClass()); if (adapter == null) { IAdapterManager adapterManager = Platform.getAdapterManager(); - if (adapterManager.hasAdapter(adaptable, getAdapterClass().getName())) { //$NON-NLS-1$ - fTargetAdapter = adapterManager.loadAdapter(adaptable, getAdapterClass().getName()); //$NON-NLS-1$ + if (adapterManager.hasAdapter(adaptable, getAdapterClass().getName())) { + fTargetAdapter = adapterManager.loadAdapter(adaptable, getAdapterClass().getName()); } } return adapter; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowSupportedBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowSupportedBreakpointsAction.java index 6f56e8e5b..039bab284 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowSupportedBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowSupportedBreakpointsAction.java @@ -94,8 +94,8 @@ public class ShowSupportedBreakpointsAction extends ToggleFilterAction implement public ShowSupportedBreakpointsAction(StructuredViewer viewer, IViewPart view) { super(); - setText(ActionMessages.ShowSupportedBreakpointsAction_Show_For_Selected); //$NON-NLS-1$ - setToolTipText(ActionMessages.ShowSupportedBreakpointsAction_tooltip); //$NON-NLS-1$ + setText(ActionMessages.ShowSupportedBreakpointsAction_Show_For_Selected); + setToolTipText(ActionMessages.ShowSupportedBreakpointsAction_tooltip); setViewerFilter(new BreakpointFilter()); setViewer(viewer); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowTypesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowTypesAction.java index ec2118110..da7ed8bca 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowTypesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowTypesAction.java @@ -34,9 +34,9 @@ public class ShowTypesAction extends Action { private IDebugView fView; public ShowTypesAction(IDebugView view) { - super(ActionMessages.ShowTypesAction_Show__Type_Names_1, IAction.AS_CHECK_BOX); //$NON-NLS-1$ + super(ActionMessages.ShowTypesAction_Show__Type_Names_1, IAction.AS_CHECK_BOX); setView(view); - setToolTipText(ActionMessages.ShowTypesAction_Show_Type_Names); //$NON-NLS-1$ + setToolTipText(ActionMessages.ShowTypesAction_Show_Type_Names); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_TYPE_NAMES)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TYPE_NAMES)); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TYPE_NAMES)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SkipAllBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SkipAllBreakpointsAction.java index 48c97b876..38a14062e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SkipAllBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SkipAllBreakpointsAction.java @@ -42,9 +42,9 @@ public class SkipAllBreakpointsAction extends Action implements IWorkbenchWindow private IAction fAction; public SkipAllBreakpointsAction() { - super(ActionMessages.SkipAllBreakpointsAction_0); //$NON-NLS-1$ - setToolTipText(ActionMessages.SkipAllBreakpointsAction_0); //$NON-NLS-1$ - setDescription(ActionMessages.SkipAllBreakpointsAction_2); //$NON-NLS-1$ + super(ActionMessages.SkipAllBreakpointsAction_0); + setToolTipText(ActionMessages.SkipAllBreakpointsAction_0); + setDescription(ActionMessages.SkipAllBreakpointsAction_2); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_SKIP_BREAKPOINTS)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.SKIP_ALL_BREAKPOINT_ACTION); updateActionCheckedState(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepIntoActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepIntoActionDelegate.java index ba3a40214..5c981a48e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepIntoActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepIntoActionDelegate.java @@ -35,14 +35,14 @@ public class StepIntoActionDelegate extends StepActionDelegate { * @see AbstractDebugActionDelegate#getStatusMessage() */ protected String getStatusMessage() { - return ActionMessages.StepIntoActionDelegate_Exceptions_occurred_attempting_to_step_into_the_frame_2; //$NON-NLS-1$ + return ActionMessages.StepIntoActionDelegate_Exceptions_occurred_attempting_to_step_into_the_frame_2; } /** * @see AbstractDebugActionDelegate#getErrorDialogMessage() */ protected String getErrorDialogMessage() { - return ActionMessages.StepIntoActionDelegate_Step_into_failed_1; //$NON-NLS-1$ + return ActionMessages.StepIntoActionDelegate_Step_into_failed_1; } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepOverActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepOverActionDelegate.java index 1db794faa..d785453dc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepOverActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepOverActionDelegate.java @@ -34,14 +34,14 @@ public class StepOverActionDelegate extends StepActionDelegate { * @see AbstractDebugActionDelegate#getStatusMessage() */ protected String getStatusMessage() { - return ActionMessages.StepOverActionDelegate_Exceptions_occurred_attempting_to_step_over_the_frame_2; //$NON-NLS-1$ + return ActionMessages.StepOverActionDelegate_Exceptions_occurred_attempting_to_step_over_the_frame_2; } /** * @see AbstractDebugActionDelegate#getErrorDialogMessage() */ protected String getErrorDialogMessage() { - return ActionMessages.StepOverActionDelegate_Step_over_failed_1; //$NON-NLS-1$ + return ActionMessages.StepOverActionDelegate_Step_over_failed_1; } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepReturnActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepReturnActionDelegate.java index a5467c127..edbd7bfa7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepReturnActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/StepReturnActionDelegate.java @@ -34,14 +34,14 @@ public class StepReturnActionDelegate extends StepActionDelegate { * @see AbstractDebugActionDelegate#getStatusMessage() */ protected String getStatusMessage() { - return ActionMessages.StepReturnActionDelegate_Exceptions_occurred_attempting_to_run_to_return_of_the_frame__2; //$NON-NLS-1$ + return ActionMessages.StepReturnActionDelegate_Exceptions_occurred_attempting_to_run_to_return_of_the_frame__2; } /** * @see AbstractDebugActionDelegate#getErrorDialogMessage() */ protected String getErrorDialogMessage() { - return ActionMessages.StepReturnActionDelegate_Run_to_return_failed__1; //$NON-NLS-1$ + return ActionMessages.StepReturnActionDelegate_Run_to_return_failed__1; } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SuspendActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SuspendActionDelegate.java index 75bd7671c..e813a3e99 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SuspendActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/SuspendActionDelegate.java @@ -43,14 +43,14 @@ public class SuspendActionDelegate extends AbstractListenerActionDelegate { * @see AbstractDebugActionDelegate#getStatusMessage() */ protected String getStatusMessage() { - return ActionMessages.SuspendActionDelegate_Exceptions_occurred_attempting_to_suspend__2; //$NON-NLS-1$ + return ActionMessages.SuspendActionDelegate_Exceptions_occurred_attempting_to_suspend__2; } /** * @see AbstractDebugActionDelegate#getErrorDialogMessage() */ protected String getErrorDialogMessage() { - return ActionMessages.SuspendActionDelegate_Suspend_failed_1; //$NON-NLS-1$ + return ActionMessages.SuspendActionDelegate_Suspend_failed_1; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateActionDelegate.java index 336852b76..06d9894ef 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateActionDelegate.java @@ -78,14 +78,14 @@ public class TerminateActionDelegate extends AbstractListenerActionDelegate { * @see AbstractDebugActionDelegate#getStatusMessage() */ protected String getStatusMessage() { - return ActionMessages.TerminateActionDelegate_Exceptions_occurred_attempting_to_terminate__2; //$NON-NLS-1$ + return ActionMessages.TerminateActionDelegate_Exceptions_occurred_attempting_to_terminate__2; } /** * @see AbstractDebugActionDelegate#getErrorDialogMessage() */ protected String getErrorDialogMessage() { - return ActionMessages.TerminateActionDelegate_Terminate_failed__1; //$NON-NLS-1$ + return ActionMessages.TerminateActionDelegate_Terminate_failed__1; } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateAndRemoveActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateAndRemoveActionDelegate.java index 297690a26..65dcc6ecd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateAndRemoveActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/TerminateAndRemoveActionDelegate.java @@ -48,14 +48,14 @@ public class TerminateAndRemoveActionDelegate extends AbstractDebugActionDelegat * @see AbstractDebugActionDelegate#getStatusMessage() */ protected String getStatusMessage() { - return ActionMessages.TerminateAndRemoveActionDelegate_Exceptions_occurred_attempting_to_terminate_and_remove_2; //$NON-NLS-1$ + return ActionMessages.TerminateAndRemoveActionDelegate_Exceptions_occurred_attempting_to_terminate_and_remove_2; } /** * @see AbstractDebugActionDelegate#getErrorDialogMessage() */ protected String getErrorDialogMessage() { - return ActionMessages.TerminateAndRemoveActionDelegate_Terminate_and_remove_failed_1; //$NON-NLS-1$ + return ActionMessages.TerminateAndRemoveActionDelegate_Terminate_and_remove_failed_1; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleDetailPaneAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleDetailPaneAction.java index 4308e2311..0768ecd67 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleDetailPaneAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ToggleDetailPaneAction.java @@ -39,23 +39,23 @@ public class ToggleDetailPaneAction extends Action { setOrientation(orientation); if (orientation == IDebugPreferenceConstants.VARIABLES_DETAIL_PANE_UNDERNEATH) { - setText(ActionMessages.ToggleDetailPaneAction_1); //$NON-NLS-1$ - setToolTipText(ActionMessages.ToggleDetailPaneAction_2); //$NON-NLS-1$ - setDescription(ActionMessages.ToggleDetailPaneAction_3); //$NON-NLS-1$ + setText(ActionMessages.ToggleDetailPaneAction_1); + setToolTipText(ActionMessages.ToggleDetailPaneAction_2); + setDescription(ActionMessages.ToggleDetailPaneAction_3); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_UNDER)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_UNDER)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_UNDER)); } else if (orientation == IDebugPreferenceConstants.VARIABLES_DETAIL_PANE_RIGHT) { - setText(ActionMessages.ToggleDetailPaneAction_4); //$NON-NLS-1$ - setToolTipText(ActionMessages.ToggleDetailPaneAction_5); //$NON-NLS-1$ - setDescription(ActionMessages.ToggleDetailPaneAction_6); //$NON-NLS-1$ + setText(ActionMessages.ToggleDetailPaneAction_4); + setToolTipText(ActionMessages.ToggleDetailPaneAction_5); + setDescription(ActionMessages.ToggleDetailPaneAction_6); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_RIGHT)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_RIGHT)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_RIGHT)); } else { setText(hiddenLabel); - setToolTipText(ActionMessages.ToggleDetailPaneAction_8); //$NON-NLS-1$ - setDescription(ActionMessages.ToggleDetailPaneAction_9); //$NON-NLS-1$ + setToolTipText(ActionMessages.ToggleDetailPaneAction_8); + setDescription(ActionMessages.ToggleDetailPaneAction_9); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_HIDE)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_HIDE)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_HIDE)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/WatchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/WatchAction.java index fa658a8c0..ae826063d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/WatchAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/WatchAction.java @@ -78,7 +78,7 @@ public class WatchAction implements IObjectActionDelegate { try { expression = DebugPlugin.getDefault().getExpressionManager().newWatchExpression(variable.getName()); } catch (DebugException e) { - DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.WatchAction_0, ActionMessages.WatchAction_1, e); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), ActionMessages.WatchAction_0, ActionMessages.WatchAction_1, e); // return; } DebugPlugin.getDefault().getExpressionManager().addExpression(expression); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/WatchExpressionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/WatchExpressionDialog.java index f1b9bd18c..c82fb3fa7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/WatchExpressionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/WatchExpressionDialog.java @@ -52,10 +52,10 @@ public class WatchExpressionDialog extends StatusDialog { setShellStyle(getShellStyle() | SWT.MAX | SWT.RESIZE); String helpContextId = null; if (editDialog) { - setTitle(ActionMessages.WatchExpressionDialog_0); //$NON-NLS-1$ + setTitle(ActionMessages.WatchExpressionDialog_0); helpContextId = IDebugHelpContextIds.EDIT_WATCH_EXPRESSION_DIALOG; } else { - setTitle(ActionMessages.WatchExpressionDialog_1); //$NON-NLS-1$ + setTitle(ActionMessages.WatchExpressionDialog_1); helpContextId = IDebugHelpContextIds.ADD_WATCH_EXPRESSION_DIALOG; } PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, helpContextId); @@ -77,7 +77,7 @@ public class WatchExpressionDialog extends StatusDialog { // snippet label Label label= new Label(container, SWT.NONE); - label.setText(ActionMessages.WatchExpressionDialog_2); //$NON-NLS-1$ + label.setText(ActionMessages.WatchExpressionDialog_2); gd= new GridData(GridData.BEGINNING); label.setLayoutData(gd); label.setFont(font); @@ -112,7 +112,7 @@ public class WatchExpressionDialog extends StatusDialog { // enable checkbox fCheckBox= new Button(container, SWT.CHECK | SWT.LEFT); - fCheckBox.setText(ActionMessages.WatchExpressionDialog_3); //$NON-NLS-1$ + fCheckBox.setText(ActionMessages.WatchExpressionDialog_3); fCheckBox.setSelection(fWatchExpression.isEnabled()); fCheckBox.setFont(font); @@ -136,7 +136,7 @@ public class WatchExpressionDialog extends StatusDialog { private void checkValues() { StatusInfo status= new StatusInfo(); if (fSnippetViewer.getDocument().get().trim().length() == 0) { - status.setError(ActionMessages.WatchExpressionDialog_4); //$NON-NLS-1$ + status.setError(ActionMessages.WatchExpressionDialog_4); } updateStatus(status); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsAction.java index 4de8ae4ef..84a7498ff 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/CopyBreakpointsAction.java @@ -49,10 +49,10 @@ public class CopyBreakpointsAction extends BreakpointSelectionAction { * @param clipboard a platform clipboard */ public CopyBreakpointsAction(BreakpointsView view, Clipboard clipboard) { - super(BreakpointGroupMessages.CopyBreakpointsAction_0, view); //$NON-NLS-1$ + super(BreakpointGroupMessages.CopyBreakpointsAction_0, view); Assert.isNotNull(clipboard); this.clipboard = clipboard; - setToolTipText(BreakpointGroupMessages.CopyBreakpointsAction_1); //$NON-NLS-1$ + setToolTipText(BreakpointGroupMessages.CopyBreakpointsAction_1); } /** @@ -106,8 +106,8 @@ public class CopyBreakpointsAction extends BreakpointSelectionAction { if (e.code != DND.ERROR_CANNOT_SET_CLIPBOARD) throw e; if (MessageDialog.openQuestion( - getBreakpointsView().getSite().getShell(), BreakpointGroupMessages.CopyBreakpointsAction_2, //$NON-NLS-1$ - BreakpointGroupMessages.CopyBreakpointsAction_3)) { //$NON-NLS-1$ + getBreakpointsView().getSite().getShell(), BreakpointGroupMessages.CopyBreakpointsAction_2, + BreakpointGroupMessages.CopyBreakpointsAction_3)) { setClipboard(selection, text); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java index 76a586df7..4d3053ce0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByAction.java @@ -97,7 +97,7 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl int accel = 1; // Add hard-coded action for flat breakpoints list IAction action = new GroupBreakpointsAction(null, fView); - addAccel(accel, action, BreakpointGroupMessages.GroupBreakpointsByAction_0); //$NON-NLS-1$ + addAccel(accel, action, BreakpointGroupMessages.GroupBreakpointsByAction_0); accel++; action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_VIEW_BREAKPOINTS)); action.setChecked(none); @@ -117,7 +117,7 @@ public class GroupBreakpointsByAction extends AbstractBreakpointsViewAction impl // advanced action AdvancedGroupBreakpointsByAction advancedAction = new AdvancedGroupBreakpointsByAction(fView); - addAccel(accel, advancedAction,BreakpointGroupMessages.GroupBreakpointsByAction_1); //$NON-NLS-1$ + addAccel(accel, advancedAction,BreakpointGroupMessages.GroupBreakpointsByAction_1); advancedAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_HIERARCHICAL)); advancedAction.setChecked(advanced); item= new ActionContributionItem(advancedAction); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java index 75e608457..da76b67cb 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsByDialog.java @@ -114,7 +114,7 @@ public class GroupBreakpointsByDialog extends Dialog { composite.setFont(parent.getFont()); Label label= new Label(composite, SWT.WRAP); - label.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_0); //$NON-NLS-1$ + label.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_0); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 3; label.setLayoutData(gridData); @@ -162,7 +162,7 @@ public class GroupBreakpointsByDialog extends Dialog { availableComposite.setLayoutData(gridData); Label label= new Label(availableComposite, SWT.WRAP); - label.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_1); //$NON-NLS-1$ + label.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_1); gridData = new GridData(GridData.FILL_HORIZONTAL); label.setLayoutData(gridData); @@ -202,7 +202,7 @@ public class GroupBreakpointsByDialog extends Dialog { selectedComposite.setFont(parent.getFont()); Label label= new Label(selectedComposite, SWT.WRAP); - label.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_3); //$NON-NLS-1$ + label.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_3); gridData = new GridData(); gridData.horizontalSpan = 2; label.setLayoutData(gridData); @@ -232,16 +232,16 @@ public class GroupBreakpointsByDialog extends Dialog { buttonComposite.setLayoutData(new GridData()); buttonComposite.setFont(parent.getFont()); - fAddButton= SWTUtil.createPushButton(buttonComposite, BreakpointGroupMessages.GroupBreakpointsByDialog_2, null); //$NON-NLS-1$ + fAddButton= SWTUtil.createPushButton(buttonComposite, BreakpointGroupMessages.GroupBreakpointsByDialog_2, null); fAddButton.addSelectionListener(fSelectionListener); - fRemoveButton= SWTUtil.createPushButton(buttonComposite, BreakpointGroupMessages.GroupBreakpointsByDialog_4, null); //$NON-NLS-1$ + fRemoveButton= SWTUtil.createPushButton(buttonComposite, BreakpointGroupMessages.GroupBreakpointsByDialog_4, null); fRemoveButton.addSelectionListener(fSelectionListener); - fMoveUpButton= SWTUtil.createPushButton(buttonComposite, BreakpointGroupMessages.GroupBreakpointsByDialog_5, null); //$NON-NLS-1$ + fMoveUpButton= SWTUtil.createPushButton(buttonComposite, BreakpointGroupMessages.GroupBreakpointsByDialog_5, null); fMoveUpButton.addSelectionListener(fSelectionListener); - fMoveDownButton= SWTUtil.createPushButton(buttonComposite, BreakpointGroupMessages.GroupBreakpointsByDialog_6, null); //$NON-NLS-1$ + fMoveDownButton= SWTUtil.createPushButton(buttonComposite, BreakpointGroupMessages.GroupBreakpointsByDialog_6, null); fMoveDownButton.addSelectionListener(fSelectionListener); } @@ -517,6 +517,6 @@ public class GroupBreakpointsByDialog extends Dialog { */ protected void configureShell(Shell shell) { super.configureShell(shell); - shell.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_7); //$NON-NLS-1$ + shell.setText(BreakpointGroupMessages.GroupBreakpointsByDialog_7); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java index 00e1220bf..4a3cadeaf 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/PasteBreakpointsAction.java @@ -33,8 +33,8 @@ public class PasteBreakpointsAction extends BreakpointSelectionAction { * @param view the view of this action */ public PasteBreakpointsAction(BreakpointsView view) { - super(BreakpointGroupMessages.PasteBreakpointsAction_0, view); //$NON-NLS-1$ - setToolTipText(BreakpointGroupMessages.PasteBreakpointsAction_1); //$NON-NLS-1$ + super(BreakpointGroupMessages.PasteBreakpointsAction_0, view); + setToolTipText(BreakpointGroupMessages.PasteBreakpointsAction_1); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java index 3dd42c83e..a9377fd7c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/RemoveFromWorkingSetAction.java @@ -30,7 +30,7 @@ public class RemoveFromWorkingSetAction extends BreakpointSelectionAction { * @param view */ public RemoveFromWorkingSetAction(BreakpointsView view) { - super(BreakpointGroupMessages.RemoveFromWorkingSetAction_0, view); //$NON-NLS-1$ + super(BreakpointGroupMessages.RemoveFromWorkingSetAction_0, view); } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java index 8ab9acfbc..ced9391e2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorProjectPromptStatusHandler.java @@ -56,7 +56,7 @@ public class CompileErrorProjectPromptStatusHandler implements IStatusHandler { } Shell shell = DebugUIPlugin.getShell(); - String title = LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_0; //$NON-NLS-1$ + String title = LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_0; StringBuffer projectMessage = new StringBuffer(); for (int i = 0; i < projects.size(); i++) { if (i > 0) { @@ -64,7 +64,7 @@ public class CompileErrorProjectPromptStatusHandler implements IStatusHandler { } projectMessage.append(((IProject)projects.get(i)).getName()); } - String message = MessageFormat.format(LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_2, new String[]{projectMessage.toString()}); //$NON-NLS-1$ + String message = MessageFormat.format(LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_2, new String[]{projectMessage.toString()}); IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore(); String pref = store.getString(IInternalDebugUIConstants.PREF_CONTINUE_WITH_COMPILE_ERROR); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java index 918b9221b..340812110 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CompileErrorPromptStatusHandler.java @@ -38,8 +38,8 @@ public class CompileErrorPromptStatusHandler implements IStatusHandler { } Shell shell = DebugUIPlugin.getShell(); - String title = LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_0; //$NON-NLS-1$ - String message = LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_1; //$NON-NLS-1$ + String title = LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_0; + String message = LaunchConfigurationsMessages.CompileErrorPromptStatusHandler_1; IPreferenceStore store = DebugUIPlugin.getDefault().getPreferenceStore(); String pref = store.getString(IInternalDebugUIConstants.PREF_CONTINUE_WITH_COMPILE_ERROR); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java index f5c3f4fc1..3004d7c30 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java @@ -37,7 +37,7 @@ public class CreateLaunchConfigurationAction extends AbstractLaunchConfiguration * Constructs an action to create a launch configuration */ public CreateLaunchConfigurationAction(Viewer viewer, String mode) { - super(LaunchConfigurationsMessages.CreateLaunchConfigurationAction_Ne_w_1, viewer, mode); //$NON-NLS-1$ + super(LaunchConfigurationsMessages.CreateLaunchConfigurationAction_Ne_w_1, viewer, mode); } /** @@ -60,7 +60,7 @@ public class CreateLaunchConfigurationAction extends AbstractLaunchConfiguration } try { - ILaunchConfigurationWorkingCopy wc = type.newInstance(null, DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(LaunchConfigurationsMessages.CreateLaunchConfigurationAction_New_configuration_2)); //$NON-NLS-1$ + ILaunchConfigurationWorkingCopy wc = type.newInstance(null, DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(LaunchConfigurationsMessages.CreateLaunchConfigurationAction_New_configuration_2)); ILaunchConfigurationTabGroup tabGroup = LaunchConfigurationPresentationManager.getDefault().getTabGroup(wc.getType(), getMode()); // this only works because this action is only present when the dialog is open ILaunchConfigurationDialog dialog = LaunchConfigurationsDialog.getCurrentlyVisibleLaunchConfigurationDialog(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java index cb3dd543d..b56132adc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DebugModePromptStatusHandler.java @@ -50,10 +50,10 @@ public class DebugModePromptStatusHandler implements IStatusHandler { } Shell activeShell = DebugUIPlugin.getShell(); - String title = LaunchConfigurationsMessages.DebugModePromptStatusHandler_0; //$NON-NLS-1$ - String message = LaunchConfigurationsMessages.DebugModePromptStatusHandler_1; //$NON-NLS-1$ + String title = LaunchConfigurationsMessages.DebugModePromptStatusHandler_0; + String message = LaunchConfigurationsMessages.DebugModePromptStatusHandler_1; - MessageDialogWithToggle dialog = MessageDialogWithToggle.openYesNoCancelQuestion(activeShell, title, message, null, false, store, IInternalDebugUIConstants.PREF_RELAUNCH_IN_DEBUG_MODE); //$NON-NLS-1$ + MessageDialogWithToggle dialog = MessageDialogWithToggle.openYesNoCancelQuestion(activeShell, title, message, null, false, store, IInternalDebugUIConstants.PREF_RELAUNCH_IN_DEBUG_MODE); int buttonId = dialog.getReturnCode(); if (buttonId == IDialogConstants.YES_ID) { relaunchInDebugMode(configuration); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java index 4574ba3c8..618afa494 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java @@ -37,8 +37,8 @@ public class DeleteLaunchConfigurationAction extends AbstractLaunchConfiguration public boolean getConfirmation() { IStructuredSelection selection = getStructuredSelection(); // Make the user confirm the deletion - String dialogMessage = selection.size() > 1 ? LaunchConfigurationsMessages.LaunchConfigurationDialog_Do_you_wish_to_delete_the_selected_launch_configurations__1 : LaunchConfigurationsMessages.LaunchConfigurationDialog_Do_you_wish_to_delete_the_selected_launch_configuration__2; //$NON-NLS-1$ //$NON-NLS-2$ - return MessageDialog.openQuestion(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Confirm_Launch_Configuration_Deletion_3, dialogMessage); //$NON-NLS-1$ + String dialogMessage = selection.size() > 1 ? LaunchConfigurationsMessages.LaunchConfigurationDialog_Do_you_wish_to_delete_the_selected_launch_configurations__1 : LaunchConfigurationsMessages.LaunchConfigurationDialog_Do_you_wish_to_delete_the_selected_launch_configuration__2; // + return MessageDialog.openQuestion(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Confirm_Launch_Configuration_Deletion_3, dialogMessage); } } @@ -47,7 +47,7 @@ public class DeleteLaunchConfigurationAction extends AbstractLaunchConfiguration * Constructs an action to delete launch configuration(s) */ public DeleteLaunchConfigurationAction(Viewer viewer, String mode) { - super(LaunchConfigurationsMessages.DeleteLaunchConfigurationAction_Dele_te_1, viewer, mode); //$NON-NLS-1$ + super(LaunchConfigurationsMessages.DeleteLaunchConfigurationAction_Dele_te_1, viewer, mode); setConfirmationRequestor(new Confirmation()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java index afe937950..1066bab20 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java @@ -33,7 +33,7 @@ public class DuplicateLaunchConfigurationAction extends AbstractLaunchConfigurat * Constructs an action to duplicate a launch configuration */ public DuplicateLaunchConfigurationAction(Viewer viewer, String mode) { - super(LaunchConfigurationsMessages.DuplicateLaunchConfigurationAction__Duplicate_1, viewer, mode); //$NON-NLS-1$ + super(LaunchConfigurationsMessages.DuplicateLaunchConfigurationAction__Duplicate_1, viewer, mode); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java index 48594766b..7145c148d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FavoritesDialog.java @@ -187,8 +187,8 @@ public class FavoritesDialog extends Dialog { ListSelectionDialog dialog = new ListSelectionDialog(fFavoritesTable.getControl().getShell(), getMode(), new LaunchConfigurationContentProvider(), DebugUITools.newDebugModelPresentation(), - LaunchConfigurationsMessages.FavoritesDialog_7); //$NON-NLS-1$ - dialog.setTitle(MessageFormat.format(LaunchConfigurationsMessages.FavoritesDialog_0, new String[]{getModeLabel()})); //$NON-NLS-1$ + LaunchConfigurationsMessages.FavoritesDialog_7); + dialog.setTitle(MessageFormat.format(LaunchConfigurationsMessages.FavoritesDialog_0, new String[]{getModeLabel()})); dialog.open(); Object[] selection = dialog.getResult(); if (selection != null) { @@ -265,7 +265,7 @@ public class FavoritesDialog extends Dialog { */ protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); - getShell().setText(MessageFormat.format(LaunchConfigurationsMessages.FavoritesDialog_1, new String[]{getModeLabel()})); //$NON-NLS-1$ + getShell().setText(MessageFormat.format(LaunchConfigurationsMessages.FavoritesDialog_1, new String[]{getModeLabel()})); createFavoritesArea(composite); return composite; } @@ -291,14 +291,14 @@ public class FavoritesDialog extends Dialog { topComp.setFont(parent.getFont()); // Create "favorite config" area - createLabel(topComp, LaunchConfigurationsMessages.FavoritesDialog_2); //$NON-NLS-1$ + createLabel(topComp, LaunchConfigurationsMessages.FavoritesDialog_2); fFavoritesTable = createTable(topComp, new FavoritesContentProvider()); Composite buttonComp = createButtonComposite(topComp); - fAddFavoriteButton = createPushButton(buttonComp,LaunchConfigurationsMessages.FavoritesDialog_3); //$NON-NLS-1$ + fAddFavoriteButton = createPushButton(buttonComp,LaunchConfigurationsMessages.FavoritesDialog_3); fAddFavoriteButton.setEnabled(true); - fRemoveFavoritesButton = createPushButton(buttonComp, LaunchConfigurationsMessages.FavoritesDialog_4); //$NON-NLS-1$ - fMoveUpButton = createPushButton(buttonComp, LaunchConfigurationsMessages.FavoritesDialog_5); //$NON-NLS-1$ - fMoveDownButton = createPushButton(buttonComp, LaunchConfigurationsMessages.FavoritesDialog_6); //$NON-NLS-1$ + fRemoveFavoritesButton = createPushButton(buttonComp, LaunchConfigurationsMessages.FavoritesDialog_4); + fMoveUpButton = createPushButton(buttonComp, LaunchConfigurationsMessages.FavoritesDialog_5); + fMoveDownButton = createPushButton(buttonComp, LaunchConfigurationsMessages.FavoritesDialog_6); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java index 0f157fa8a..30fbfb7b3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationDialog.java @@ -41,7 +41,7 @@ public class LaunchConfigurationDialog extends LaunchConfigurationPropertiesDial */ protected void createButtonsForButtonBar(Composite parent) { createButton(parent, ID_LAUNCH_BUTTON, getLaunchButtonText(), true); - createButton(parent, ID_CLOSE_BUTTON, LaunchConfigurationsMessages.LaunchConfigurationDialog_Close_1, false); //$NON-NLS-1$ + createButton(parent, ID_CLOSE_BUTTON, LaunchConfigurationsMessages.LaunchConfigurationDialog_Close_1, false); } protected String getShellTitle() { @@ -49,7 +49,7 @@ public class LaunchConfigurationDialog extends LaunchConfigurationPropertiesDial } protected String getTitleAreaTitle() { - return LaunchConfigurationsMessages.LaunchConfigurationDialog_Modify_attributes_and_launch__1; //$NON-NLS-1$ + return LaunchConfigurationsMessages.LaunchConfigurationDialog_Modify_attributes_and_launch__1; } /** * @see ILaunchConfigurationDialog#updateButtons() diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java index e539b5a9c..c2da9d5e3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationManager.java @@ -245,7 +245,7 @@ public class LaunchConfigurationManager implements ILaunchListener { protected void removeTerminatedLaunches(final ILaunch newLaunch) { if (DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugUIConstants.PREF_AUTO_REMOVE_OLD_LAUNCHES)) { - Job launchRemovalJob = new Job(LaunchConfigurationsMessages.LaunchConfigurationManager_0) { //$NON-NLS-1$ + Job launchRemovalJob = new Job(LaunchConfigurationsMessages.LaunchConfigurationManager_0) { protected IStatus run(IProgressMonitor monitor) { ILaunchManager lManager= DebugPlugin.getDefault().getLaunchManager(); Object[] launches= lManager.getLaunches(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java index cc6bcf20b..1f40a94a6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPresentationManager.java @@ -83,7 +83,7 @@ public class LaunchConfigurationPresentationManager { if (typeId == null) { IExtension ext = groups[i].getDeclaringExtension(); IStatus status = new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.STATUS_INVALID_EXTENSION_DEFINITION, - MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_Launch_configuration_tab_group_extension__0__does_not_specify_launch_configuration_type_1, (new String[] {ext.getUniqueIdentifier()})), null); //$NON-NLS-1$ + MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_Launch_configuration_tab_group_extension__0__does_not_specify_launch_configuration_type_1, (new String[] {ext.getUniqueIdentifier()})), null); DebugUIPlugin.log(status); } else { // verify it references a valid launch configuration type @@ -91,7 +91,7 @@ public class LaunchConfigurationPresentationManager { if (lct == null) { IExtension ext = groups[i].getDeclaringExtension(); IStatus status = new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.STATUS_INVALID_EXTENSION_DEFINITION, - MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_Launch_configuration_tab_group_extension__0__refers_to_non_existant_launch_configuration_type__1__2, (new String[] {ext.getUniqueIdentifier(), typeId})), null); //$NON-NLS-1$ + MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_Launch_configuration_tab_group_extension__0__refers_to_non_existant_launch_configuration_type__1__2, (new String[] {ext.getUniqueIdentifier(), typeId})), null); DebugUIPlugin.log(status); } } @@ -129,7 +129,7 @@ public class LaunchConfigurationPresentationManager { LaunchConfigurationTabGroupExtension ext = getExtension(type.getIdentifier(), mode); if (ext == null) { IStatus status = new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR, - MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_No_tab_group_defined_for_launch_configuration_type__0__3, (new String[] {type.getIdentifier()})), null); //$NON-NLS-1$ + MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_No_tab_group_defined_for_launch_configuration_type__0__3, (new String[] {type.getIdentifier()})), null); throw new CoreException(status); } return ext.newTabGroup(); @@ -173,7 +173,7 @@ public class LaunchConfigurationPresentationManager { LaunchConfigurationTabGroupExtension ext = getExtension(type.getIdentifier(), mode); if (ext == null) { IStatus status = new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR, - MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_No_tab_group_defined_for_launch_configuration_type__0__3, (new String[] {type.getIdentifier()})), null); //$NON-NLS-1$ + MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationPresentationManager_No_tab_group_defined_for_launch_configuration_type__0__3, (new String[] {type.getIdentifier()})), null); throw new CoreException(status); } return ext.getHelpContextId(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java index 92cfbbcfa..8d0f6da1a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java @@ -139,7 +139,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia } protected String getTitleAreaTitle() { - return LaunchConfigurationsMessages.LaunchConfigurationPropertiesDialog_Edit_launch_configuration_properties_1; //$NON-NLS-1$ + return LaunchConfigurationsMessages.LaunchConfigurationPropertiesDialog_Edit_launch_configuration_properties_1; } protected void createButtonsForButtonBar(Composite parent) { @@ -149,7 +149,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia } protected String getShellTitle() { - return MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationPropertiesDialog_Properties_for__0__2, new String[]{getLaunchConfiguration().getName()}); //$NON-NLS-1$ + return MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationPropertiesDialog_Properties_for__0__2, new String[]{getLaunchConfiguration().getName()}); } protected String getHelpContextId() { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java index cdd2e2012..324f86048 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java @@ -209,7 +209,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { setVisibleArea(container); fNameLabel = new Label(container, SWT.HORIZONTAL | SWT.LEFT); - fNameLabel.setText(LaunchConfigurationsMessages.LaunchConfigurationDialog__Name__16); //$NON-NLS-1$ + fNameLabel.setText(LaunchConfigurationsMessages.LaunchConfigurationDialog__Name__16); gd = new GridData(GridData.BEGINNING); fNameLabel.setLayoutData(gd); fNameLabel.setFont(font); @@ -253,7 +253,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { buttonComp.setLayoutData(gd); setApplyButton(new Button(buttonComp, SWT.PUSH)); - getApplyButton().setText(LaunchConfigurationsMessages.LaunchConfigurationDialog__Apply_17); //$NON-NLS-1$ + getApplyButton().setText(LaunchConfigurationsMessages.LaunchConfigurationDialog__Apply_17); gd = new GridData(GridData.HORIZONTAL_ALIGN_END); getApplyButton().setLayoutData(gd); getApplyButton().setFont(font); @@ -265,7 +265,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { }); setRevertButton(new Button(buttonComp, SWT.PUSH)); - getRevertButton().setText(LaunchConfigurationsMessages.LaunchConfigurationDialog_Revert_2); //$NON-NLS-1$ + getRevertButton().setText(LaunchConfigurationsMessages.LaunchConfigurationDialog_Revert_2); gd = new GridData(GridData.HORIZONTAL_ALIGN_END); getRevertButton().setLayoutData(gd); getRevertButton().setFont(font); @@ -532,7 +532,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { // Retrieve the current tab group. If there is none, clean up and leave ILaunchConfigurationTabGroup tabGroup = getTabGroup(); if (tabGroup == null) { - IStatus status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_No_tabs_defined_for_launch_configuration_type__0__1, new String[]{type.getName()}), null); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_No_tabs_defined_for_launch_configuration_type__0__1, new String[]{type.getName()}), null); CoreException e = new CoreException(status); errorDialog(e); setInitializingTabs(false); @@ -583,7 +583,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { // Retrieve the current tab group. If there is none, clean up and leave ILaunchConfigurationTabGroup tabGroup = getTabGroup(); if (tabGroup == null) { - IStatus status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_No_tabs_defined_for_launch_configuration_type__0__1, new String[]{type.getName()}), null); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_No_tabs_defined_for_launch_configuration_type__0__1, new String[]{type.getName()}), null); CoreException e = new CoreException(status); errorDialog(e); setInitializingTabs(false); @@ -632,7 +632,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { try { group = createGroup(configType); } catch (CoreException ce) { - DebugUIPlugin.errorDialog(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Error_19, LaunchConfigurationsMessages.LaunchConfigurationDialog_Exception_occurred_creating_launch_configuration_tabs_27,ce); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Error_19, LaunchConfigurationsMessages.LaunchConfigurationDialog_Exception_occurred_creating_launch_configuration_tabs_27,ce); // return; } @@ -712,7 +712,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { TabItem tab = new TabItem(getTabFolder(), SWT.NONE); String name = tabs[i].getName(); if (name == null) { - name = LaunchConfigurationsMessages.LaunchConfigurationDialog_unspecified_28; //$NON-NLS-1$ + name = LaunchConfigurationsMessages.LaunchConfigurationDialog_unspecified_28; } tab.setText(name); Image image = tabs[i].getImage(); @@ -1057,7 +1057,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, - LaunchConfigurationsMessages.LaunchConfigurationDialog_Name_required_for_launch_configuration_11, //$NON-NLS-1$ + LaunchConfigurationsMessages.LaunchConfigurationDialog_Name_required_for_launch_configuration_11, null)); } @@ -1080,7 +1080,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, - MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_0, new String[] { new String(new char[] {c}), currentName }), //$NON-NLS-1$ + MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationTabGroupViewer_0, new String[] { new String(new char[] {c}), currentName }), null)); } } @@ -1091,7 +1091,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, - LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_configuration_already_exists_with_this_name_12, //$NON-NLS-1$ + LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_configuration_already_exists_with_this_name_12, null)); } } @@ -1228,7 +1228,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { } updateButtons(); } catch (CoreException e) { - DebugUIPlugin.errorDialog(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_Configuration_Error_46, LaunchConfigurationsMessages.LaunchConfigurationDialog_Exception_occurred_while_saving_launch_configuration_47, e); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_Configuration_Error_46, LaunchConfigurationsMessages.LaunchConfigurationDialog_Exception_occurred_while_saving_launch_configuration_47, e); // return; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java index fadceadd7..58cfd5f75 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTreeContentProvider.java @@ -74,7 +74,7 @@ public class LaunchConfigurationTreeContentProvider implements ITreeContentProvi ILaunchConfigurationType type = (ILaunchConfigurationType)parentElement; return getLaunchManager().getLaunchConfigurations(type); } catch (CoreException e) { - DebugUIPlugin.errorDialog(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Error_19, LaunchConfigurationsMessages.LaunchConfigurationDialog_An_exception_occurred_while_retrieving_launch_configurations_20, e); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Error_19, LaunchConfigurationsMessages.LaunchConfigurationDialog_An_exception_occurred_while_retrieving_launch_configurations_20, e); // } } else { return getLaunchManager().getLaunchConfigurationTypes(); @@ -93,7 +93,7 @@ public class LaunchConfigurationTreeContentProvider implements ITreeContentProvi try { return ((ILaunchConfiguration)element).getType(); } catch (CoreException e) { - DebugUIPlugin.errorDialog(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Error_19, LaunchConfigurationsMessages.LaunchConfigurationDialog_An_exception_occurred_while_retrieving_launch_configurations_20, e); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(getShell(), LaunchConfigurationsMessages.LaunchConfigurationDialog_Error_19, LaunchConfigurationsMessages.LaunchConfigurationDialog_An_exception_occurred_while_retrieving_launch_configurations_20, e); // } } else if (element instanceof ILaunchConfigurationType) { return ResourcesPlugin.getWorkspace().getRoot(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java index d06f57a08..93b88e126 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java @@ -278,7 +278,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun protected void createButtonsForButtonBar(Composite parent) { Button button = createButton(parent, ID_LAUNCH_BUTTON, getLaunchButtonText(), true); button.setEnabled(false); - createButton(parent, ID_CLOSE_BUTTON, LaunchConfigurationsMessages.LaunchConfigurationDialog_Close_1, false); //$NON-NLS-1$ + createButton(parent, ID_CLOSE_BUTTON, LaunchConfigurationsMessages.LaunchConfigurationDialog_Close_1, false); } /** @@ -472,8 +472,8 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun topComp.setLayout(topLayout); // Set the things that TitleAreaDialog takes care of - setTitle(LaunchConfigurationsMessages.LaunchConfigurationDialog_Create__manage__and_run_launch_configurations_8); //$NON-NLS-1$ - setMessage(LaunchConfigurationsMessages.LaunchConfigurationDialog_Ready_to_launch_2); //$NON-NLS-1$ + setTitle(LaunchConfigurationsMessages.LaunchConfigurationDialog_Create__manage__and_run_launch_configurations_8); + setMessage(LaunchConfigurationsMessages.LaunchConfigurationDialog_Ready_to_launch_2); setModeLabelState(); // Create the SashForm that contains the selection area on the left, @@ -550,7 +550,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun setTreeLabel(new Label(comp, SWT.NONE)); getTreeLabel().setFont(font); - getTreeLabel().setText(LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_Con_figurations__1); //$NON-NLS-1$ + getTreeLabel().setText(LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_Con_figurations__1); fLaunchConfigurationView = new LaunchConfigurationView(getLaunchGroup()); fLaunchConfigurationView.createLaunchDialogControl(comp); @@ -573,10 +573,10 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun buttonComposite.setLayoutData(gd); buttonComposite.setFont(comp.getFont()); - final Button newButton = SWTUtil.createPushButton(buttonComposite, LaunchConfigurationsMessages.LaunchConfigurationDialog_Ne_w_13, null); //$NON-NLS-1$ + final Button newButton = SWTUtil.createPushButton(buttonComposite, LaunchConfigurationsMessages.LaunchConfigurationDialog_Ne_w_13, null); setButtonActionNew(new ButtonActionNew(newButton.getText(), newButton)); - final Button deleteButton = SWTUtil.createPushButton(buttonComposite, LaunchConfigurationsMessages.LaunchConfigurationDialog_Dele_te_14, null); //$NON-NLS-1$ + final Button deleteButton = SWTUtil.createPushButton(buttonComposite, LaunchConfigurationsMessages.LaunchConfigurationDialog_Dele_te_14, null); setButtonActionDelete(new ButtonActionDelete(deleteButton.getText(), deleteButton)); AbstractLaunchConfigurationAction.IConfirmationRequestor requestor = @@ -652,7 +652,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun GridLayout pmLayout = new GridLayout(); setProgressMonitorPart(new ProgressMonitorPart(monitorComposite, pmLayout)); - Button cancelButton = createButton(monitorComposite, ID_CANCEL_BUTTON, LaunchConfigurationsMessages.LaunchConfigurationDialog_Cancel_3, true); //$NON-NLS-1$ + Button cancelButton = createButton(monitorComposite, ID_CANCEL_BUTTON, LaunchConfigurationsMessages.LaunchConfigurationDialog_Cancel_3, true); setProgressMonitorCancelButton(cancelButton); getProgressMonitorCancelButton().setFont(font); getProgressMonitorPart().setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); @@ -680,7 +680,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun protected String getShellTitle() { String title = DebugUIPlugin.removeAccelerators(getLaunchGroup().getLabel()); if (title == null) { - title = LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_Configurations_18; //$NON-NLS-1$ + title = LaunchConfigurationsMessages.LaunchConfigurationDialog_Launch_Configurations_18; } return title; } @@ -1003,19 +1003,19 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun String message = null; if (getActiveTab() instanceof PerspectivesTab) { try { - message = MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationsDialog_45, new String[]{getTabViewer().getWorkingCopy().getType().getName()}); //$NON-NLS-1$ + message = MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationsDialog_45, new String[]{getTabViewer().getWorkingCopy().getType().getName()}); } catch (CoreException e) { DebugUIPlugin.log(e); } } else { - message = MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationDialog_The_configuration___29, new String[]{getTabViewer().getWorkingCopy().getName()}); //$NON-NLS-1$ + message = MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationDialog_The_configuration___29, new String[]{getTabViewer().getWorkingCopy().getName()}); } MessageDialog dialog = new MessageDialog(getShell(), - LaunchConfigurationsMessages.LaunchConfigurationDialog_Save_changes__31, //$NON-NLS-1$ + LaunchConfigurationsMessages.LaunchConfigurationDialog_Save_changes__31, null, message, MessageDialog.QUESTION, - new String[] {LaunchConfigurationsMessages.LaunchConfigurationDialog_Yes_32, LaunchConfigurationsMessages.LaunchConfigurationDialog_No_33, LaunchConfigurationsMessages.LaunchConfigurationDialog_Cancel_34}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + new String[] {LaunchConfigurationsMessages.LaunchConfigurationDialog_Yes_32, LaunchConfigurationsMessages.LaunchConfigurationDialog_No_33, LaunchConfigurationsMessages.LaunchConfigurationDialog_Cancel_34}, // 0); // If user clicked 'Cancel' or closed dialog, return false int selectedButton = dialog.open(); @@ -1046,15 +1046,15 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * <code>false</code> otherwise. */ private boolean showDiscardChangesDialog() { - StringBuffer buffer = new StringBuffer(MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationDialog_The_configuration___35, new String[]{getTabViewer().getWorkingCopy().getName()})); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(MessageFormat.format(LaunchConfigurationsMessages.LaunchConfigurationDialog_The_configuration___35, new String[]{getTabViewer().getWorkingCopy().getName()})); buffer.append(getTabViewer().getErrorMesssage()); - buffer.append(LaunchConfigurationsMessages.LaunchConfigurationDialog_Do_you_wish_to_discard_changes_37); //$NON-NLS-1$ + buffer.append(LaunchConfigurationsMessages.LaunchConfigurationDialog_Do_you_wish_to_discard_changes_37); MessageDialog dialog = new MessageDialog(getShell(), - LaunchConfigurationsMessages.LaunchConfigurationDialog_Discard_changes__38, //$NON-NLS-1$ + LaunchConfigurationsMessages.LaunchConfigurationDialog_Discard_changes__38, null, buffer.toString(), MessageDialog.QUESTION, - new String[] {LaunchConfigurationsMessages.LaunchConfigurationDialog_Yes_32, LaunchConfigurationsMessages.LaunchConfigurationDialog_No_33}, //$NON-NLS-1$ //$NON-NLS-2$ + new String[] {LaunchConfigurationsMessages.LaunchConfigurationDialog_Yes_32, LaunchConfigurationsMessages.LaunchConfigurationDialog_No_33}, // 1); // If user clicked 'Yes', return true int selectedButton = dialog.open(); @@ -1653,13 +1653,13 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun String title = null; switch (status.getSeverity()) { case IStatus.ERROR: - title = LaunchConfigurationsMessages.LaunchConfigurationsDialog_Error_1; //$NON-NLS-1$ + title = LaunchConfigurationsMessages.LaunchConfigurationsDialog_Error_1; break; case IStatus.WARNING: - title = LaunchConfigurationsMessages.LaunchConfigurationsDialog_Warning_2; //$NON-NLS-1$ + title = LaunchConfigurationsMessages.LaunchConfigurationsDialog_Warning_2; break; default: - title = LaunchConfigurationsMessages.LaunchConfigurationsDialog_Information_3; //$NON-NLS-1$ + title = LaunchConfigurationsMessages.LaunchConfigurationsDialog_Information_3; break; } ErrorDialog.openError(getShell(), title, null, status); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java index 46b0c3def..94c910828 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java @@ -347,7 +347,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut, IPluginContribu try { fDelegate = (ILaunchShortcut)fConfig.createExecutableExtension("class"); //$NON-NLS-1$ } catch (CoreException e) { - DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), LaunchConfigurationsMessages.LaunchShortcutExtension_Error_4, LaunchConfigurationsMessages.LaunchShortcutExtension_Unable_to_use_launch_shortcut_5, e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), LaunchConfigurationsMessages.LaunchShortcutExtension_Error_4, LaunchConfigurationsMessages.LaunchShortcutExtension_Unable_to_use_launch_shortcut_5, e.getStatus()); // } } return fDelegate; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/OrganizeFavoritesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/OrganizeFavoritesAction.java index ce9407b30..5991d5ea7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/OrganizeFavoritesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/OrganizeFavoritesAction.java @@ -25,7 +25,7 @@ public class OrganizeFavoritesAction extends Action { * @param text */ public OrganizeFavoritesAction(String launchGroupId) { - super(LaunchConfigurationsMessages.OrganizeFavoritesAction_0); //$NON-NLS-1$ + super(LaunchConfigurationsMessages.OrganizeFavoritesAction_0); fGroupId = launchGroupId; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java index 93917df61..f3d053e0e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java @@ -221,8 +221,8 @@ public class PerspectiveManager implements ILaunchListener, IDebugEventSetListen window.getWorkbench().showPerspective(id, window); } catch (WorkbenchException e) { DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), - LaunchConfigurationsMessages.PerspectiveManager_Error_1, //$NON-NLS-1$ - MessageFormat.format(LaunchConfigurationsMessages.PerspectiveManager_Unable_to_switch_to_perspective___0__2, new String[]{id}), //$NON-NLS-1$ + LaunchConfigurationsMessages.PerspectiveManager_Error_1, + MessageFormat.format(LaunchConfigurationsMessages.PerspectiveManager_Unable_to_switch_to_perspective___0__2, new String[]{id}), e); } } @@ -257,8 +257,8 @@ public class PerspectiveManager implements ILaunchListener, IDebugEventSetListen protected void switchFailed(final Throwable t, final String launchName) { sync(new Runnable() { public void run() { - DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), LaunchConfigurationsMessages.PerspectiveManager_Error_1, //$NON-NLS-1$ - MessageFormat.format(LaunchConfigurationsMessages.PerspectiveManager_Unable_to_switch_perpsectives_as_specified_by_launch___0__4, new String[] {launchName}), //$NON-NLS-1$ + DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), LaunchConfigurationsMessages.PerspectiveManager_Error_1, + MessageFormat.format(LaunchConfigurationsMessages.PerspectiveManager_Unable_to_switch_perpsectives_as_specified_by_launch___0__4, new String[] {launchName}), t); }}); } @@ -465,7 +465,7 @@ public class PerspectiveManager implements ILaunchListener, IDebugEventSetListen * automatically when the given launch suspends */ protected boolean shouldSwitchPerspectiveForSuspend(IWorkbenchWindow window, String perspectiveId) { - return shouldSwitchPerspective(window, perspectiveId, LaunchConfigurationsMessages.PerspectiveManager_13, IInternalDebugUIConstants.PREF_SWITCH_PERSPECTIVE_ON_SUSPEND); //$NON-NLS-1$ + return shouldSwitchPerspective(window, perspectiveId, LaunchConfigurationsMessages.PerspectiveManager_13, IInternalDebugUIConstants.PREF_SWITCH_PERSPECTIVE_ON_SUSPEND); } /** @@ -479,7 +479,7 @@ public class PerspectiveManager implements ILaunchListener, IDebugEventSetListen * automatically when a launch occurs */ protected boolean shouldSwitchPerspectiveForLaunch(IWorkbenchWindow window, String perspectiveId) { - return shouldSwitchPerspective(window, perspectiveId, LaunchConfigurationsMessages.PerspectiveManager_15, IInternalDebugUIConstants.PREF_SWITCH_TO_PERSPECTIVE); //$NON-NLS-1$ + return shouldSwitchPerspective(window, perspectiveId, LaunchConfigurationsMessages.PerspectiveManager_15, IInternalDebugUIConstants.PREF_SWITCH_TO_PERSPECTIVE); } /** @@ -522,7 +522,7 @@ public class PerspectiveManager implements ILaunchListener, IDebugEventSetListen if (DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugUIConstants.PREF_ACTIVATE_WORKBENCH)) { shell.forceActive(); } - MessageDialogWithToggle dialog = MessageDialogWithToggle.openYesNoQuestion(shell, LaunchConfigurationsMessages.PerspectiveManager_12, MessageFormat.format(message, new String[] { perspectiveName }), null, false, DebugUIPlugin.getDefault().getPreferenceStore(), preferenceKey); //$NON-NLS-1$ + MessageDialogWithToggle dialog = MessageDialogWithToggle.openYesNoQuestion(shell, LaunchConfigurationsMessages.PerspectiveManager_12, MessageFormat.format(message, new String[] { perspectiveName }), null, false, DebugUIPlugin.getDefault().getPreferenceStore(), preferenceKey); boolean answer = (dialog.getReturnCode() == IDialogConstants.YES_ID); synchronized (this) { fPrompting= false; @@ -645,11 +645,11 @@ public class PerspectiveManager implements ILaunchListener, IDebugEventSetListen DebugUIPlugin.getDefault().getPreferenceStore().putValue(IInternalDebugUIConstants.PREF_LAUNCH_PERSPECTIVES, xml); DebugUIPlugin.getDefault().savePluginPreferences(); } catch (IOException e) { - DebugUIPlugin.log(DebugUIPlugin.newErrorStatus(LaunchConfigurationsMessages.PerspectiveManager_9, e)); //$NON-NLS-1$ + DebugUIPlugin.log(DebugUIPlugin.newErrorStatus(LaunchConfigurationsMessages.PerspectiveManager_9, e)); } catch (ParserConfigurationException e) { - DebugUIPlugin.log(DebugUIPlugin.newErrorStatus(LaunchConfigurationsMessages.PerspectiveManager_9, e)); //$NON-NLS-1$ + DebugUIPlugin.log(DebugUIPlugin.newErrorStatus(LaunchConfigurationsMessages.PerspectiveManager_9, e)); } catch (TransformerException e) { - DebugUIPlugin.log(DebugUIPlugin.newErrorStatus(LaunchConfigurationsMessages.PerspectiveManager_9, e)); //$NON-NLS-1$ + DebugUIPlugin.log(DebugUIPlugin.newErrorStatus(LaunchConfigurationsMessages.PerspectiveManager_9, e)); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectivesTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectivesTab.java index 43ef00898..faf1488aa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectivesTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectivesTab.java @@ -93,7 +93,7 @@ public class PerspectivesTab extends AbstractLaunchConfigurationTab implements I String mode = (String)fCombos[i].getData(); String def = DebugUIPlugin.getDefault().getPerspectiveManager().getDefaultLaunchPerspective(getLaunchConfigurationType(), mode); if (def == null) { - fCombos[i].setText(LaunchConfigurationsMessages.PerspectivesTab_1); //$NON-NLS-1$ + fCombos[i].setText(LaunchConfigurationsMessages.PerspectivesTab_1); } else { IPerspectiveRegistry registry = PlatformUI.getWorkbench().getPerspectiveRegistry(); IPerspectiveDescriptor descriptor = registry.findPerspectiveWithId(def); @@ -185,7 +185,7 @@ public class PerspectivesTab extends AbstractLaunchConfigurationTab implements I Label label = new Label(composite, SWT.LEFT + SWT.WRAP); label.setFont(parent.getFont()); - label.setText(MessageFormat.format(LaunchConfigurationsMessages.PerspectivesTab_0, new String[]{getLaunchConfigurationType().getName()})); //$NON-NLS-1$ + label.setText(MessageFormat.format(LaunchConfigurationsMessages.PerspectivesTab_0, new String[]{getLaunchConfigurationType().getName()})); final GridData finalGd = new GridData(); finalGd.horizontalSpan = 2; label.setLayoutData(finalGd); @@ -212,7 +212,7 @@ public class PerspectivesTab extends AbstractLaunchConfigurationTab implements I IPerspectiveRegistry registry = PlatformUI.getWorkbench().getPerspectiveRegistry(); IPerspectiveDescriptor[] descriptors = registry.getPerspectives(); fPerspectiveLabels = new String[descriptors.length + 1]; - fPerspectiveLabels[0] = LaunchConfigurationsMessages.PerspectivesTab_1; //$NON-NLS-1$ + fPerspectiveLabels[0] = LaunchConfigurationsMessages.PerspectivesTab_1; fPerspectiveIds = new HashMap(descriptors.length); for (int i = 0; i < descriptors.length; i++) { IPerspectiveDescriptor descriptor = descriptors[i]; @@ -231,7 +231,7 @@ public class PerspectivesTab extends AbstractLaunchConfigurationTab implements I gd.horizontalSpan= 1; label.setLayoutData(gd); String text = DebugPlugin.getDefault().getLaunchManager().getLaunchMode(fModeIds[i]).getLabel(); - label.setText(MessageFormat.format(LaunchConfigurationsMessages.PerspectivesTab_2, new String[]{text})); //$NON-NLS-1$ + label.setText(MessageFormat.format(LaunchConfigurationsMessages.PerspectivesTab_2, new String[]{text})); Combo combo = new Combo(composite, SWT.READ_ONLY); combo.setFont(composite.getFont()); @@ -245,7 +245,7 @@ public class PerspectivesTab extends AbstractLaunchConfigurationTab implements I createVerticalSpacer(composite, 2); - fRestoreDefaults = createPushButton(composite, LaunchConfigurationsMessages.PerspectivesTab_3, null); //$NON-NLS-1$ + fRestoreDefaults = createPushButton(composite, LaunchConfigurationsMessages.PerspectivesTab_3, null); gd= new GridData(GridData.FILL_BOTH); gd.horizontalSpan= 2; gd.horizontalAlignment= SWT.END; @@ -292,7 +292,7 @@ public class PerspectivesTab extends AbstractLaunchConfigurationTab implements I } if (descriptor == null) { // select none - fCombos[i].setText(LaunchConfigurationsMessages.PerspectivesTab_1); //$NON-NLS-1$ + fCombos[i].setText(LaunchConfigurationsMessages.PerspectivesTab_1); } else { fCombos[i].setText(descriptor.getLabel()); } @@ -325,7 +325,7 @@ public class PerspectivesTab extends AbstractLaunchConfigurationTab implements I if (!fInitializing) { String mode = (String)combo.getData(); String persp = combo.getText(); - if (persp.equals(LaunchConfigurationsMessages.PerspectivesTab_1)) { //$NON-NLS-1$ + if (persp.equals(LaunchConfigurationsMessages.PerspectivesTab_1)) { persp = IDebugUIConstants.PERSPECTIVE_NONE; } else { persp = (String)fPerspectiveIds.get(persp); @@ -346,7 +346,7 @@ public class PerspectivesTab extends AbstractLaunchConfigurationTab implements I * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ public String getName() { - return LaunchConfigurationsMessages.PerspectivesTab_7; //$NON-NLS-1$ + return LaunchConfigurationsMessages.PerspectivesTab_7; } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java index 3e3ddd624..929883e05 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java @@ -76,7 +76,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements */ public ConsolePreferencePage() { super(GRID); - setDescription(DebugPreferencesMessages.ConsolePreferencePage_Console_settings); //$NON-NLS-1$ + setDescription(DebugPreferencesMessages.ConsolePreferencePage_Console_settings); setPreferenceStore(DebugUIPlugin.getDefault().getPreferenceStore()); } @@ -95,13 +95,13 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements */ public void createFieldEditors() { - fWrapEditor = new BooleanFieldEditor2(IDebugPreferenceConstants.CONSOLE_WRAP, DebugPreferencesMessages.ConsolePreferencePage_Wrap_text_1, SWT.NONE, getFieldEditorParent()); //$NON-NLS-1$ + fWrapEditor = new BooleanFieldEditor2(IDebugPreferenceConstants.CONSOLE_WRAP, DebugPreferencesMessages.ConsolePreferencePage_Wrap_text_1, SWT.NONE, getFieldEditorParent()); addField(fWrapEditor); - fWidthEditor = new ConsoleIntegerFieldEditor(IDebugPreferenceConstants.CONSOLE_WIDTH, DebugPreferencesMessages.ConsolePreferencePage_Console_width, getFieldEditorParent()); //$NON-NLS-1$ + fWidthEditor = new ConsoleIntegerFieldEditor(IDebugPreferenceConstants.CONSOLE_WIDTH, DebugPreferencesMessages.ConsolePreferencePage_Console_width, getFieldEditorParent()); addField(fWidthEditor); fWidthEditor.setValidRange(80, 1000); - fWidthEditor.setErrorMessage(DebugPreferencesMessages.ConsolePreferencePage_console_width); //$NON-NLS-1$ + fWidthEditor.setErrorMessage(DebugPreferencesMessages.ConsolePreferencePage_console_width); fWrapEditor.getChangeControl(getFieldEditorParent()).addSelectionListener( new SelectionAdapter() { @@ -111,13 +111,13 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements } ); - fUseBufferSize = new BooleanFieldEditor2(IDebugPreferenceConstants.CONSOLE_LIMIT_CONSOLE_OUTPUT, DebugPreferencesMessages.ConsolePreferencePage_Limit_console_output_1, SWT.NONE, getFieldEditorParent()); //$NON-NLS-1$ + fUseBufferSize = new BooleanFieldEditor2(IDebugPreferenceConstants.CONSOLE_LIMIT_CONSOLE_OUTPUT, DebugPreferencesMessages.ConsolePreferencePage_Limit_console_output_1, SWT.NONE, getFieldEditorParent()); addField(fUseBufferSize); - fBufferSizeEditor = new ConsoleIntegerFieldEditor(IDebugPreferenceConstants.CONSOLE_LOW_WATER_MARK, DebugPreferencesMessages.ConsolePreferencePage_Console_buffer_size__characters___2, getFieldEditorParent()); //$NON-NLS-1$ + fBufferSizeEditor = new ConsoleIntegerFieldEditor(IDebugPreferenceConstants.CONSOLE_LOW_WATER_MARK, DebugPreferencesMessages.ConsolePreferencePage_Console_buffer_size__characters___2, getFieldEditorParent()); addField(fBufferSizeEditor); fBufferSizeEditor.setValidRange(1000, 1000000); - fBufferSizeEditor.setErrorMessage(DebugPreferencesMessages.ConsolePreferencePage_The_console_buffer_size_must_be_at_least_1000_characters__1); //$NON-NLS-1$ + fBufferSizeEditor.setErrorMessage(DebugPreferencesMessages.ConsolePreferencePage_The_console_buffer_size_must_be_at_least_1000_characters__1); fUseBufferSize.getChangeControl(getFieldEditorParent()).addSelectionListener( new SelectionAdapter() { @@ -127,17 +127,17 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements } ); - fTabSizeEditor = new ConsoleIntegerFieldEditor(IDebugPreferenceConstants.CONSOLE_TAB_WIDTH, DebugPreferencesMessages.ConsolePreferencePage_12, getFieldEditorParent()); //$NON-NLS-1$ + fTabSizeEditor = new ConsoleIntegerFieldEditor(IDebugPreferenceConstants.CONSOLE_TAB_WIDTH, DebugPreferencesMessages.ConsolePreferencePage_12, getFieldEditorParent()); addField(fTabSizeEditor); fTabSizeEditor.setValidRange(1,100); - fTabSizeEditor.setErrorMessage(DebugPreferencesMessages.ConsolePreferencePage_13); //$NON-NLS-1$ + fTabSizeEditor.setErrorMessage(DebugPreferencesMessages.ConsolePreferencePage_13); - addField(new BooleanFieldEditor(IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT, DebugPreferencesMessages.ConsolePreferencePage_Show__Console_View_when_there_is_program_output_3, SWT.NONE, getFieldEditorParent())); //$NON-NLS-1$ - addField(new BooleanFieldEditor(IDebugPreferenceConstants.CONSOLE_OPEN_ON_ERR, DebugPreferencesMessages.ConsolePreferencePage_Show__Console_View_when_there_is_program_error_3, SWT.NONE, getFieldEditorParent())); //$NON-NLS-1$ + addField(new BooleanFieldEditor(IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT, DebugPreferencesMessages.ConsolePreferencePage_Show__Console_View_when_there_is_program_output_3, SWT.NONE, getFieldEditorParent())); + addField(new BooleanFieldEditor(IDebugPreferenceConstants.CONSOLE_OPEN_ON_ERR, DebugPreferencesMessages.ConsolePreferencePage_Show__Console_View_when_there_is_program_error_3, SWT.NONE, getFieldEditorParent())); - ColorFieldEditor sysout= new ColorFieldEditor(IDebugPreferenceConstants.CONSOLE_SYS_OUT_COLOR, DebugPreferencesMessages.ConsolePreferencePage_Standard_Out__2, getFieldEditorParent()); //$NON-NLS-1$ - ColorFieldEditor syserr= new ColorFieldEditor(IDebugPreferenceConstants.CONSOLE_SYS_ERR_COLOR, DebugPreferencesMessages.ConsolePreferencePage_Standard_Error__3, getFieldEditorParent()); //$NON-NLS-1$ - ColorFieldEditor sysin= new ColorFieldEditor(IDebugPreferenceConstants.CONSOLE_SYS_IN_COLOR, DebugPreferencesMessages.ConsolePreferencePage_Standard_In__4, getFieldEditorParent()); //$NON-NLS-1$ + ColorFieldEditor sysout= new ColorFieldEditor(IDebugPreferenceConstants.CONSOLE_SYS_OUT_COLOR, DebugPreferencesMessages.ConsolePreferencePage_Standard_Out__2, getFieldEditorParent()); + ColorFieldEditor syserr= new ColorFieldEditor(IDebugPreferenceConstants.CONSOLE_SYS_ERR_COLOR, DebugPreferencesMessages.ConsolePreferencePage_Standard_Error__3, getFieldEditorParent()); + ColorFieldEditor sysin= new ColorFieldEditor(IDebugPreferenceConstants.CONSOLE_SYS_IN_COLOR, DebugPreferencesMessages.ConsolePreferencePage_Standard_In__4, getFieldEditorParent()); addField(sysout); addField(syserr); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencePage.java index 599688ef3..0e264a253 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencePage.java @@ -38,7 +38,7 @@ public class DebugPreferencePage extends FieldEditorPreferencePage implements IW IPreferenceStore store= DebugUIPlugin.getDefault().getPreferenceStore(); setPreferenceStore(store); - setDescription(DebugPreferencesMessages.DebugPreferencePage_1); //$NON-NLS-1$ + setDescription(DebugPreferencesMessages.DebugPreferencePage_1); } /* (non-Javadoc) @@ -53,24 +53,24 @@ public class DebugPreferencePage extends FieldEditorPreferencePage implements IW * @see FieldEditorPreferencePage#createFieldEditors */ protected void createFieldEditors() { - addField(new BooleanFieldEditor(IDebugUIConstants.PREF_REUSE_EDITOR, DebugPreferencesMessages.DebugPreferencePage_2, SWT.NONE, getFieldEditorParent())); //$NON-NLS-1$ + addField(new BooleanFieldEditor(IDebugUIConstants.PREF_REUSE_EDITOR, DebugPreferencesMessages.DebugPreferencePage_2, SWT.NONE, getFieldEditorParent())); createSpacer(getFieldEditorParent(), 2); - addField(new BooleanFieldEditor(IDebugUIConstants.PREF_ACTIVATE_WORKBENCH, DebugPreferencesMessages.DebugPreferencePage_3, SWT.NONE, getFieldEditorParent())); //$NON-NLS-1$ - addField(new BooleanFieldEditor(IInternalDebugUIConstants.PREF_ACTIVATE_DEBUG_VIEW, DebugPreferencesMessages.DebugPreferencePage_26, SWT.NONE, getFieldEditorParent())); //$NON-NLS-1$ + addField(new BooleanFieldEditor(IDebugUIConstants.PREF_ACTIVATE_WORKBENCH, DebugPreferencesMessages.DebugPreferencePage_3, SWT.NONE, getFieldEditorParent())); + addField(new BooleanFieldEditor(IInternalDebugUIConstants.PREF_ACTIVATE_DEBUG_VIEW, DebugPreferencesMessages.DebugPreferencePage_26, SWT.NONE, getFieldEditorParent())); createSwitchPerspectiveOnSuspendEditor(); createSpacer(getFieldEditorParent(), 2); - addField(new BooleanFieldEditor(IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE, DebugPreferencesMessages.DebugPreferencePage_25, SWT.NONE, getFieldEditorParent())); //$NON-NLS-1$ + addField(new BooleanFieldEditor(IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE, DebugPreferencesMessages.DebugPreferencePage_25, SWT.NONE, getFieldEditorParent())); createSpacer(getFieldEditorParent(), 2); - ColorFieldEditor mem= new ColorFieldEditor(IDebugPreferenceConstants.CHANGED_VARIABLE_COLOR, DebugPreferencesMessages.DebugPreferencePage_4, getFieldEditorParent()); //$NON-NLS-1$ + ColorFieldEditor mem= new ColorFieldEditor(IDebugPreferenceConstants.CHANGED_VARIABLE_COLOR, DebugPreferencesMessages.DebugPreferencePage_4, getFieldEditorParent()); addField(mem); - mem= new ColorFieldEditor(IDebugPreferenceConstants.MEMORY_VIEW_UNBUFFERED_LINE_COLOR, DebugPreferencesMessages.DebugPreferencePage_0, getFieldEditorParent()); //$NON-NLS-1$ + mem= new ColorFieldEditor(IDebugPreferenceConstants.MEMORY_VIEW_UNBUFFERED_LINE_COLOR, DebugPreferencesMessages.DebugPreferencePage_0, getFieldEditorParent()); addField(mem); - mem= new ColorFieldEditor(IDebugPreferenceConstants.MEMORY_VIEW_BUFFERED_LINE_COLOR, DebugPreferencesMessages.DebugPreferencePage_27, getFieldEditorParent()); //$NON-NLS-1$ + mem= new ColorFieldEditor(IDebugPreferenceConstants.MEMORY_VIEW_BUFFERED_LINE_COLOR, DebugPreferencesMessages.DebugPreferencePage_27, getFieldEditorParent()); addField(mem); } @@ -82,10 +82,10 @@ public class DebugPreferencePage extends FieldEditorPreferencePage implements IW private void createSwitchPerspectiveOnSuspendEditor() { addField(new RadioGroupFieldEditor(IInternalDebugUIConstants.PREF_SWITCH_PERSPECTIVE_ON_SUSPEND, - DebugPreferencesMessages.DebugPreferencePage_21, 3, //$NON-NLS-1$ - new String[][] {{DebugPreferencesMessages.DebugPreferencePage_22, MessageDialogWithToggle.ALWAYS}, //$NON-NLS-1$ - {DebugPreferencesMessages.DebugPreferencePage_23, MessageDialogWithToggle.NEVER}, //$NON-NLS-1$ - {DebugPreferencesMessages.DebugPreferencePage_24, MessageDialogWithToggle.PROMPT}}, //$NON-NLS-1$ + DebugPreferencesMessages.DebugPreferencePage_21, 3, + new String[][] {{DebugPreferencesMessages.DebugPreferencePage_22, MessageDialogWithToggle.ALWAYS}, + {DebugPreferencesMessages.DebugPreferencePage_23, MessageDialogWithToggle.NEVER}, + {DebugPreferencesMessages.DebugPreferencePage_24, MessageDialogWithToggle.PROMPT}}, getFieldEditorParent(), true)); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java index 0af38543a..23e33afa2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchingPreferencePage.java @@ -41,20 +41,20 @@ public class LaunchingPreferencePage extends FieldEditorPreferencePage implement IPreferenceStore store= DebugUIPlugin.getDefault().getPreferenceStore(); setPreferenceStore(store); - setDescription(DebugPreferencesMessages.LaunchingPreferencePage_20); //$NON-NLS-1$ + setDescription(DebugPreferencesMessages.LaunchingPreferencePage_20); } /* (non-Javadoc) * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors() */ protected void createFieldEditors() { - addField(new BooleanFieldEditor(IDebugUIConstants.PREF_BUILD_BEFORE_LAUNCH, DebugPreferencesMessages.LaunchingPreferencePage_1, SWT.NONE, getFieldEditorParent())); //$NON-NLS-1$ + addField(new BooleanFieldEditor(IDebugUIConstants.PREF_BUILD_BEFORE_LAUNCH, DebugPreferencesMessages.LaunchingPreferencePage_1, SWT.NONE, getFieldEditorParent())); createSaveBeforeLaunchEditors(); createWaitForBuildEditor(); createSpacer(getFieldEditorParent(), 2); - addField(new BooleanFieldEditor(IDebugUIConstants.PREF_AUTO_REMOVE_OLD_LAUNCHES, DebugPreferencesMessages.LaunchingPreferencePage_10, SWT.NONE, getFieldEditorParent())); //$NON-NLS-1$ + addField(new BooleanFieldEditor(IDebugUIConstants.PREF_AUTO_REMOVE_OLD_LAUNCHES, DebugPreferencesMessages.LaunchingPreferencePage_10, SWT.NONE, getFieldEditorParent())); createSwitchPerspectiveEditor(); createRelaunchInDebugMode(); createContinueWithCompileErrors(); @@ -71,10 +71,10 @@ public class LaunchingPreferencePage extends FieldEditorPreferencePage implement } private void createLaunchHistoryEditor() { - final IntegerFieldEditor editor = new IntegerFieldEditor(IDebugUIConstants.PREF_MAX_HISTORY_SIZE, DebugPreferencesMessages.DebugPreferencePage_10, getFieldEditorParent()); //$NON-NLS-1$ + final IntegerFieldEditor editor = new IntegerFieldEditor(IDebugUIConstants.PREF_MAX_HISTORY_SIZE, DebugPreferencesMessages.DebugPreferencePage_10, getFieldEditorParent()); int historyMax = IDebugPreferenceConstants.MAX_LAUNCH_HISTORY_SIZE; editor.setTextLimit(Integer.toString(historyMax).length()); - editor.setErrorMessage(MessageFormat.format(DebugPreferencesMessages.DebugPreferencePage_11, new Object[] { new Integer(1), new Integer(historyMax)})); //$NON-NLS-1$ + editor.setErrorMessage(MessageFormat.format(DebugPreferencesMessages.DebugPreferencePage_11, new Object[] { new Integer(1), new Integer(historyMax)})); editor.setValidateStrategy(StringFieldEditor.VALIDATE_ON_KEY_STROKE); editor.setValidRange(1, historyMax); editor.setPropertyChangeListener(new IPropertyChangeListener() { @@ -87,49 +87,49 @@ public class LaunchingPreferencePage extends FieldEditorPreferencePage implement } private void createSaveBeforeLaunchEditors() { - addField(new RadioGroupFieldEditor(IInternalDebugUIConstants.PREF_SAVE_DIRTY_EDITORS_BEFORE_LAUNCH, DebugPreferencesMessages.LaunchingPreferencePage_2, 3, //$NON-NLS-1$ - new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_3, MessageDialogWithToggle.ALWAYS}, //$NON-NLS-1$ - {DebugPreferencesMessages.LaunchingPreferencePage_4, MessageDialogWithToggle.NEVER}, //$NON-NLS-1$ - {DebugPreferencesMessages.LaunchingPreferencePage_5, MessageDialogWithToggle.PROMPT}}, //$NON-NLS-1$ + addField(new RadioGroupFieldEditor(IInternalDebugUIConstants.PREF_SAVE_DIRTY_EDITORS_BEFORE_LAUNCH, DebugPreferencesMessages.LaunchingPreferencePage_2, 3, + new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_3, MessageDialogWithToggle.ALWAYS}, + {DebugPreferencesMessages.LaunchingPreferencePage_4, MessageDialogWithToggle.NEVER}, + {DebugPreferencesMessages.LaunchingPreferencePage_5, MessageDialogWithToggle.PROMPT}}, getFieldEditorParent(), true)); } private void createWaitForBuildEditor() { addField(new RadioGroupFieldEditor(IInternalDebugUIConstants.PREF_WAIT_FOR_BUILD, - DebugPreferencesMessages.LaunchingPreferencePage_6, 3, //$NON-NLS-1$ - new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_7, MessageDialogWithToggle.ALWAYS}, //$NON-NLS-1$ - {DebugPreferencesMessages.LaunchingPreferencePage_8, MessageDialogWithToggle.NEVER}, //$NON-NLS-1$ - {DebugPreferencesMessages.LaunchingPreferencePage_9, MessageDialogWithToggle.PROMPT}}, //$NON-NLS-1$ + DebugPreferencesMessages.LaunchingPreferencePage_6, 3, + new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_7, MessageDialogWithToggle.ALWAYS}, + {DebugPreferencesMessages.LaunchingPreferencePage_8, MessageDialogWithToggle.NEVER}, + {DebugPreferencesMessages.LaunchingPreferencePage_9, MessageDialogWithToggle.PROMPT}}, getFieldEditorParent(), true)); } private void createSwitchPerspectiveEditor() { addField(new RadioGroupFieldEditor(IInternalDebugUIConstants.PREF_SWITCH_TO_PERSPECTIVE, - DebugPreferencesMessages.LaunchingPreferencePage_11, 3, //$NON-NLS-1$ - new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_12, MessageDialogWithToggle.ALWAYS}, //$NON-NLS-1$ - {DebugPreferencesMessages.LaunchingPreferencePage_13, MessageDialogWithToggle.NEVER}, //$NON-NLS-1$ - {DebugPreferencesMessages.LaunchingPreferencePage_14, MessageDialogWithToggle.PROMPT}}, //$NON-NLS-1$ + DebugPreferencesMessages.LaunchingPreferencePage_11, 3, + new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_12, MessageDialogWithToggle.ALWAYS}, + {DebugPreferencesMessages.LaunchingPreferencePage_13, MessageDialogWithToggle.NEVER}, + {DebugPreferencesMessages.LaunchingPreferencePage_14, MessageDialogWithToggle.PROMPT}}, getFieldEditorParent(), true)); } private void createRelaunchInDebugMode() { addField(new RadioGroupFieldEditor(IInternalDebugUIConstants.PREF_RELAUNCH_IN_DEBUG_MODE, - DebugPreferencesMessages.LaunchingPreferencePage_15, 3, //$NON-NLS-1$ - new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_16, MessageDialogWithToggle.ALWAYS}, //$NON-NLS-1$ - {DebugPreferencesMessages.LaunchingPreferencePage_17, MessageDialogWithToggle.NEVER}, //$NON-NLS-1$ - {DebugPreferencesMessages.LaunchingPreferencePage_18, MessageDialogWithToggle.PROMPT}}, //$NON-NLS-1$ + DebugPreferencesMessages.LaunchingPreferencePage_15, 3, + new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_16, MessageDialogWithToggle.ALWAYS}, + {DebugPreferencesMessages.LaunchingPreferencePage_17, MessageDialogWithToggle.NEVER}, + {DebugPreferencesMessages.LaunchingPreferencePage_18, MessageDialogWithToggle.PROMPT}}, getFieldEditorParent(), true)); } private void createContinueWithCompileErrors() { addField(new RadioGroupFieldEditor(IInternalDebugUIConstants.PREF_CONTINUE_WITH_COMPILE_ERROR, - DebugPreferencesMessages.LaunchingPreferencePage_21, 2, //$NON-NLS-1$ - new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_22, MessageDialogWithToggle.ALWAYS}, //$NON-NLS-1$ - {DebugPreferencesMessages.LaunchingPreferencePage_23, MessageDialogWithToggle.PROMPT}}, //$NON-NLS-1$ + DebugPreferencesMessages.LaunchingPreferencePage_21, 2, + new String[][] {{DebugPreferencesMessages.LaunchingPreferencePage_22, MessageDialogWithToggle.ALWAYS}, + {DebugPreferencesMessages.LaunchingPreferencePage_23, MessageDialogWithToggle.PROMPT}}, getFieldEditorParent(), true)); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ProcessPropertyPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ProcessPropertyPage.java index 183e8e66c..4e08aa633 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ProcessPropertyPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ProcessPropertyPage.java @@ -48,7 +48,7 @@ public class ProcessPropertyPage extends PropertyPage { parent.setLayout(layout); Label l1= new Label(parent, SWT.NULL); - l1.setText(DebugPreferencesMessages.ProcessPropertyPage_Command_Line__1); //$NON-NLS-1$ + l1.setText(DebugPreferencesMessages.ProcessPropertyPage_Command_Line__1); GridData gd= new GridData(); gd.verticalAlignment= GridData.BEGINNING; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java index 54f5f0af6..c9522dab0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java @@ -76,9 +76,9 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor protected SimpleVariableContentProvider variableContentProvider= new SimpleVariableContentProvider(); - protected static final String NAME_LABEL= DebugPreferencesMessages.SimpleVariablePreferencePage_10; //$NON-NLS-1$ - protected static final String VALUE_LABEL = DebugPreferencesMessages.SimpleVariablePreferencePage_11; //$NON-NLS-1$ - protected static final String DESCRIPTION_LABEL = DebugPreferencesMessages.SimpleVariablePreferencePage_12; //$NON-NLS-1$ + protected static final String NAME_LABEL= DebugPreferencesMessages.SimpleVariablePreferencePage_10; + protected static final String VALUE_LABEL = DebugPreferencesMessages.SimpleVariablePreferencePage_11; + protected static final String DESCRIPTION_LABEL = DebugPreferencesMessages.SimpleVariablePreferencePage_12; protected static String[] variableTableColumnProperties= { "variable", //$NON-NLS-1$ @@ -86,8 +86,8 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor "description" //$NON-NLS-1$ }; protected String[] variableTableColumnHeaders= { - DebugPreferencesMessages.SimpleVariablePreferencePage_3, //$NON-NLS-1$ - DebugPreferencesMessages.SimpleVariablePreferencePage_4, //$NON-NLS-1$ + DebugPreferencesMessages.SimpleVariablePreferencePage_3, + DebugPreferencesMessages.SimpleVariablePreferencePage_4, DebugPreferencesMessages.SimpleVariablePreferencePage_5 }; protected ColumnLayoutData[] variableTableColumnLayouts= { @@ -97,7 +97,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor }; public StringVariablePreferencePage() { - setDescription(DebugPreferencesMessages.SimpleVariablePreferencePage_6); //$NON-NLS-1$ + setDescription(DebugPreferencesMessages.SimpleVariablePreferencePage_6); } /** @@ -216,14 +216,14 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor buttonComposite.setFont(parent.getFont()); // Create buttons - envAddButton = SWTUtil.createPushButton(buttonComposite, DebugPreferencesMessages.SimpleVariablePreferencePage_7, null); //$NON-NLS-1$ + envAddButton = SWTUtil.createPushButton(buttonComposite, DebugPreferencesMessages.SimpleVariablePreferencePage_7, null); envAddButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { handleAddButtonPressed(); } }); - envEditButton = SWTUtil.createPushButton(buttonComposite, DebugPreferencesMessages.SimpleVariablePreferencePage_8, null); //$NON-NLS-1$ + envEditButton = SWTUtil.createPushButton(buttonComposite, DebugPreferencesMessages.SimpleVariablePreferencePage_8, null); envEditButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { @@ -231,7 +231,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } }); envEditButton.setEnabled(false); - envRemoveButton = SWTUtil.createPushButton(buttonComposite, DebugPreferencesMessages.SimpleVariablePreferencePage_9, null); //$NON-NLS-1$ + envRemoveButton = SWTUtil.createPushButton(buttonComposite, DebugPreferencesMessages.SimpleVariablePreferencePage_9, null); envRemoveButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { @@ -242,7 +242,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } private void handleAddButtonPressed() { - MultipleInputDialog dialog= new MultipleInputDialog(getShell(), DebugPreferencesMessages.SimpleVariablePreferencePage_13); //$NON-NLS-1$ + MultipleInputDialog dialog= new MultipleInputDialog(getShell(), DebugPreferencesMessages.SimpleVariablePreferencePage_13); dialog.addTextField(NAME_LABEL, null, false); dialog.addBrowseField(VALUE_LABEL, null, true); dialog.addTextField(DESCRIPTION_LABEL, null, true); @@ -275,7 +275,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor IValueVariable currentVariable = (IValueVariable) iter.next(); String variableName = currentVariable.getName(); if (variableName.equals(name)) { - boolean overWrite= MessageDialog.openQuestion(getShell(), DebugPreferencesMessages.SimpleVariablePreferencePage_15, MessageFormat.format(DebugPreferencesMessages.SimpleVariablePreferencePage_16, new String[] {name})); //$NON-NLS-1$ //$NON-NLS-2$ + boolean overWrite= MessageDialog.openQuestion(getShell(), DebugPreferencesMessages.SimpleVariablePreferencePage_15, MessageFormat.format(DebugPreferencesMessages.SimpleVariablePreferencePage_16, new String[] {name})); // if (!overWrite) { return false; } @@ -303,7 +303,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor description= ""; //$NON-NLS-1$ } String originalName= variable.getName(); - MultipleInputDialog dialog= new MultipleInputDialog(getShell(), DebugPreferencesMessages.SimpleVariablePreferencePage_14); //$NON-NLS-1$ + MultipleInputDialog dialog= new MultipleInputDialog(getShell(), DebugPreferencesMessages.SimpleVariablePreferencePage_14); dialog.addTextField(NAME_LABEL, originalName, false); dialog.addBrowseField(VALUE_LABEL, value, true); dialog.addTextField(DESCRIPTION_LABEL, description, true); @@ -346,7 +346,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor } } if (contributedVariablesToRemove.length() > 0) { - boolean remove= MessageDialog.openQuestion(getShell(), DebugPreferencesMessages.SimpleLaunchVariablePreferencePage_21, MessageFormat.format(DebugPreferencesMessages.SimpleLaunchVariablePreferencePage_22, new String[] {contributedVariablesToRemove.toString()})); //$NON-NLS-1$ //$NON-NLS-2$ + boolean remove= MessageDialog.openQuestion(getShell(), DebugPreferencesMessages.SimpleLaunchVariablePreferencePage_21, MessageFormat.format(DebugPreferencesMessages.SimpleLaunchVariablePreferencePage_22, new String[] {contributedVariablesToRemove.toString()})); // if (!remove) { return; } @@ -448,7 +448,7 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor try { manager.addVariables((IValueVariable[]) fVariables.toArray(new IValueVariable[0])); } catch (CoreException e) { - DebugUIPlugin.errorDialog(getShell(), DebugPreferencesMessages.StringVariablePreferencePage_24, DebugPreferencesMessages.StringVariablePreferencePage_25, e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(getShell(), DebugPreferencesMessages.StringVariablePreferencePage_24, DebugPreferencesMessages.StringVariablePreferencePage_25, e.getStatus()); // } } @@ -489,9 +489,9 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor if (variable.isContributed()) { String pluginId = getVariableManager().getContributingPluginId(variable); if (pluginId != null) { - buffer.append(MessageFormat.format(DebugPreferencesMessages.StringVariablePreferencePage_0, new String[] {pluginId})); //$NON-NLS-1$ + buffer.append(MessageFormat.format(DebugPreferencesMessages.StringVariablePreferencePage_0, new String[] {pluginId})); } else { - buffer.append(DebugPreferencesMessages.SimpleLaunchVariablePreferencePage_23); //$NON-NLS-1$ + buffer.append(DebugPreferencesMessages.SimpleLaunchVariablePreferencePage_23); } } return buffer.toString(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java index 81eb387dc..a7ce88ded 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java @@ -67,8 +67,8 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor public ViewManagementPreferencePage() { super(); - setTitle(DebugPreferencesMessages.ViewManagementPreferencePage_1); //$NON-NLS-1$ - setDescription(DebugPreferencesMessages.ViewManagementPreferencePage_0); //$NON-NLS-1$ + setTitle(DebugPreferencesMessages.ViewManagementPreferencePage_1); + setDescription(DebugPreferencesMessages.ViewManagementPreferencePage_0); setPreferenceStore(DebugUITools.getPreferenceStore()); } @@ -96,15 +96,15 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor private void createViewTrackingOptions(Composite composite) { fTrackViewsButton= new Button(composite, SWT.CHECK); fTrackViewsButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - fTrackViewsButton.setText(DebugPreferencesMessages.ViewManagementPreferencePage_3); //$NON-NLS-1$ + fTrackViewsButton.setText(DebugPreferencesMessages.ViewManagementPreferencePage_3); fTrackViewsButton.setSelection(DebugUITools.getPreferenceStore().getBoolean(IInternalDebugUIConstants.PREF_TRACK_VIEWS)); fTrackViewsButton.addSelectionListener(fSelectionListener); Label label= new Label(composite, SWT.WRAP); - label.setText(DebugPreferencesMessages.ViewManagementPreferencePage_4); //$NON-NLS-1$ + label.setText(DebugPreferencesMessages.ViewManagementPreferencePage_4); label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - fResetViewsButton= SWTUtil.createPushButton(composite, DebugPreferencesMessages.ViewManagementPreferencePage_5, null); //$NON-NLS-1$ + fResetViewsButton= SWTUtil.createPushButton(composite, DebugPreferencesMessages.ViewManagementPreferencePage_5, null); ((GridData) fResetViewsButton.getLayoutData()).horizontalAlignment= GridData.BEGINNING; fResetViewsButton.addSelectionListener(fSelectionListener); updateResetButton(); @@ -130,7 +130,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor */ private void createPerspectiveViewer(Composite parent) { Label label= new Label(parent, SWT.WRAP); - label.setText(DebugPreferencesMessages.ViewManagementPreferencePage_2); //$NON-NLS-1$ + label.setText(DebugPreferencesMessages.ViewManagementPreferencePage_2); label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); Table table= new Table(parent, SWT.CHECK | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java index b94454b2c..e3f1ff34a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddContainerAction.java @@ -23,7 +23,7 @@ public class AddContainerAction extends SourceContainerAction { private ISourceLookupDirector fDirector; public AddContainerAction() { - super(SourceLookupUIMessages.sourceTab_addButton); //$NON-NLS-1$ + super(SourceLookupUIMessages.sourceTab_addButton); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java index b28ccdfb5..5a14288df 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java @@ -69,8 +69,8 @@ public class AddSourceContainerDialog extends TitleAreaDialog { */ protected Control createDialogArea(Composite ancestor) { - getShell().setText(SourceLookupUIMessages.addSourceLocation_title); //$NON-NLS-1$ - setTitle(SourceLookupUIMessages.addSourceLocation_description); //$NON-NLS-1$ + getShell().setText(SourceLookupUIMessages.addSourceLocation_title); + setTitle(SourceLookupUIMessages.addSourceLocation_description); setTitleImage(DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_ADD_SRC_LOC_WIZ)); Composite parent = new Composite(ancestor, SWT.NULL); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/CommonSourceNotFoundEditor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/CommonSourceNotFoundEditor.java index c6334cb72..cb9f1388d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/CommonSourceNotFoundEditor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/CommonSourceNotFoundEditor.java @@ -152,7 +152,7 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE data.grabExcessHorizontalSpace = false; data.grabExcessVerticalSpace = false; button.setLayoutData(data); - button.setText(SourceLookupUIMessages.addSourceLocation_addButton2); //$NON-NLS-1$ + button.setText(SourceLookupUIMessages.addSourceLocation_addButton2); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { buttonSelected(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/CommonSourceNotFoundEditorInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/CommonSourceNotFoundEditorInput.java index f9a472b47..0fbce6601 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/CommonSourceNotFoundEditorInput.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/CommonSourceNotFoundEditorInput.java @@ -88,7 +88,7 @@ public class CommonSourceNotFoundEditorInput extends PlatformObject implements I * @see org.eclipse.ui.IEditorInput#getToolTipText() */ public String getToolTipText() { - return MessageFormat.format(SourceLookupUIMessages.addSourceLocation_editorMessage, new String[] { fLabel }); //$NON-NLS-1$ + return MessageFormat.format(SourceLookupUIMessages.addSourceLocation_editorMessage, new String[] { fLabel }); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/DownAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/DownAction.java index c38bc5ecb..673b78bd9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/DownAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/DownAction.java @@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; public class DownAction extends SourceContainerAction { public DownAction() { - super(SourceLookupUIMessages.sourceTab_downButton); //$NON-NLS-1$ + super(SourceLookupUIMessages.sourceTab_downButton); } /** * @see IAction#run() diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditContainerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditContainerAction.java index 7a64f7657..d441a13be 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditContainerAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditContainerAction.java @@ -27,7 +27,7 @@ public class EditContainerAction extends SourceContainerAction { private ISourceContainerBrowser fBrowser; public EditContainerAction() { - super(SourceLookupUIMessages.EditContainerAction_0); //$NON-NLS-1$ + super(SourceLookupUIMessages.EditContainerAction_0); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditSourceLookupPathAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditSourceLookupPathAction.java index 54dfe3adb..2d57596cf 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditSourceLookupPathAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/EditSourceLookupPathAction.java @@ -37,7 +37,7 @@ public class EditSourceLookupPathAction extends SelectionListenerAction { private LaunchView fView = null; public EditSourceLookupPathAction(LaunchView view) { - super(SourceLookupUIMessages.EditSourceLookupPathAction_0); //$NON-NLS-1$ + super(SourceLookupUIMessages.EditSourceLookupPathAction_0); setEnabled(false); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.EDIT_SOURCELOOKUP_ACTION); setImageDescriptor(DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_SRC_LOOKUP_MENU)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/LookupSourceAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/LookupSourceAction.java index 17ec227e9..992e6cae6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/LookupSourceAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/LookupSourceAction.java @@ -31,7 +31,7 @@ public class LookupSourceAction extends SelectionListenerAction { private IStackFrame frame = null; public LookupSourceAction(LaunchView view) { - super(SourceLookupUIMessages.LookupSourceAction_0); //$NON-NLS-1$ + super(SourceLookupUIMessages.LookupSourceAction_0); setEnabled(false); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.LOOKUP_SOURCE_ACTION); fView = view; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RemoveAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RemoveAction.java index 55ff9bdab..7d0efb2d7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RemoveAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RemoveAction.java @@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; */ public class RemoveAction extends SourceContainerAction { public RemoveAction() { - super(SourceLookupUIMessages.sourceTab_removeButton); //$NON-NLS-1$ + super(SourceLookupUIMessages.sourceTab_removeButton); } /** * Removes all selected entries. diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/ResolveDuplicatesHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/ResolveDuplicatesHandler.java index 57880471f..1b1e82649 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/ResolveDuplicatesHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/ResolveDuplicatesHandler.java @@ -46,8 +46,8 @@ public class ResolveDuplicatesHandler implements IStatusHandler { } ElementListSelectionDialog dialog = new ElementListSelectionDialog(DebugUIPlugin.getShell(), new SourceElementLabelProvider()); dialog.setMultipleSelection(false); - dialog.setTitle(SourceLookupUIMessages.ResolveDuplicatesHandler_0); //$NON-NLS-1$ - dialog.setMessage(SourceLookupUIMessages.ResolveDuplicatesHandler_1); //$NON-NLS-1$ + dialog.setTitle(SourceLookupUIMessages.ResolveDuplicatesHandler_0); + dialog.setMessage(SourceLookupUIMessages.ResolveDuplicatesHandler_1); dialog.setElements(sources.toArray()); dialog.open(); if(dialog.getReturnCode() == Window.OK) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RestoreDefaultAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RestoreDefaultAction.java index 1bafc1c5b..5020eb698 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RestoreDefaultAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/RestoreDefaultAction.java @@ -25,7 +25,7 @@ public class RestoreDefaultAction extends SourceContainerAction { private ISourceLookupDirector fDirector; public RestoreDefaultAction() { - super(SourceLookupUIMessages.sourceTab_defaultButton); //$NON-NLS-1$ + super(SourceLookupUIMessages.sourceTab_defaultButton); } /** * @see IAction#run() diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java index 46b28e63a..168aaae07 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java @@ -353,8 +353,8 @@ public class SourceLookupFacility implements IPageListener, IPartListener2, IPro editor[0] = page.openEditor(input, id, false); } catch (PartInitException e) { DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), - DebugUIViewsMessages.LaunchView_Error_1, //$NON-NLS-1$ - DebugUIViewsMessages.LaunchView_Exception_occurred_opening_editor_for_debugger__2, //$NON-NLS-1$ + DebugUIViewsMessages.LaunchView_Error_1, + DebugUIViewsMessages.LaunchView_Exception_occurred_opening_editor_for_debugger__2, e); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupPanel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupPanel.java index 5b29b9d66..12af6580c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupPanel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupPanel.java @@ -82,7 +82,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements Label viewerLabel = new Label(comp, SWT.LEFT); viewerLabel.setText( - SourceLookupUIMessages.sourceTab_lookupLabel); //$NON-NLS-1$ + SourceLookupUIMessages.sourceTab_lookupLabel); gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL); gd.horizontalSpan = 2; viewerLabel.setLayoutData(gd); @@ -115,7 +115,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements fDuplicatesButton = new Button(comp, SWT.CHECK); fDuplicatesButton.setText( - SourceLookupUIMessages.sourceTab_searchDuplicateLabel); //$NON-NLS-1$ + SourceLookupUIMessages.sourceTab_searchDuplicateLabel); gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gd.horizontalSpan = 2; fDuplicatesButton.setLayoutData(gd); @@ -264,7 +264,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements } if(type == null) { - setErrorMessage(SourceLookupUIMessages.sourceLookupPanel_2); //$NON-NLS-1$ + setErrorMessage(SourceLookupUIMessages.sourceLookupPanel_2); return; } @@ -276,12 +276,12 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements memento = null; // don't use old memento type = configuration.getType().getSourceLocatorId(); if(type == null) { - setErrorMessage(SourceLookupUIMessages.sourceLookupPanel_2); //$NON-NLS-1$ + setErrorMessage(SourceLookupUIMessages.sourceLookupPanel_2); return; } locator = getLaunchManager().newSourceLocator(type); if (!(locator instanceof AbstractSourceLookupDirector)) { - setErrorMessage(SourceLookupUIMessages.sourceLookupPanel_2); //$NON-NLS-1$ + setErrorMessage(SourceLookupUIMessages.sourceLookupPanel_2); return; } migration = true; @@ -344,13 +344,13 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements workingCopy = fLocator.getLaunchConfiguration().getWorkingCopy(); }catch(CoreException e){ DebugUIPlugin.log(e); - setErrorMessage(SourceLookupUIMessages.sourceLookupPanel_1); //$NON-NLS-1$ + setErrorMessage(SourceLookupUIMessages.sourceLookupPanel_1); return; } } else workingCopy = configuration; if(workingCopy == null) { - DebugUIPlugin.logErrorMessage(SourceLookupUIMessages.sourceLookupPanel_1); //$NON-NLS-1$ + DebugUIPlugin.logErrorMessage(SourceLookupUIMessages.sourceLookupPanel_1); return; } //set new values in director so memento returned is correct @@ -371,7 +371,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements setDirty(false); }catch(CoreException e){ DebugUIPlugin.log(e); - setErrorMessage(SourceLookupUIMessages.sourceLookupPanel_1); //$NON-NLS-1$ + setErrorMessage(SourceLookupUIMessages.sourceLookupPanel_1); } } @@ -405,7 +405,7 @@ public class SourceLookupPanel extends AbstractLaunchConfigurationTab implements * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ public String getName() { - return SourceLookupUIMessages.sourceTab_tabTitle; //$NON-NLS-1$ + return SourceLookupUIMessages.sourceTab_tabTitle; } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/UpAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/UpAction.java index c25339b4a..94110d3c6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/UpAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/UpAction.java @@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; public class UpAction extends SourceContainerAction { public UpAction() { - super(SourceLookupUIMessages.sourceTab_upButton); //$NON-NLS-1$ + super(SourceLookupUIMessages.sourceTab_upButton); } /** * Moves all selected entries up one position (if possible). diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/WorkingSetSourceContainerType.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/WorkingSetSourceContainerType.java index 40cb6b191..2356bd14e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/WorkingSetSourceContainerType.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/WorkingSetSourceContainerType.java @@ -65,12 +65,12 @@ public class WorkingSetSourceContainerType extends AbstractSourceContainerTypeDe String name = root.getAttribute("name");//$NON-NLS-1$ if (isEmpty(name)) { - abort(SourceLookupUIMessages.sourceSearch_initError,null);//$NON-NLS-1$ + abort(SourceLookupUIMessages.sourceSearch_initError,null); } workingSet = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(name); //check that set still exists if (workingSet == null) { - abort(SourceLookupUIMessages.sourceSearch_initError, null); //$NON-NLS-1$ + abort(SourceLookupUIMessages.sourceSearch_initError, null); } return new WorkingSetSourceContainer(workingSet); @@ -82,7 +82,7 @@ public class WorkingSetSourceContainerType extends AbstractSourceContainerTypeDe ex = e; } - abort(SourceLookupUIMessages.sourceSearch_initError, ex); //$NON-NLS-1$ + abort(SourceLookupUIMessages.sourceSearch_initError, ex); return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java index ca45c532f..ffbb330a3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java @@ -82,8 +82,8 @@ public class ArchiveSourceContainerBrowser extends AbstractSourceContainerBrowse ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(shell, lp, cp); dialog.setValidator(validator); - dialog.setTitle(SourceLookupUIMessages.ArchiveSourceContainerBrowser_3); //$NON-NLS-1$ - dialog.setMessage(SourceLookupUIMessages.ArchiveSourceContainerBrowser_4); //$NON-NLS-1$ + dialog.setTitle(SourceLookupUIMessages.ArchiveSourceContainerBrowser_3); + dialog.setMessage(SourceLookupUIMessages.ArchiveSourceContainerBrowser_4); dialog.addFilter(filter); dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); dialog.setSorter(new ResourceSorter(ResourceSorter.NAME)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java index 60b871909..badb9fa0f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java @@ -36,9 +36,9 @@ public class DirectorySourceContainerDialog { } //TODO not supposed to subclass DirectoryDialog, but need a checkbox added for subfolder searching DirectoryDialog dialog = new DirectoryDialog(shell, SWT.MULTI); - dialog.setText(SourceLookupUIMessages.DirectorySourceContainerDialog_0); //$NON-NLS-1$ + dialog.setText(SourceLookupUIMessages.DirectorySourceContainerDialog_0); dialog.setFilterPath(lastUsedPath); - dialog.setMessage(SourceLookupUIMessages.DirectorySourceContainerDialog_1); //$NON-NLS-1$ + dialog.setMessage(SourceLookupUIMessages.DirectorySourceContainerDialog_1); fRes = dialog.open(); if (fRes == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java index aa17b152d..a5e2f036c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ExternalArchiveSourceContainerBrowser.java @@ -36,8 +36,8 @@ public class ExternalArchiveSourceContainerBrowser extends AbstractSourceContain public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) { FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI); String rootDir = DebugUIPlugin.getDefault().getDialogSettings().get(ROOT_DIR); - dialog.setText(SourceLookupUIMessages.ExternalArchiveSourceContainerBrowser_2); //$NON-NLS-1$ - dialog.setFilterExtensions(new String[]{"*.jar;*.zip"}); //$NON-NLS-1$//$NON-NLS-2$ + dialog.setText(SourceLookupUIMessages.ExternalArchiveSourceContainerBrowser_2); + dialog.setFilterExtensions(new String[]{"*.jar;*.zip"}); //$NON-NLS-1$ if (rootDir != null) { dialog.setFilterPath(rootDir); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java index 6bf4432bd..4eab50643 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java @@ -37,14 +37,14 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog { ILabelProvider labelProvider, ITreeContentProvider contentProvider) { super(parent, labelProvider, contentProvider); - setTitle(SourceLookupUIMessages.folderSelection_title); //$NON-NLS-1$ + setTitle(SourceLookupUIMessages.folderSelection_title); // setInput(ResourcesPlugin.getWorkspace().getRoot()); setSorter(new ResourceSorter(ResourceSorter.NAME)); ISelectionStatusValidator validator= new ISelectionStatusValidator() { public IStatus validate(Object[] selection) { for (int i= 0; i < selection.length; i++) { if (!(selection[i] instanceof IFolder)) { - return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), -1, SourceLookupUIMessages.sourceSearch_folderSelectionError, null); //$NON-NLS-1$ + return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), -1, SourceLookupUIMessages.sourceSearch_folderSelectionError, null); // } } return new Status(IStatus.OK, DebugUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$ @@ -53,7 +53,7 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog { setValidator(validator); setDoubleClickSelects(true); setAllowMultiple(true); - setMessage(SourceLookupUIMessages.folderSelection_label); //$NON-NLS-1$ + setMessage(SourceLookupUIMessages.folderSelection_label); PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugHelpContextIds.ADD_FOLDER_CONTAINER_DIALOG); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerBrowser.java index 789da21be..a5c0e8c43 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerBrowser.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerBrowser.java @@ -42,7 +42,7 @@ public class ProjectSourceContainerBrowser extends AbstractSourceContainerBrowse IStructuredContentProvider contentProvider=new BasicContainerContentProvider(); ILabelProvider labelProvider = new WorkbenchLabelProvider(); Dialog dialog = new ProjectSourceContainerDialog(shell,input, contentProvider, labelProvider, - SourceLookupUIMessages.projectSelection_chooseLabel); //$NON-NLS-1$ + SourceLookupUIMessages.projectSelection_chooseLabel); if(dialog.open() == Window.OK){ Object[] elements= ((ListSelectionDialog)dialog).getResult(); ArrayList res= new ArrayList(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerDialog.java index 3dba75bdd..3467f1bf8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ProjectSourceContainerDialog.java @@ -52,7 +52,7 @@ public class ProjectSourceContainerDialog extends ListSelectionDialog { Composite composite = (Composite)super.createDialogArea(parent); final Button addRequired = new Button(composite, SWT.CHECK); - addRequired.setText(SourceLookupUIMessages.projectSelection_requiredLabel); //$NON-NLS-1$ + addRequired.setText(SourceLookupUIMessages.projectSelection_requiredLabel); addRequired.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { fAddRequiredProjects = addRequired.getSelection(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java index 46a8a5f99..3a7c87a03 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java @@ -80,9 +80,9 @@ abstract class PromptingResolver implements IDynamicVariableResolver { } if (promptHint != null) { - dialogMessage = MessageFormat.format(StringSubstitutionMessages.PromptExpanderBase_0, new String[] {promptHint}); //$NON-NLS-1$ + dialogMessage = MessageFormat.format(StringSubstitutionMessages.PromptExpanderBase_0, new String[] {promptHint}); } else { - dialogMessage = StringSubstitutionMessages.PromptExpanderBase_1; //$NON-NLS-1$ + dialogMessage = StringSubstitutionMessages.PromptExpanderBase_1; } } @@ -103,7 +103,7 @@ abstract class PromptingResolver implements IDynamicVariableResolver { lastValue = dialogResultString; } else { // dialogResultString == null means prompt was cancelled - throw new DebugException(new Status(IStatus.CANCEL, DebugUIPlugin.getUniqueIdentifier(), IStatus.CANCEL, MessageFormat.format(StringSubstitutionMessages.PromptingResolver_0, new String[] { variable.getName() }), null)); //$NON-NLS-1$ + throw new DebugException(new Status(IStatus.CANCEL, DebugUIPlugin.getUniqueIdentifier(), IStatus.CANCEL, MessageFormat.format(StringSubstitutionMessages.PromptingResolver_0, new String[] { variable.getName() }), null)); } return value; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceResolver.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceResolver.java index b082de657..25b03703e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceResolver.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceResolver.java @@ -47,7 +47,7 @@ public class ResourceResolver implements IDynamicVariableResolver { return translateToValue(resource, variable); } } - abort(MessageFormat.format(StringSubstitutionMessages.ResourceResolver_6, new String[]{getReferenceExpression(variable, argument)}), null); //$NON-NLS-1$ + abort(MessageFormat.format(StringSubstitutionMessages.ResourceResolver_6, new String[]{getReferenceExpression(variable, argument)}), null); return null; } @@ -114,7 +114,7 @@ public class ResourceResolver implements IDynamicVariableResolver { protected IResource getSelectedResource(IDynamicVariable variable) throws CoreException { IResource resource = SelectedResourceManager.getDefault().getSelectedResource(); if (resource == null) { - abort(MessageFormat.format(StringSubstitutionMessages.ResourceResolver_7, new String[]{getReferenceExpression(variable, null)}), null); //$NON-NLS-1$ + abort(MessageFormat.format(StringSubstitutionMessages.ResourceResolver_7, new String[]{getReferenceExpression(variable, null)}), null); } return resource; } @@ -136,7 +136,7 @@ public class ResourceResolver implements IDynamicVariableResolver { } else if (name.endsWith("_name")) { //$NON-NLS-1$ return resource.getName(); } - abort(MessageFormat.format(StringSubstitutionMessages.ResourceResolver_8, new String[]{getReferenceExpression(variable, null)}), null); //$NON-NLS-1$ + abort(MessageFormat.format(StringSubstitutionMessages.ResourceResolver_8, new String[]{getReferenceExpression(variable, null)}), null); return null; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java index 78efd7142..d6e0f6ad7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java @@ -27,7 +27,7 @@ public class ResourceSelector implements IArgumentSelector { */ public String selectArgument(IStringVariable variable, Shell shell) { ResourceListSelectionDialog dialog = new ResourceListSelectionDialog(shell, ResourcesPlugin.getWorkspace().getRoot(), IResource.FILE | IResource.FOLDER | IResource.PROJECT); - dialog.setTitle(StringSubstitutionMessages.ResourceSelector_0); //$NON-NLS-1$ + dialog.setTitle(StringSubstitutionMessages.ResourceSelector_0); if (dialog.open() == Window.OK) { Object[] objects = dialog.getResult(); if (objects.length == 1) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringPrompt.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringPrompt.java index 1ec7ba501..13e3c4976 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringPrompt.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringPrompt.java @@ -24,7 +24,7 @@ public class StringPrompt extends PromptingResolver { * @see PromptExpanderBase#prompt() */ public void prompt() { - InputDialog dialog = new InputDialog(null, StringSubstitutionMessages.StringPromptExpander_0, dialogMessage, lastValue == null ? defaultValue : lastValue, null); //$NON-NLS-1$ + InputDialog dialog = new InputDialog(null, StringSubstitutionMessages.StringPromptExpander_0, dialogMessage, lastValue == null ? defaultValue : lastValue, null); int dialogResult = dialog.open(); if (dialogResult == Window.OK) { dialogResultString = dialog.getValue(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/AbstractDebugEventHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/AbstractDebugEventHandler.java index 155ace6ad..deac03e1e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/AbstractDebugEventHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/AbstractDebugEventHandler.java @@ -74,7 +74,7 @@ public abstract class AbstractDebugEventHandler implements IDebugEventSetListene private static final int TIMEOUT = 200; public EventProcessingJob() { - super(DebugUIViewsMessages.AbstractDebugEventHandler_0); //$NON-NLS-1$ + super(DebugUIViewsMessages.AbstractDebugEventHandler_0); setSystem(true); setPriority(Job.INTERACTIVE); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/DebugViewLabelDecorator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/DebugViewLabelDecorator.java index 6b39ec07b..d73189fb1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/DebugViewLabelDecorator.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/DebugViewLabelDecorator.java @@ -116,7 +116,7 @@ public class DebugViewLabelDecorator extends LabelProvider implements ILabelDeco public void computeText(Object element) { synchronized(this) { if (fNextJob == null) { - fNextJob= new LabelJob(DebugUIViewsMessages.DebugViewLabelDecorator_0, fPresentation); //$NON-NLS-1$ + fNextJob= new LabelJob(DebugUIViewsMessages.DebugViewLabelDecorator_0, fPresentation); } fNextJob.computeText(element); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeContentManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeContentManager.java index 8b02f3521..e6e99886e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeContentManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeContentManager.java @@ -201,7 +201,7 @@ public class RemoteTreeContentManager extends DeferredTreeContentManager { if (monitor.isCanceled()) { return; } - WorkbenchJob updateJob = new WorkbenchJob(DebugUIViewsMessages.IncrementalDeferredTreeContentManager_0) { //$NON-NLS-1$ + WorkbenchJob updateJob = new WorkbenchJob(DebugUIViewsMessages.IncrementalDeferredTreeContentManager_0) { /* * (non-Javadoc) * @@ -230,7 +230,7 @@ public class RemoteTreeContentManager extends DeferredTreeContentManager { * @param monitor */ protected void prune(final Object parent, final int offset) { - WorkbenchJob updateJob = new WorkbenchJob(DebugUIViewsMessages.IncrementalDeferredTreeContentManager_1) { //$NON-NLS-1$ + WorkbenchJob updateJob = new WorkbenchJob(DebugUIViewsMessages.IncrementalDeferredTreeContentManager_1) { /* * (non-Javadoc) * @@ -263,7 +263,7 @@ public class RemoteTreeContentManager extends DeferredTreeContentManager { * @see org.eclipse.ui.progress.DeferredTreeContentManager#getFetchJobName(java.lang.Object, org.eclipse.ui.progress.IDeferredWorkbenchAdapter) */ protected String getFetchJobName(Object parent, IDeferredWorkbenchAdapter adapter) { - return DebugUIViewsMessages.RemoteTreeContentManager_0; //$NON-NLS-1$ + return DebugUIViewsMessages.RemoteTreeContentManager_0; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeViewer.java index f2d2d8231..70fb9cccd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeViewer.java @@ -58,7 +58,7 @@ public class RemoteTreeViewer extends TreeViewer { * @param target the element to expand */ public ExpansionJob() { - super(DebugUIViewsMessages.LaunchViewer_1); //$NON-NLS-1$ + super(DebugUIViewsMessages.LaunchViewer_1); setPriority(Job.INTERACTIVE); setSystem(true); } @@ -127,7 +127,7 @@ public class RemoteTreeViewer extends TreeViewer { * @param target the element to select */ public SelectionJob() { - super(DebugUIViewsMessages.LaunchViewer_0); //$NON-NLS-1$ + super(DebugUIViewsMessages.LaunchViewer_0); setPriority(Job.INTERACTIVE); setSystem(true); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java index 7679ac275..7dc06fefa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java @@ -151,7 +151,7 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer { public String getOthersLabel() { String attribute = fElement.getAttribute(ATTR_OTHERS_LABEL); if (attribute == null) { - return DebugUIViewsMessages.OtherBreakpointOrganizer_0; //$NON-NLS-1$ + return DebugUIViewsMessages.OtherBreakpointOrganizer_0; } return attribute; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java index e076e6107..640ac7241 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java @@ -124,7 +124,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate IWorkingSet[] workingSets = fWorkingSetManager.getWorkingSets(); for (int i = 0; i < workingSets.length; i++) { IWorkingSet set = workingSets[i]; - if (IInternalDebugUIConstants.ID_BREAKPOINT_WORKINGSET.equals(set.getId())) { //$NON-NLS-1$ + if (IInternalDebugUIConstants.ID_BREAKPOINT_WORKINGSET.equals(set.getId())) { clean(set); } } @@ -192,7 +192,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate String name = ""; //$NON-NLS-1$ if (set != null) { // only consider breakpoint working sets - if (IInternalDebugUIConstants.ID_BREAKPOINT_WORKINGSET.equals(set.getId())) { //$NON-NLS-1$ + if (IInternalDebugUIConstants.ID_BREAKPOINT_WORKINGSET.equals(set.getId())) { name = set.getName(); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java index 80b50c898..908b17324 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java @@ -61,7 +61,7 @@ import org.eclipse.ui.dialogs.IWorkingSetPage; */ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetPage { - final private static String PAGE_TITLE= DebugUIViewsMessages.BreakpointWorkingSetPage_0; //$NON-NLS-1$ + final private static String PAGE_TITLE= DebugUIViewsMessages.BreakpointWorkingSetPage_0; final private static String PAGE_ID= "breakpointWorkingSetPage"; //$NON-NLS-1$ private Text fWorkingSetName; @@ -120,7 +120,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP */ public BreakpointWorkingSetPage() { super(PAGE_ID, PAGE_TITLE, DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_WIZBAN_DEBUG)); - setDescription(DebugUIViewsMessages.BreakpointWorkingSetPage_1); //$NON-NLS-1$ + setDescription(DebugUIViewsMessages.BreakpointWorkingSetPage_1); fFirstCheck= true; } @@ -136,7 +136,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP setControl(composite); Label label= new Label(composite, SWT.WRAP); - label.setText(DebugUIViewsMessages.BreakpointWorkingSetPage_2); //$NON-NLS-1$ + label.setText(DebugUIViewsMessages.BreakpointWorkingSetPage_2); GridData gd= new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER); label.setLayoutData(gd); @@ -152,7 +152,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP fWorkingSetName.setFocus(); label= new Label(composite, SWT.WRAP); - label.setText(DebugUIViewsMessages.BreakpointWorkingSetPage_3); //$NON-NLS-1$ + label.setText(DebugUIViewsMessages.BreakpointWorkingSetPage_3); gd= new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER); label.setLayoutData(gd); @@ -243,18 +243,18 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP } private void validateInput() { - String errorMessage= null; //$NON-NLS-1$ + String errorMessage= null; String newText= fWorkingSetName.getText(); if (newText.equals(newText.trim()) == false) - errorMessage = DebugUIViewsMessages.BreakpointWorkingSetPage_4; //$NON-NLS-1$ + errorMessage = DebugUIViewsMessages.BreakpointWorkingSetPage_4; if (newText.equals("")) { //$NON-NLS-1$ if (fFirstCheck) { setPageComplete(false); fFirstCheck= false; return; } - errorMessage= DebugUIViewsMessages.BreakpointWorkingSetPage_5; //$NON-NLS-1$ + errorMessage= DebugUIViewsMessages.BreakpointWorkingSetPage_5; } fFirstCheck= false; @@ -263,7 +263,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP IWorkingSet[] workingSets= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets(); for (int i= 0; i < workingSets.length; i++) { if (newText.equals(workingSets[i].getName())) { - errorMessage= DebugUIViewsMessages.BreakpointWorkingSetPage_6; //$NON-NLS-1$ + errorMessage= DebugUIViewsMessages.BreakpointWorkingSetPage_6; } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java index 7c1f47cc7..1b030a884 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java @@ -330,7 +330,7 @@ public class BreakpointsView extends AbstractDebugView implements ISelectionList */ private void handleBreakpointChecked(final CheckStateChangedEvent event, final IBreakpoint breakpoint) { final boolean enable= event.getChecked(); - String jobName = enable ? DebugUIViewsMessages.BreakpointsView_0 : DebugUIViewsMessages.BreakpointsView_1; //$NON-NLS-1$ //$NON-NLS-2$ + String jobName = enable ? DebugUIViewsMessages.BreakpointsView_0 : DebugUIViewsMessages.BreakpointsView_1; // new Job(jobName) { protected IStatus run(IProgressMonitor monitor) { try { @@ -339,9 +339,9 @@ public class BreakpointsView extends AbstractDebugView implements ISelectionList } catch (final CoreException e) { Display.getDefault().asyncExec(new Runnable() { public void run() { - String titleState= enable ? DebugUIViewsMessages.BreakpointsView_6 : DebugUIViewsMessages.BreakpointsView_7; //$NON-NLS-1$ //$NON-NLS-2$ - String messageState= enable ? DebugUIViewsMessages.BreakpointsView_8 : DebugUIViewsMessages.BreakpointsView_9; //$NON-NLS-1$ //$NON-NLS-2$ - DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), MessageFormat.format(DebugUIViewsMessages.BreakpointsView_10, new String[] { titleState }), MessageFormat.format(DebugUIViewsMessages.BreakpointsView_11, new String[] { messageState }), e); //$NON-NLS-1$ //$NON-NLS-2$ + String titleState= enable ? DebugUIViewsMessages.BreakpointsView_6 : DebugUIViewsMessages.BreakpointsView_7; // + String messageState= enable ? DebugUIViewsMessages.BreakpointsView_8 : DebugUIViewsMessages.BreakpointsView_9; // + DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), MessageFormat.format(DebugUIViewsMessages.BreakpointsView_10, new String[] { titleState }), MessageFormat.format(DebugUIViewsMessages.BreakpointsView_11, new String[] { messageState }), e); // // If the breakpoint fails to update, reset its check state. getCheckboxViewer().removeCheckStateListener(fCheckListener); event.getCheckable().setChecked(breakpoint, !event.getChecked()); @@ -390,7 +390,7 @@ public class BreakpointsView extends AbstractDebugView implements ISelectionList public void dispose() { disposeAction(IWorkbenchActionDefinitionIds.COPY); disposeAction(IWorkbenchActionDefinitionIds.PASTE); - disposeAction(ACTION_REMOVE_FROM_GROUP); //$NON-NLS-1$ + disposeAction(ACTION_REMOVE_FROM_GROUP); if (getCheckboxViewer() != null) { getCheckboxViewer().removeCheckStateListener(fCheckListener); @@ -432,7 +432,7 @@ public class BreakpointsView extends AbstractDebugView implements ISelectionList configure(copy, IWorkbenchActionDefinitionIds.COPY, ActionFactory.COPY.getId(), ISharedImages.IMG_TOOL_COPY); SelectionListenerAction remove = new RemoveFromWorkingSetAction(this); - setAction(ACTION_REMOVE_FROM_GROUP, remove); //$NON-NLS-1$ + setAction(ACTION_REMOVE_FROM_GROUP, remove); getViewer().addSelectionChangedListener(remove); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java index 4875db774..8f372fae1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java @@ -57,7 +57,7 @@ public class WorkingSetCategory extends PlatformObject implements IWorkbenchAdap public String getLabel(Object o) { StringBuffer name = new StringBuffer(fWorkingSet.getName()); if (isDefault()) { - name.append(DebugUIViewsMessages.WorkingSetCategory_0); //$NON-NLS-1$ + name.append(DebugUIViewsMessages.WorkingSetCategory_0); } return name.toString(); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java index 257c07c87..0677d8c8a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java @@ -75,9 +75,9 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate, } public ConsoleRemoveAllTerminatedAction() { - super(ConsoleMessages.ConsoleRemoveAllTerminatedAction_0); //$NON-NLS-1$ + super(ConsoleMessages.ConsoleRemoveAllTerminatedAction_0); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONSOLE_REMOVE_ALL_TERMINATED); - setToolTipText(ConsoleMessages.ConsoleRemoveAllTerminatedAction_1); //$NON-NLS-1$ + setToolTipText(ConsoleMessages.ConsoleRemoveAllTerminatedAction_1); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_ALL)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_ALL)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java index b831ae13c..ef16babc8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java @@ -34,10 +34,10 @@ public class ConsoleTerminateAction extends Action implements IUpdate { * Creates a terminate action for the console */ public ConsoleTerminateAction(ProcessConsole console) { - super(ConsoleMessages.ConsoleTerminateAction_0); //$NON-NLS-1$ + super(ConsoleMessages.ConsoleTerminateAction_0); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONSOLE_TERMINATE_ACTION); fConsole = console; - setToolTipText(ConsoleMessages.ConsoleTerminateAction_1); //$NON-NLS-1$ + setToolTipText(ConsoleMessages.ConsoleTerminateAction_1); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java index 85eca188c..f2d308468 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java @@ -153,10 +153,10 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe fFileOutputStream = new FileOutputStream(outputFile, append); fileLoc = outputFile.getAbsolutePath(); - message = MessageFormat.format(ConsoleMessages.ProcessConsole_1, new String[] {fileLoc}); //$NON-NLS-1$ + message = MessageFormat.format(ConsoleMessages.ProcessConsole_1, new String[] {fileLoc}); addPatternMatchListener(new ConsoleLogFilePatternMatcher(fileLoc)); } catch (FileNotFoundException e) { - message = MessageFormat.format(ConsoleMessages.ProcessConsole_2, new String[] {file}); //$NON-NLS-1$ + message = MessageFormat.format(ConsoleMessages.ProcessConsole_2, new String[] {file}); } catch (CoreException e) { DebugUIPlugin.log(e); } @@ -247,7 +247,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } if (process.isTerminated()) { - return MessageFormat.format(ConsoleMessages.ProcessConsole_0, new String[] { label }); //$NON-NLS-1$ + return MessageFormat.format(ConsoleMessages.ProcessConsole_0, new String[] { label }); } return label; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionInformationControl.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionInformationControl.java index 46dc8686d..ff04743f3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionInformationControl.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionInformationControl.java @@ -82,7 +82,7 @@ public class ExpressionInformationControl extends PopupInformationControl { * @param commandId identifier of the command used to dismiss the popup */ public ExpressionInformationControl(IWorkbenchPage page, IExpression exp, String commandId) { - super(page.getWorkbenchWindow().getShell(), DebugUIViewsMessages.ExpressionInformationControl_5, commandId); //$NON-NLS-1$ + super(page.getWorkbenchWindow().getShell(), DebugUIViewsMessages.ExpressionInformationControl_5, commandId); this.page = page; this.exp = exp; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java index 713bc2d05..65c7a65f0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java @@ -228,7 +228,7 @@ public class ExpressionView extends VariablesView { * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getToggleActionLabel() */ protected String getToggleActionLabel() { - return VariablesViewMessages.ExpressionView_4; //$NON-NLS-1$ + return VariablesViewMessages.ExpressionView_4; } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/PopupInformationControl.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/PopupInformationControl.java index 8ffc26ded..7fc30de37 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/PopupInformationControl.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/PopupInformationControl.java @@ -147,7 +147,7 @@ public abstract class PopupInformationControl implements IInformationControl, II List keyBindings = command.getKeySequenceBindings(); if (keyBindings != null && keyBindings.size() > 0) { IKeySequenceBinding keySequenceBinding = (IKeySequenceBinding)keyBindings.get(0); - label.setText(MessageFormat.format(DebugUIMessages.PopupInformationControl_1, new String[] {keySequenceBinding.getKeySequence().format(), labelText})); //$NON-NLS-1$ + label.setText(MessageFormat.format(DebugUIMessages.PopupInformationControl_1, new String[] {keySequenceBinding.getKeySequence().format(), labelText})); label.getParent().layout(); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java index 79e5d31d8..a3fafdb48 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java @@ -160,7 +160,7 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect * Constructs a new source lookup job. */ public SourceLookupJob() { - super(DebugUIViewsMessages.LaunchView_0); //$NON-NLS-1$ + super(DebugUIViewsMessages.LaunchView_0); setPriority(Job.INTERACTIVE); setSystem(true); } @@ -194,7 +194,7 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect * Constructs a new source display job */ public SourceDisplayJob() { - super(DebugUIViewsMessages.LaunchView_1); //$NON-NLS-1$ + super(DebugUIViewsMessages.LaunchView_1); setSystem(true); setPriority(Job.INTERACTIVE); } @@ -337,11 +337,11 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect } if (itemsToTerminate) { // Prompt the user to proceed with termination - if (!MessageDialog.openQuestion(getSite().getShell(), DebugUIViewsMessages.LaunchView_Terminate_and_Remove_1, DebugUIViewsMessages.LaunchView_Terminate_and_remove_selected__2)) { //$NON-NLS-1$ //$NON-NLS-2$ + if (!MessageDialog.openQuestion(getSite().getShell(), DebugUIViewsMessages.LaunchView_Terminate_and_Remove_1, DebugUIViewsMessages.LaunchView_Terminate_and_remove_selected__2)) { // return; } } - MultiStatus status= new MultiStatus(DebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, DebugUIViewsMessages.LaunchView_Exceptions_occurred_attempting_to_terminate_and_remove_3, null); //$NON-NLS-1$ + MultiStatus status= new MultiStatus(DebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, DebugUIViewsMessages.LaunchView_Exceptions_occurred_attempting_to_terminate_and_remove_3, null); iter= selection.iterator(); while (iter.hasNext()) { try { @@ -353,7 +353,7 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect if (!status.isOK()) { IWorkbenchWindow window= DebugUIPlugin.getActiveWorkbenchWindow(); if (window != null) { - DebugUIPlugin.errorDialog(window.getShell(), DebugUIViewsMessages.LaunchView_Terminate_and_Remove_4, DebugUIViewsMessages.LaunchView_Terminate_and_remove_failed_5, status); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(window.getShell(), DebugUIViewsMessages.LaunchView_Terminate_and_Remove_4, DebugUIViewsMessages.LaunchView_Terminate_and_remove_failed_5, status); // } else { DebugUIPlugin.log(status); } @@ -410,7 +410,7 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect tv.expandToLevel(2); final Object[] elements = tv.getExpandedElements(); // traverse debug model in non UI thread - Job initJob = new Job(DebugUIViewsMessages.LaunchView_2) { //$NON-NLS-1$ + Job initJob = new Job(DebugUIViewsMessages.LaunchView_2) { /* (non-Javadoc) * @see org.eclipse.core.internal.jobs.InternalJob#run(org.eclipse.core.runtime.IProgressMonitor) */ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java index 450e386b2..44409dd58 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/SourceNotFoundEditorInput.java @@ -74,7 +74,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor try { return fFrame.getName(); } catch (DebugException e) { - return DebugUIViewsMessages.SourceNotFoundEditorInput_Source_Not_Found_1; //$NON-NLS-1$ + return DebugUIViewsMessages.SourceNotFoundEditorInput_Source_Not_Found_1; } } @@ -89,7 +89,7 @@ public class SourceNotFoundEditorInput extends PlatformObject implements IEditor * @see org.eclipse.ui.IEditorInput#getToolTipText() */ public String getToolTipText() { - return MessageFormat.format(DebugUIViewsMessages.SourceNotFoundEditorInput_Source_not_found_for__0__2,new String[] {fFrameText}); //$NON-NLS-1$ + return MessageFormat.format(DebugUIViewsMessages.SourceNotFoundEditorInput_Source_not_found_for__0__2,new String[] {fFrameText}); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java index 2372f1591..25d1cb225 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java @@ -234,7 +234,7 @@ public class AddMemoryBlockAction extends Action implements ISelectionListener, if (length <= 0) { String message = DebugUIMessages.AddMemoryBlockAction_failed + "\n" + DebugUIMessages.AddMemoryBlockAction_input_invalid; //$NON-NLS-1$ - MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, message, null); //$NON-NLS-1$ + MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, message, null); exit = false; continue; } @@ -277,7 +277,7 @@ public class AddMemoryBlockAction extends Action implements ISelectionListener, catch(NumberFormatException e2) { String message = DebugUIMessages.AddMemoryBlockAction_failed + "\n" + DebugUIMessages.AddMemoryBlockAction_input_invalid; //$NON-NLS-1$ - MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, message, null); //$NON-NLS-1$ + MemoryViewUtil.openError(DebugUIMessages.AddMemoryBlockAction_title, message, null); exit = false; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java index 5560a1d63..bdcd197ff 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java @@ -34,8 +34,8 @@ public class AddMemoryRenderingAction extends AddMemoryBlockAction { public AddMemoryRenderingAction(IMemoryRenderingContainer container) { - super(DebugUIMessages.AddMemoryRenderingAction_Add_renderings, AS_PUSH_BUTTON, container.getMemoryRenderingSite()); //$NON-NLS-1$ - setToolTipText(DebugUIMessages.AddMemoryRenderingAction_Add_renderings); //$NON-NLS-1$ + super(DebugUIMessages.AddMemoryRenderingAction_Add_renderings, AS_PUSH_BUTTON, container.getMemoryRenderingSite()); + setToolTipText(DebugUIMessages.AddMemoryRenderingAction_Add_renderings); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, DebugUIPlugin.getUniqueIdentifier() + ".AddRenderingContextAction_context"); //$NON-NLS-1$ fContainer = container; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java index a7a7a5b46..677fb8860 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java @@ -219,7 +219,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog { composite.setLayoutData(comositeSpec); Label textLabel = new Label(composite, SWT.NONE); - textLabel.setText(DebugUIMessages.AddMemoryRenderingDialog_Memory_Monitor); //$NON-NLS-1$ + textLabel.setText(DebugUIMessages.AddMemoryRenderingDialog_Memory_Monitor); GridData textLayout = new GridData(); textLayout.verticalAlignment=GridData.CENTER; textLayout.horizontalAlignment=GridData.BEGINNING; @@ -241,7 +241,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog { filler.setLayoutData(fillerData); addNew = new Button(composite, SWT.NONE); - addNew.setText(DebugUIMessages.AddMemoryRenderingDialog_Add_New); //$NON-NLS-1$ + addNew.setText(DebugUIMessages.AddMemoryRenderingDialog_Add_New); GridData specButton= new GridData(); specButton.horizontalAlignment= GridData.END; specButton.verticalAlignment= GridData.CENTER; @@ -279,7 +279,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog { memoryBlock.addSelectionListener(fSelectionListener); Label renderingLabel = new Label(composite, SWT.NONE); - renderingLabel.setText(DebugUIMessages.AddMemoryRenderingDialog_Memory_renderings); //$NON-NLS-1$ + renderingLabel.setText(DebugUIMessages.AddMemoryRenderingDialog_Memory_renderings); GridData renderingLayout = new GridData(); renderingLayout.horizontalAlignment = GridData.BEGINNING; renderingLayout.verticalAlignment = GridData.CENTER; @@ -324,7 +324,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog { public AddMemoryRenderingDialog(Shell parent, IMemoryRenderingSite site) { super(parent); - super.setTitle(DebugUIMessages.AddMemoryRenderingDialog_Add_memory_rendering); //$NON-NLS-1$ + super.setTitle(DebugUIMessages.AddMemoryRenderingDialog_Add_memory_rendering); PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, DebugUIPlugin.getUniqueIdentifier() + ".AddMemoryRenderingDialog_context"); //$NON-NLS-1$ setShellStyle(getShellStyle() | SWT.RESIZE); fSite = site; @@ -348,7 +348,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog { if (selectionProvider != null) selection = selectionProvider.getSelection(); else // otherwise, take selection from selection service - selection = DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(IInternalDebugUIConstants.ID_MEMORY_VIEW); //$NON-NLS-1$ + selection = DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(IInternalDebugUIConstants.ID_MEMORY_VIEW); IDebugElement element = getMemoryBlock(selection); @@ -375,7 +375,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog { if (blocks.length <= 0) { - combo.add(DebugUIMessages.AddMemoryRenderingDialog_Add_New); //$NON-NLS-1$ + combo.add(DebugUIMessages.AddMemoryRenderingDialog_Add_New); combo.select(0); return; } @@ -399,7 +399,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog { text = ((IMemoryBlockExtension)fMemoryBlocks[i]).getExpression(); if (text == null) - text = DebugUIMessages.AddMemoryRenderingDialog_Unknown; //$NON-NLS-1$ + text = DebugUIMessages.AddMemoryRenderingDialog_Unknown; if (((IMemoryBlockExtension)fMemoryBlocks[i]).getBigBaseAddress() != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CodePagesPrefDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CodePagesPrefDialog.java index f94c32b75..1dec7403e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CodePagesPrefDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CodePagesPrefDialog.java @@ -58,7 +58,7 @@ public class CodePagesPrefDialog extends Dialog { */ protected Control createDialogArea(Composite parent) { - getShell().setText(DebugUIMessages.CodePagesPrefDialog_1); //$NON-NLS-1$ + getShell().setText(DebugUIMessages.CodePagesPrefDialog_1); setShellStyle(SWT.RESIZE); Composite canvas = new Composite(parent, SWT.NONE); @@ -71,7 +71,7 @@ public class CodePagesPrefDialog extends Dialog { canvas.setLayoutData(spec2); Label textLabel = new Label(canvas, SWT.WRAP); - textLabel.setText(DebugUIMessages.CodePagesPrefDialog_2); //$NON-NLS-1$ + textLabel.setText(DebugUIMessages.CodePagesPrefDialog_2); GridData textLayout = new GridData(); textLayout.widthHint = 280; textLayout.horizontalSpan = 2; @@ -88,11 +88,11 @@ public class CodePagesPrefDialog extends Dialog { String codepage = DebugUITools.getPreferenceStore().getString(IDebugUIConstants.PREF_DEFAULT_ASCII_CODE_PAGE); if (codepage == null || codepage.length() == 0) - codepage = IDebugPreferenceConstants.DEFAULT_ASCII_CP; //$NON-NLS-1$ + codepage = IDebugPreferenceConstants.DEFAULT_ASCII_CP; fAsciiCodePage.setText(codepage); Label ebcdicLabel = new Label(canvas, SWT.WRAP); - ebcdicLabel.setText(DebugUIMessages.CodePagesPrefDialog_4); //$NON-NLS-1$ + ebcdicLabel.setText(DebugUIMessages.CodePagesPrefDialog_4); GridData ebcdicLayout = new GridData(); ebcdicLayout.widthHint = 280; ebcdicLayout.horizontalSpan = 2; @@ -112,7 +112,7 @@ public class CodePagesPrefDialog extends Dialog { fEbcdicCodePage.setText(codepage); if (codepage == null || codepage.length() == 0) - codepage = IDebugPreferenceConstants.DEFAULT_EBCDIC_CP; //$NON-NLS-1$ + codepage = IDebugPreferenceConstants.DEFAULT_EBCDIC_CP; // return canvas; } @@ -127,8 +127,8 @@ public class CodePagesPrefDialog extends Dialog { Shell shell = DebugUIPlugin.getShell(); if (shell != null) { - IStatus status = DebugUIPlugin.newErrorStatus(DebugUIMessages.CodePagesPrefDialog_0, e); //$NON-NLS-1$ - ErrorDialog.openError(shell, DebugUIMessages.CodePagesPrefDialog_6, DebugUIMessages.CodePagesPrefDialog_7, status); //$NON-NLS-1$ //$NON-NLS-2$ + IStatus status = DebugUIPlugin.newErrorStatus(DebugUIMessages.CodePagesPrefDialog_0, e); + ErrorDialog.openError(shell, DebugUIMessages.CodePagesPrefDialog_6, DebugUIMessages.CodePagesPrefDialog_7, status); // } return; } @@ -141,8 +141,8 @@ public class CodePagesPrefDialog extends Dialog { Shell shell = DebugUIPlugin.getShell(); if (shell != null) { - IStatus status = DebugUIPlugin.newErrorStatus(DebugUIMessages.CodePagesPrefDialog_0, e); //$NON-NLS-1$ - ErrorDialog.openError(shell, DebugUIMessages.CodePagesPrefDialog_8, DebugUIMessages.CodePagesPrefDialog_9, status); //$NON-NLS-1$ //$NON-NLS-2$ + IStatus status = DebugUIPlugin.newErrorStatus(DebugUIMessages.CodePagesPrefDialog_0, e); + ErrorDialog.openError(shell, DebugUIMessages.CodePagesPrefDialog_8, DebugUIMessages.CodePagesPrefDialog_9, status); // } return; } @@ -159,7 +159,7 @@ public class CodePagesPrefDialog extends Dialog { */ protected void createButtonsForButtonBar(Composite parent) { - Button defaultButton = createButton(parent, 3, DebugUIMessages.CodePagesPrefDialog_13, false); //$NON-NLS-1$ + Button defaultButton = createButton(parent, 3, DebugUIMessages.CodePagesPrefDialog_13, false); defaultButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java index cfe8999a0..f7e743da7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java @@ -85,9 +85,9 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, IMemoryView TreeViewerRemoveMemoryBlocksAction() { super(); - setText(DebugUIMessages.RemoveMemoryBlockAction_title); //$NON-NLS-1$ + setText(DebugUIMessages.RemoveMemoryBlockAction_title); - setToolTipText(DebugUIMessages.RemoveMemoryBlockAction_tooltip); //$NON-NLS-1$ + setToolTipText(DebugUIMessages.RemoveMemoryBlockAction_tooltip); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_MEMORY)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_REMOVE_MEMORY)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_MEMORY)); @@ -116,9 +116,9 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, IMemoryView TreeViewerRemoveAllMemoryBlocksAction() { super(); - setText(DebugUIMessages.MemoryBlocksTreeViewPane_2); //$NON-NLS-1$ + setText(DebugUIMessages.MemoryBlocksTreeViewPane_2); - setToolTipText(DebugUIMessages.MemoryBlocksTreeViewPane_2); //$NON-NLS-1$ + setToolTipText(DebugUIMessages.MemoryBlocksTreeViewPane_2); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL)); @@ -134,7 +134,7 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, IMemoryView if (window == null) { return; } - boolean proceed = MessageDialog.openQuestion(window.getShell(), DebugUIMessages.MemoryBlocksTreeViewPane_0, DebugUIMessages.MemoryBlocksTreeViewPane_1); //$NON-NLS-1$ //$NON-NLS-2$ + boolean proceed = MessageDialog.openQuestion(window.getShell(), DebugUIMessages.MemoryBlocksTreeViewPane_0, DebugUIMessages.MemoryBlocksTreeViewPane_1); // if (proceed) { IMemoryBlock[] memBlocks; @@ -478,7 +478,7 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, IMemoryView */ private void populateViewPane() { - ISelection selected = fParent.getSite().getPage().getSelection(IDebugUIConstants.ID_DEBUG_VIEW); //$NON-NLS-1$ + ISelection selected = fParent.getSite().getPage().getSelection(IDebugUIConstants.ID_DEBUG_VIEW); if (selected instanceof IStructuredSelection) { Object obj = ((IStructuredSelection)selected).getFirstElement(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java index f4447da53..672fa67d0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java @@ -334,7 +334,7 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite { fMemBlkViewer.addSelectionListener(fSelectionProvider); - Control viewerControl = fMemBlkViewer.createViewPane(viewerViewForm, MemoryBlocksTreeViewPane.PANE_ID, DebugUIMessages.MemoryView_Memory_monitors); //$NON-NLS-1$ + Control viewerControl = fMemBlkViewer.createViewPane(viewerViewForm, MemoryBlocksTreeViewPane.PANE_ID, DebugUIMessages.MemoryView_Memory_monitors); viewerViewForm.setContent(viewerControl); ISelection selection = fMemBlkViewer.getSelectionProvider().getSelection(); @@ -351,7 +351,7 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite { viewerViewForm.setTopRight(viewerToolbar); Label viewerLabel = new Label(viewerViewForm, SWT.WRAP); - viewerLabel.setText(DebugUIMessages.MemoryView_Memory_monitors); //$NON-NLS-1$ + viewerLabel.setText(DebugUIMessages.MemoryView_Memory_monitors); viewerViewForm.setTopLeft(viewerLabel); } @@ -359,13 +359,13 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite { * */ public void createRenderingViewPane(String paneId) { - RenderingViewPane renderingPane = new RenderingViewPane(this); //$NON-NLS-1$ + RenderingViewPane renderingPane = new RenderingViewPane(this); fViewPanes.put(paneId, renderingPane); ViewForm renderingViewForm = new ViewForm(fSashForm, SWT.FLAT); fViewPaneControls.put(paneId, renderingViewForm); fWeights.add(new Integer(40)); - Control renderingControl = renderingPane.createViewPane(renderingViewForm, paneId, DebugUIMessages.MemoryView_Memory_renderings); //$NON-NLS-1$ + Control renderingControl = renderingPane.createViewPane(renderingViewForm, paneId, DebugUIMessages.MemoryView_Memory_renderings); renderingViewForm.setContent(renderingControl); renderingPane.addSelectionListener(fSelectionProvider); @@ -526,7 +526,7 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite { } } - prefs.setValue(getVisibilityPrefId(), visibleViewPanes.toString()); //$NON-NLS-1$ + prefs.setValue(getVisibilityPrefId(), visibleViewPanes.toString()); } private void loadViewPanesVisibility() diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java index 17d51ae4e..0b5618cba 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java @@ -35,10 +35,10 @@ public class RemoveMemoryRenderingAction extends Action public RemoveMemoryRenderingAction(IMemoryRenderingContainer viewPane) { // create action as drop down - super(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering, AS_PUSH_BUTTON); //$NON-NLS-1$ - setText(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering); //$NON-NLS-1$ + super(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering, AS_PUSH_BUTTON); + setText(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering); - setToolTipText(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering); //$NON-NLS-1$ + setToolTipText(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_MEMORY)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_REMOVE_MEMORY)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_MEMORY)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java index 83e623708..2f8826369 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java @@ -162,14 +162,14 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR String memoryBlockLabel = " "; //$NON-NLS-1$ memoryBlockLabel = getLabel(); - fMemoryBlockLabel.setText(" " + DebugUIMessages.CreateRenderingTab_Memory_monitor + memoryBlockLabel + " "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + fMemoryBlockLabel.setText(" " + DebugUIMessages.CreateRenderingTab_Memory_monitor + memoryBlockLabel + " "); //$NON-NLS-1$ //$NON-NLS-2$ GridData textLayout = new GridData(); textLayout.verticalAlignment=GridData.CENTER; textLayout.horizontalAlignment=GridData.BEGINNING; fMemoryBlockLabel.setLayoutData(textLayout); Label renderingLabel = new Label(fCanvas, SWT.NONE); - renderingLabel.setText(DebugUIMessages.CreateRenderingTab_Select_renderings_to_create); //$NON-NLS-1$ + renderingLabel.setText(DebugUIMessages.CreateRenderingTab_Select_renderings_to_create); GridData renderingLayout = new GridData(); renderingLayout.horizontalAlignment = GridData.BEGINNING; renderingLayout.verticalAlignment = GridData.CENTER; @@ -197,7 +197,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR }}); Button addButton = new Button(fCanvas, SWT.NONE); - addButton.setText(DebugUIMessages.CreateRenderingTab_Add_renderings); //$NON-NLS-1$ + addButton.setText(DebugUIMessages.CreateRenderingTab_Add_renderings); GridData buttonLayout = new GridData(); buttonLayout.horizontalAlignment = GridData.BEGINNING; buttonLayout.verticalAlignment = GridData.BEGINNING; @@ -234,8 +234,8 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR { Status stat = new Status( IStatus.ERROR,DebugUIPlugin.getUniqueIdentifier(), - DebugException.INTERNAL_ERROR, DebugUIMessages.CreateRenderingTab_0, null); //$NON-NLS-1$ - DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), DebugUIMessages.CreateRenderingTab_1, DebugUIMessages.CreateRenderingTab_2, stat); //$NON-NLS-1$ //$NON-NLS-2$ + DebugException.INTERNAL_ERROR, DebugUIMessages.CreateRenderingTab_0, null); + DebugUIPlugin.errorDialog(DebugUIPlugin.getShell(), DebugUIMessages.CreateRenderingTab_1, DebugUIMessages.CreateRenderingTab_2, stat); // return; } @@ -268,7 +268,7 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR } } catch (CoreException e) { - MemoryViewUtil.openError(DebugUIMessages.CreateRendering_0, DebugUIMessages.CreateRendering_1, e); //$NON-NLS-1$ //$NON-NLS-2$ + MemoryViewUtil.openError(DebugUIMessages.CreateRendering_0, DebugUIMessages.CreateRendering_1, e); // } } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java index a462dafb4..36743b9cd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java @@ -53,7 +53,7 @@ public class ErrorRendering extends AbstractMemoryRendering { fTextViewer.setDocument(new Document()); StyledText styleText = fTextViewer.getTextWidget(); - styleText.setText("\r\n\r\n" + DebugUIMessages.EmptyViewTab_Unable_to_create + "\n" + getRenderingName() + "\n\n" + DebugUIMessages.ErrorRendering_0 + fException.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + styleText.setText("\r\n\r\n" + DebugUIMessages.EmptyViewTab_Unable_to_create + "\n" + getRenderingName() + "\n\n" + DebugUIMessages.ErrorRendering_0 + fException.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return fTextViewer.getControl(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SetPaddedStringDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SetPaddedStringDialog.java index 212b4f9fd..a092c4ee6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SetPaddedStringDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SetPaddedStringDialog.java @@ -44,7 +44,7 @@ public class SetPaddedStringDialog extends Dialog { protected Control createDialogArea(Composite parent) { PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IDebugUIConstants.PLUGIN_ID + ".SetPaddedStrDialog_context"); //$NON-NLS-1$ - getShell().setText(DebugUIMessages.SetPaddedStringDialog_0); //$NON-NLS-1$ + getShell().setText(DebugUIMessages.SetPaddedStringDialog_0); Composite content = (Composite) super.createDialogArea(parent); GridLayout layout = new GridLayout(); @@ -55,7 +55,7 @@ public class SetPaddedStringDialog extends Dialog { content.setLayoutData(contentData); Label textLabel = new Label(content, SWT.NONE); - textLabel.setText(DebugUIMessages.SetPaddedStringDialog_1); //$NON-NLS-1$ + textLabel.setText(DebugUIMessages.SetPaddedStringDialog_1); GridData textLayout = new GridData(); textLabel.setLayoutData(textLayout); @@ -73,7 +73,7 @@ public class SetPaddedStringDialog extends Dialog { if (str == null || str.length() == 0) { - MemoryViewUtil.openError(DebugUIMessages.SetPaddedStringDialog_3, DebugUIMessages.SetPaddedStringDialog_4, null); //$NON-NLS-1$ //$NON-NLS-2$ + MemoryViewUtil.openError(DebugUIMessages.SetPaddedStringDialog_3, DebugUIMessages.SetPaddedStringDialog_4, null); // return; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java index b9c6a24b4..e11673e54 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java @@ -64,7 +64,7 @@ public class RegistersView extends VariablesView { * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getToggleActionLabel() */ protected String getToggleActionLabel() { - return RegistersViewMessages.RegistersView_0; //$NON-NLS-1$ + return RegistersViewMessages.RegistersView_0; } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java index 5bfbacda6..704b9b795 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java @@ -39,8 +39,8 @@ public class AvailableLogicalStructuresAction extends Action implements IMenuCre public AvailableLogicalStructuresAction(VariablesView view) { setView(view); - setToolTipText(VariablesViewMessages.AvailableLogicalStructuresAction_0); //$NON-NLS-1$ - setText(VariablesViewMessages.AvailableLogicalStructuresAction_1); //$NON-NLS-1$ + setToolTipText(VariablesViewMessages.AvailableLogicalStructuresAction_0); + setText(VariablesViewMessages.AvailableLogicalStructuresAction_1); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.VARIABLES_SELECT_LOGICAL_STRUCTURE); setEnabled(false); setMenuCreator(this); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java index 7e7f988a6..43bfb33ad 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java @@ -126,14 +126,14 @@ public class IndexedVariablePartition implements IVariable { * @see org.eclipse.debug.core.model.IValueModification#setValue(java.lang.String) */ public void setValue(String expression) throws DebugException { - throw new DebugException(new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR, VariablesViewMessages.IndexedVariablePartition_4, null)); //$NON-NLS-1$ + throw new DebugException(new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR, VariablesViewMessages.IndexedVariablePartition_4, null)); } /* (non-Javadoc) * @see org.eclipse.debug.core.model.IValueModification#setValue(org.eclipse.debug.core.model.IValue) */ public void setValue(IValue value) throws DebugException { - throw new DebugException(new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR, VariablesViewMessages.IndexedVariablePartition_4, null)); //$NON-NLS-1$ + throw new DebugException(new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR, VariablesViewMessages.IndexedVariablePartition_4, null)); } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java index e899fc227..47d631c61 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java @@ -32,7 +32,7 @@ public class ToggleLogicalStructureAction extends Action { public ToggleLogicalStructureAction(VariablesView view) { super(null, IAction.AS_CHECK_BOX); setView(view); - setToolTipText(VariablesViewMessages.ToggleObjectBrowsersAction_1); //$NON-NLS-1$ + setToolTipText(VariablesViewMessages.ToggleObjectBrowsersAction_1); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_SHOW_LOGICAL_STRUCTURE)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_SHOW_LOGICAL_STRUCTURE)); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SHOW_LOGICAL_STRUCTURE)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java index 25782d760..bf7fe1214 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java @@ -337,7 +337,7 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel } } /** The pattern used to show the position label in the status line. */ - private final String fPositionLabelPattern= VariablesViewMessages.VariablesView_56; //$NON-NLS-1$ + private final String fPositionLabelPattern= VariablesViewMessages.VariablesView_56; /** The position label value of the current line. */ private final PositionLabelValue fLineLabel= new PositionLabelValue(); /** The position label value of the current column. */ @@ -504,7 +504,7 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel try { svc = mp.newDetailsViewerConfiguration(); } catch (CoreException e) { - DebugUIPlugin.errorDialog(getSite().getShell(), VariablesViewMessages.VariablesView_Error_1, VariablesViewMessages.VariablesView_Unable_to_configure_variable_details_area__2, e); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(getSite().getShell(), VariablesViewMessages.VariablesView_Error_1, VariablesViewMessages.VariablesView_Unable_to_configure_variable_details_area__2, e); // } } ISourceViewer detailViewer = getDetailViewer(); @@ -804,7 +804,7 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel * <code>targetID</code> in the extension XML. */ protected void createDetailContextMenu(Control menuControl) { - MenuManager menuMgr= new MenuManager(); //$NON-NLS-1$ + MenuManager menuMgr= new MenuManager(); menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager mgr) { @@ -838,7 +838,7 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel TextViewerAction textAction= new TextViewerAction(getDetailViewer(), ISourceViewer.CONTENTASSIST_PROPOSALS); textAction.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS); - textAction.configureAction(VariablesViewMessages.VariablesView_Co_ntent_Assist_3, "",""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + textAction.configureAction(VariablesViewMessages.VariablesView_Co_ntent_Assist_3, "",""); //$NON-NLS-1$ //$NON-NLS-2$ textAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_ELCL_CONTENT_ASSIST)); textAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_CONTENT_ASSIST)); textAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_DLCL_CONTENT_ASSIST)); @@ -846,22 +846,22 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel getSite().getKeyBindingService().registerAction(textAction); textAction= new TextViewerAction(getDetailViewer(), ITextOperationTarget.SELECT_ALL); - textAction.configureAction(VariablesViewMessages.VariablesView_Select__All_5, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + textAction.configureAction(VariablesViewMessages.VariablesView_Select__All_5, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.SELECT_ALL); setAction(DETAIL_SELECT_ALL_ACTION, textAction); textAction= new TextViewerAction(getDetailViewer(), ITextOperationTarget.COPY); - textAction.configureAction(VariablesViewMessages.VariablesView__Copy_8, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + textAction.configureAction(VariablesViewMessages.VariablesView__Copy_8, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.COPY); setAction(DETAIL_COPY_ACTION, textAction); textAction= new TextViewerAction(getDetailViewer(), ITextOperationTarget.CUT); - textAction.configureAction(VariablesViewMessages.VariablesView_Cu_t_11, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + textAction.configureAction(VariablesViewMessages.VariablesView_Cu_t_11, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.CUT); setAction(ActionFactory.CUT.getId(), textAction); textAction= new TextViewerAction(getDetailViewer(), ITextOperationTarget.PASTE); - textAction.configureAction(VariablesViewMessages.VariablesView__Paste_14, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + textAction.configureAction(VariablesViewMessages.VariablesView__Paste_14, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.PASTE); setAction(ActionFactory.PASTE.getId(), textAction); @@ -917,7 +917,7 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel } protected String getToggleActionLabel() { - return VariablesViewMessages.VariablesView_41; //$NON-NLS-1$ + return VariablesViewMessages.VariablesView_41; } /** @@ -1088,7 +1088,7 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel } catch (DebugException de) { DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() { public void run() { - getDetailDocument().set(VariablesViewMessages.VariablesView__error_occurred_retrieving_value__18); //$NON-NLS-1$ + getDetailDocument().set(VariablesViewMessages.VariablesView__error_occurred_retrieving_value__18); } }); } @@ -1135,7 +1135,7 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel getModelPresentation().computeDetail(val, VariablesView.this); } catch (DebugException e) { DebugUIPlugin.log(e); - getDetailDocument().set(VariablesViewMessages.VariablesView__error_occurred_retrieving_value__18); //$NON-NLS-1$ + getDetailDocument().set(VariablesViewMessages.VariablesView__error_occurred_retrieving_value__18); // } } else { fValueSelection = null; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewer.java index 2f4892fe2..2ba972ccf 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewer.java @@ -37,7 +37,7 @@ import org.eclipse.ui.progress.UIJob; public class VariablesViewer extends RemoteTreeViewer { private ArrayList fUpdateListeners = new ArrayList(); - private StateRestorationJob fStateRestorationJob = new StateRestorationJob(DebugUIViewsMessages.RemoteTreeViewer_0); //$NON-NLS-1$ + private StateRestorationJob fStateRestorationJob = new StateRestorationJob(DebugUIViewsMessages.RemoteTreeViewer_0); private VariablesView fView = null; private class StateRestorationJob extends UIJob { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java index 5d0bd246b..abb3a00ce 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java @@ -140,16 +140,16 @@ public class CommonTab extends AbstractLaunchConfigurationTab { GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; group.setLayoutData(gd); - group.setText(LaunchConfigurationsMessages.CommonTab_0); //$NON-NLS-1$ + group.setText(LaunchConfigurationsMessages.CommonTab_0); group.setFont(comp.getFont()); setLocalRadioButton(new Button(group, SWT.RADIO)); - getLocalRadioButton().setText(LaunchConfigurationsMessages.CommonTab_L_ocal_3); //$NON-NLS-1$ + getLocalRadioButton().setText(LaunchConfigurationsMessages.CommonTab_L_ocal_3); gd = new GridData(); gd.horizontalSpan = 3; getLocalRadioButton().setLayoutData(gd); setSharedRadioButton(new Button(group, SWT.RADIO)); - getSharedRadioButton().setText(LaunchConfigurationsMessages.CommonTab_S_hared_4); //$NON-NLS-1$ + getSharedRadioButton().setText(LaunchConfigurationsMessages.CommonTab_S_hared_4); getSharedRadioButton().addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { handleSharedRadioButtonSelected(); @@ -163,7 +163,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { getSharedLocationText().setLayoutData(gd); getSharedLocationText().addModifyListener(fBasicModifyListener); - setSharedLocationButton(createPushButton(group, LaunchConfigurationsMessages.CommonTab__Browse_6, null)); //$NON-NLS-1$ + setSharedLocationButton(createPushButton(group, LaunchConfigurationsMessages.CommonTab__Browse_6, null)); getSharedLocationButton().addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { handleSharedLocationButtonSelected(); @@ -179,7 +179,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { GridLayout favLayout = new GridLayout(); favComp.setLayout(favLayout); - favComp.setText(LaunchConfigurationsMessages.CommonTab_Display_in_favorites_menu__10); //$NON-NLS-1$ + favComp.setText(LaunchConfigurationsMessages.CommonTab_Display_in_favorites_menu__10); favComp.setFont(parent.getFont()); fFavoritesTable = CheckboxTableViewer.newCheckList(favComp, SWT.CHECK | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION); @@ -208,7 +208,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { private void createOutputCaptureComponent(Composite parent) { Group group = new Group(parent, SWT.NONE); - group.setText(LaunchConfigurationsMessages.CommonTab_4); //$NON-NLS-1$ + group.setText(LaunchConfigurationsMessages.CommonTab_4); GridData gd = new GridData(SWT.FILL, SWT.NONE, true, false); gd.horizontalSpan = 2; group.setLayoutData(gd); @@ -216,7 +216,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { group.setLayout(layout); group.setFont(parent.getFont()); - fConsoleOutput = createCheckButton(group, LaunchConfigurationsMessages.CommonTab_5); //$NON-NLS-1$ + fConsoleOutput = createCheckButton(group, LaunchConfigurationsMessages.CommonTab_5); gd = new GridData(SWT.BEGINNING, SWT.NORMAL, true, false); gd.horizontalSpan = 5; fConsoleOutput.setLayoutData(gd); @@ -227,7 +227,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { } }); - fFileOutput = createCheckButton(group, LaunchConfigurationsMessages.CommonTab_6); //$NON-NLS-1$ + fFileOutput = createCheckButton(group, LaunchConfigurationsMessages.CommonTab_6); fFileOutput.setLayoutData(new GridData(SWT.BEGINNING, SWT.NORMAL, false, false)); fFileText = new Text(group, SWT.SINGLE | SWT.BORDER); @@ -239,13 +239,13 @@ public class CommonTab extends AbstractLaunchConfigurationTab { gd = new GridData(SWT.FILL, SWT.NORMAL, true, false); gd.horizontalSpan=2; spacer.setLayoutData(gd); - fWorkspaceBrowse = createPushButton(group, LaunchConfigurationsMessages.CommonTab_12, null); //$NON-NLS-1$ - fFileBrowse = createPushButton(group, LaunchConfigurationsMessages.CommonTab_7, null); //$NON-NLS-1$ - fVariables = createPushButton(group, LaunchConfigurationsMessages.CommonTab_9, null); //$NON-NLS-1$ + fWorkspaceBrowse = createPushButton(group, LaunchConfigurationsMessages.CommonTab_12, null); + fFileBrowse = createPushButton(group, LaunchConfigurationsMessages.CommonTab_7, null); + fVariables = createPushButton(group, LaunchConfigurationsMessages.CommonTab_9, null); spacer = new Label(group,SWT.NONE); spacer.setLayoutData(new GridData(SWT.FILL, SWT.NORMAL, false, false)); - fAppend = createCheckButton(group, LaunchConfigurationsMessages.CommonTab_11); //$NON-NLS-1$ + fAppend = createCheckButton(group, LaunchConfigurationsMessages.CommonTab_11); gd = new GridData(SWT.LEFT, SWT.TOP, true, false); gd.horizontalSpan = 4; fAppend.setLayoutData(gd); @@ -271,8 +271,8 @@ public class CommonTab extends AbstractLaunchConfigurationTab { fWorkspaceBrowse.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider()); - dialog.setTitle(LaunchConfigurationsMessages.CommonTab_13); //$NON-NLS-1$ - dialog.setMessage(LaunchConfigurationsMessages.CommonTab_14); //$NON-NLS-1$ + dialog.setTitle(LaunchConfigurationsMessages.CommonTab_13); + dialog.setMessage(LaunchConfigurationsMessages.CommonTab_14); dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); dialog.setSorter(new ResourceSorter(ResourceSorter.NAME)); int buttonId = dialog.open(); @@ -322,19 +322,19 @@ public class CommonTab extends AbstractLaunchConfigurationTab { String defaultEncoding = WorkbenchEncoding.getWorkbenchDefaultEncoding(); Group group = new Group(parent, SWT.NONE); - group.setText(LaunchConfigurationsMessages.CommonTab_1); //$NON-NLS-1$ + group.setText(LaunchConfigurationsMessages.CommonTab_1); GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false); group.setLayoutData(gd); GridLayout layout = new GridLayout(2, false); group.setLayout(layout); group.setFont(parent.getFont()); - fDefaultEncodingButton = createRadioButton(group, MessageFormat.format(LaunchConfigurationsMessages.CommonTab_2, new String[]{defaultEncoding})); //$NON-NLS-1$ + fDefaultEncodingButton = createRadioButton(group, MessageFormat.format(LaunchConfigurationsMessages.CommonTab_2, new String[]{defaultEncoding})); gd = new GridData(SWT.BEGINNING, SWT.NORMAL, true, false); gd.horizontalSpan = 2; fDefaultEncodingButton.setLayoutData(gd); - fAltEncodingButton = createRadioButton(group, LaunchConfigurationsMessages.CommonTab_3); //$NON-NLS-1$ + fAltEncodingButton = createRadioButton(group, LaunchConfigurationsMessages.CommonTab_3); fAltEncodingButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); fEncodingCombo = new Combo(group, SWT.READ_ONLY); @@ -363,7 +363,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { * @param parent the composite to create the controls in */ protected void createLaunchInBackgroundComponent(Composite parent) { - fLaunchInBackgroundButton = createCheckButton(parent, LaunchConfigurationsMessages.CommonTab_10); //$NON-NLS-1$ + fLaunchInBackgroundButton = createCheckButton(parent, LaunchConfigurationsMessages.CommonTab_10); GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); data.horizontalSpan = 2; fLaunchInBackgroundButton.setLayoutData(data); @@ -426,7 +426,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), getWorkspaceRoot(), false, - LaunchConfigurationsMessages.CommonTab_Select_a_location_for_the_launch_configuration_13); //$NON-NLS-1$ + LaunchConfigurationsMessages.CommonTab_Select_a_location_for_the_launch_configuration_13); String currentContainerString = getSharedLocationText().getText(); IContainer currentContainer = getContainer(currentContainerString); @@ -672,7 +672,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { if(fFileOutput.getSelection()) { int len = fFileText.getText().trim().length(); if (len == 0) { - setErrorMessage(LaunchConfigurationsMessages.CommonTab_8); //$NON-NLS-1$ + setErrorMessage(LaunchConfigurationsMessages.CommonTab_8); return false; } } @@ -684,10 +684,10 @@ public class CommonTab extends AbstractLaunchConfigurationTab { String path = fSharedLocationText.getText().trim(); IContainer container = getContainer(path); if (container == null || container.equals(ResourcesPlugin.getWorkspace().getRoot())) { - setErrorMessage(LaunchConfigurationsMessages.CommonTab_Invalid_shared_configuration_location_14); //$NON-NLS-1$ + setErrorMessage(LaunchConfigurationsMessages.CommonTab_Invalid_shared_configuration_location_14); return false; } else if (!container.getProject().isOpen()) { - setErrorMessage(LaunchConfigurationsMessages.CommonTab_Cannot_save_launch_configuration_in_a_closed_project__1); //$NON-NLS-1$ + setErrorMessage(LaunchConfigurationsMessages.CommonTab_Cannot_save_launch_configuration_in_a_closed_project__1); return false; } } @@ -746,7 +746,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ public String getName() { - return LaunchConfigurationsMessages.CommonTab__Common_15; //$NON-NLS-1$ + return LaunchConfigurationsMessages.CommonTab__Common_15; } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/EnvironmentTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/EnvironmentTab.java index f47299bd6..d3504d50b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/EnvironmentTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/EnvironmentTab.java @@ -83,16 +83,16 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { protected TableViewer environmentTable; protected String[] envTableColumnHeaders = { - LaunchConfigurationsMessages.EnvironmentTab_Variable_1, //$NON-NLS-1$ - LaunchConfigurationsMessages.EnvironmentTab_Value_2, //$NON-NLS-1$ + LaunchConfigurationsMessages.EnvironmentTab_Variable_1, + LaunchConfigurationsMessages.EnvironmentTab_Value_2, }; protected ColumnLayoutData[] envTableColumnLayouts = { new ColumnWeightData(50), new ColumnWeightData(50) }; - private static final String NAME_LABEL= LaunchConfigurationsMessages.EnvironmentTab_8; //$NON-NLS-1$ - private static final String VALUE_LABEL= LaunchConfigurationsMessages.EnvironmentTab_9; //$NON-NLS-1$ + private static final String NAME_LABEL= LaunchConfigurationsMessages.EnvironmentTab_8; + private static final String VALUE_LABEL= LaunchConfigurationsMessages.EnvironmentTab_9; protected static final String P_VARIABLE = "variable"; //$NON-NLS-1$ protected static final String P_VALUE = "value"; //$NON-NLS-1$ protected static String[] envTableColumnProperties = @@ -221,13 +221,13 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { appendReplaceComposite.setLayout(layout); appendReplaceComposite.setFont(parent.getFont()); - appendEnvironment= createRadioButton(appendReplaceComposite, LaunchConfigurationsMessages.EnvironmentTab_16); //$NON-NLS-1$ + appendEnvironment= createRadioButton(appendReplaceComposite, LaunchConfigurationsMessages.EnvironmentTab_16); appendEnvironment.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { updateLaunchConfigurationDialog(); } }); - replaceEnvironment= createRadioButton(appendReplaceComposite, LaunchConfigurationsMessages.EnvironmentTab_17); //$NON-NLS-1$ + replaceEnvironment= createRadioButton(appendReplaceComposite, LaunchConfigurationsMessages.EnvironmentTab_17); } /** @@ -261,7 +261,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { // Create label Label label = new Label(tableComposite, SWT.NONE); label.setFont(font); - label.setText(LaunchConfigurationsMessages.EnvironmentTab_Environment_variables_to_set__3); //$NON-NLS-1$ + label.setText(LaunchConfigurationsMessages.EnvironmentTab_Environment_variables_to_set__3); // Create table environmentTable = new TableViewer(tableComposite, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION); Table table = environmentTable.getTable(); @@ -323,20 +323,20 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { createVerticalSpacer(buttonComposite, 1); // Create buttons - envAddButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_New_4, null); //$NON-NLS-1$ + envAddButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_New_4, null); envAddButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { handleEnvAddButtonSelected(); } }); - envSelectButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_18, null); //$NON-NLS-1$ + envSelectButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_18, null); envSelectButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { handleEnvSelectButtonSelected(); } }); - envEditButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_Edit_5, null); //$NON-NLS-1$ + envEditButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_Edit_5, null); envEditButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { @@ -344,7 +344,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { } }); envEditButton.setEnabled(false); - envRemoveButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_Remove_6, null); //$NON-NLS-1$ + envRemoveButton = createPushButton(buttonComposite, LaunchConfigurationsMessages.EnvironmentTab_Remove_6, null); envRemoveButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { @@ -358,7 +358,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { * Adds a new environment variable to the table. */ protected void handleEnvAddButtonSelected() { - MultipleInputDialog dialog = new MultipleInputDialog(getShell(), LaunchConfigurationsMessages.EnvironmentTab_22); //$NON-NLS-1$ + MultipleInputDialog dialog = new MultipleInputDialog(getShell(), LaunchConfigurationsMessages.EnvironmentTab_22); dialog.addTextField(NAME_LABEL, null, false); dialog.addVariablesField(VALUE_LABEL, null, true); @@ -388,7 +388,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { for (int i = 0; i < items.length; i++) { EnvironmentVariable existingVariable = (EnvironmentVariable) items[i].getData(); if (existingVariable.getName().equals(name)) { - boolean overWrite= MessageDialog.openQuestion(getShell(), LaunchConfigurationsMessages.EnvironmentTab_12, MessageFormat.format(LaunchConfigurationsMessages.EnvironmentTab_13, new String[] {name})); //$NON-NLS-1$ //$NON-NLS-2$ + boolean overWrite= MessageDialog.openQuestion(getShell(), LaunchConfigurationsMessages.EnvironmentTab_12, MessageFormat.format(LaunchConfigurationsMessages.EnvironmentTab_13, new String[] {name})); // if (!overWrite) { return false; } @@ -416,8 +416,8 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { envVariables.remove(var.getName()); } - ListSelectionDialog dialog = new NativeEnvironmentDialog(getShell(), envVariables, createSelectionDialogContentProvider(), createSelectionDialogLabelProvider(), LaunchConfigurationsMessages.EnvironmentTab_19); //$NON-NLS-1$ - dialog.setTitle(LaunchConfigurationsMessages.EnvironmentTab_20); //$NON-NLS-1$ + ListSelectionDialog dialog = new NativeEnvironmentDialog(getShell(), envVariables, createSelectionDialogContentProvider(), createSelectionDialogLabelProvider(), LaunchConfigurationsMessages.EnvironmentTab_19); + dialog.setTitle(LaunchConfigurationsMessages.EnvironmentTab_20); int button = dialog.open(); if (button == Window.OK) { @@ -517,7 +517,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { } String originalName= var.getName(); String value= var.getValue(); - MultipleInputDialog dialog= new MultipleInputDialog(getShell(), LaunchConfigurationsMessages.EnvironmentTab_11); //$NON-NLS-1$ + MultipleInputDialog dialog= new MultipleInputDialog(getShell(), LaunchConfigurationsMessages.EnvironmentTab_11); dialog.addTextField(NAME_LABEL, originalName, false); dialog.addVariablesField(VALUE_LABEL, value, true); @@ -613,7 +613,7 @@ public class EnvironmentTab extends AbstractLaunchConfigurationTab { * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ public String getName() { - return LaunchConfigurationsMessages.EnvironmentTab_Environment_7; //$NON-NLS-1$ + return LaunchConfigurationsMessages.EnvironmentTab_Environment_7; } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java index 94b941f5b..02494e969 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/RefreshTab.java @@ -125,7 +125,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { mainComposite.setLayoutData(gd); mainComposite.setFont(parent.getFont()); - fRefreshButton = createCheckButton(mainComposite, StringSubstitutionMessages.RefreshTab_31); //$NON-NLS-1$ + fRefreshButton = createCheckButton(mainComposite, StringSubstitutionMessages.RefreshTab_31); fRefreshButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { updateEnabledState(); @@ -152,37 +152,37 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { } }; - fWorkspaceButton = createRadioButton(fGroup, StringSubstitutionMessages.RefreshTab_32); //$NON-NLS-1$ + fWorkspaceButton = createRadioButton(fGroup, StringSubstitutionMessages.RefreshTab_32); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; fWorkspaceButton.setLayoutData(gd); fWorkspaceButton.addSelectionListener(adapter); - fResourceButton = createRadioButton(fGroup, StringSubstitutionMessages.RefreshTab_33); //$NON-NLS-1$ + fResourceButton = createRadioButton(fGroup, StringSubstitutionMessages.RefreshTab_33); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; fResourceButton.setLayoutData(gd); fResourceButton.addSelectionListener(adapter); - fProjectButton = createRadioButton(fGroup, StringSubstitutionMessages.RefreshTab_34); //$NON-NLS-1$ + fProjectButton = createRadioButton(fGroup, StringSubstitutionMessages.RefreshTab_34); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; fProjectButton.setLayoutData(gd); fProjectButton.addSelectionListener(adapter); - fContainerButton = createRadioButton(fGroup, StringSubstitutionMessages.RefreshTab_35); //$NON-NLS-1$ + fContainerButton = createRadioButton(fGroup, StringSubstitutionMessages.RefreshTab_35); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; fContainerButton.setLayoutData(gd); fContainerButton.addSelectionListener(adapter); - fWorkingSetButton = createRadioButton(fGroup, StringSubstitutionMessages.RefreshTab_36); //$NON-NLS-1$ + fWorkingSetButton = createRadioButton(fGroup, StringSubstitutionMessages.RefreshTab_36); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 1; fWorkingSetButton.setLayoutData(gd); fWorkingSetButton.addSelectionListener(adapter); - fSelectButton = createPushButton(fGroup, StringSubstitutionMessages.RefreshTab_37, null); //$NON-NLS-1$ + fSelectButton = createPushButton(fGroup, StringSubstitutionMessages.RefreshTab_37, null); gd = (GridData)fSelectButton.getLayoutData(); gd.horizontalAlignment = GridData.HORIZONTAL_ALIGN_END; fSelectButton.addSelectionListener(new SelectionAdapter() { @@ -202,7 +202,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { IWorkingSetManager workingSetManager= PlatformUI.getWorkbench().getWorkingSetManager(); if (fWorkingSet == null){ - fWorkingSet = workingSetManager.createWorkingSet(StringSubstitutionMessages.RefreshTab_40, new IAdaptable[0]); //$NON-NLS-1$ + fWorkingSet = workingSetManager.createWorkingSet(StringSubstitutionMessages.RefreshTab_40, new IAdaptable[0]); } IWorkingSetEditWizard wizard= workingSetManager.createWorkingSetEditWizard(fWorkingSet); WizardDialog dialog = new WizardDialog(DebugUIPlugin.getStandardDisplay().getActiveShell(), wizard); @@ -222,7 +222,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { * @param parent the composite to create the controls in */ private void createRecursiveComponent(Composite parent) { - fRecursiveButton = createCheckButton(parent, StringSubstitutionMessages.RefreshTab_0); //$NON-NLS-1$ + fRecursiveButton = createCheckButton(parent, StringSubstitutionMessages.RefreshTab_0); GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); data.horizontalSpan = 2; fRecursiveButton.setLayoutData(data); @@ -281,7 +281,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { try { IResource[] resources = getRefreshResources(scope); IWorkingSetManager workingSetManager= PlatformUI.getWorkbench().getWorkingSetManager(); - fWorkingSet = workingSetManager.createWorkingSet(StringSubstitutionMessages.RefreshTab_40, resources); //$NON-NLS-1$ + fWorkingSet = workingSetManager.createWorkingSet(StringSubstitutionMessages.RefreshTab_40, resources); } catch (CoreException e) { fWorkingSet = null; } @@ -363,7 +363,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ public String getName() { - return StringSubstitutionMessages.RefreshTab_6; //$NON-NLS-1$ + return StringSubstitutionMessages.RefreshTab_6; } /** @@ -395,7 +395,7 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { setErrorMessage(null); setMessage(null); if (fWorkingSetButton.getSelection() && (fWorkingSet == null || fWorkingSet.getElements().length == 0)) { - setErrorMessage(StringSubstitutionMessages.RefreshTab_42); //$NON-NLS-1$ + setErrorMessage(StringSubstitutionMessages.RefreshTab_42); return false; } return true; @@ -428,10 +428,10 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { return; } - monitor.beginTask(StringSubstitutionMessages.RefreshTab_7, //$NON-NLS-1$ + monitor.beginTask(StringSubstitutionMessages.RefreshTab_7, resources.length); - MultiStatus status = new MultiStatus(DebugUIPlugin.getUniqueIdentifier(), 0, StringSubstitutionMessages.RefreshTab_8, null); //$NON-NLS-1$ + MultiStatus status = new MultiStatus(DebugUIPlugin.getUniqueIdentifier(), 0, StringSubstitutionMessages.RefreshTab_8, null); for (int i = 0; i < resources.length; i++) { if (monitor.isCanceled()) break; @@ -465,13 +465,13 @@ public class RefreshTab extends AbstractLaunchConfigurationTab { Path path = new Path(pathString); IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path); if (resource == null) { - throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, MessageFormat.format(StringSubstitutionMessages.RefreshTab_38, new String[]{pathString}), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, MessageFormat.format(StringSubstitutionMessages.RefreshTab_38, new String[]{pathString}), null)); } return new IResource[]{resource}; } else if (scope.startsWith("${working_set:")) { //$NON-NLS-1$ IWorkingSet workingSet = getWorkingSet(scope); if (workingSet == null) { - throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, StringSubstitutionMessages.RefreshTab_39, null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.INTERNAL_ERROR, StringSubstitutionMessages.RefreshTab_39, null)); } IAdaptable[] elements = workingSet.getElements(); IResource[] resources = new IResource[elements.length]; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java index d5d1ecc9f..5b5bdb9be 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java @@ -70,8 +70,8 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { public StringVariableSelectionDialog(Shell parent) { super(parent, new StringVariableLabelProvider()); setShellStyle(getShellStyle() | SWT.RESIZE); - setTitle(StringSubstitutionMessages.StringVariableSelectionDialog_2); //$NON-NLS-1$ - setMessage(StringSubstitutionMessages.StringVariableSelectionDialog_3); //$NON-NLS-1$ + setTitle(StringSubstitutionMessages.StringVariableSelectionDialog_2); + setMessage(StringSubstitutionMessages.StringVariableSelectionDialog_3); setMultipleSelection(false); setElements(VariablesPlugin.getDefault().getStringVariableManager().getVariables()); } @@ -129,7 +129,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { fEditVariablesButton = new Button(container, SWT.PUSH); fEditVariablesButton.setFont(container.getFont()); - fEditVariablesButton.setText(StringSubstitutionMessages.StringVariableSelectionDialog_0); //$NON-NLS-1$ + fEditVariablesButton.setText(StringSubstitutionMessages.StringVariableSelectionDialog_0); gd = new GridData(GridData.HORIZONTAL_ALIGN_END); gd.horizontalSpan = 2; fEditVariablesButton.setLayoutData(gd); @@ -141,7 +141,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { Label desc = new Label(container, SWT.NONE); desc.setFont(parent.getFont()); - desc.setText(StringSubstitutionMessages.StringVariableSelectionDialog_6); //$NON-NLS-1$ + desc.setText(StringSubstitutionMessages.StringVariableSelectionDialog_6); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; desc.setLayoutData(gd); @@ -163,7 +163,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { fArgumentButton = new Button(args, SWT.PUSH); fArgumentButton.setFont(parent.getFont()); - fArgumentButton.setText(StringSubstitutionMessages.StringVariableSelectionDialog_7); //$NON-NLS-1$ + fArgumentButton.setText(StringSubstitutionMessages.StringVariableSelectionDialog_7); gd = new GridData(GridData.HORIZONTAL_ALIGN_END); gd.widthHint = SWTUtil.getButtonWidthHint(fArgumentButton); fArgumentButton.setLayoutData(gd); @@ -176,7 +176,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { desc = new Label(container, SWT.NONE); desc.setFont(parent.getFont()); - desc.setText(StringSubstitutionMessages.StringVariableSelectionDialog_8); //$NON-NLS-1$ + desc.setText(StringSubstitutionMessages.StringVariableSelectionDialog_8); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; desc.setLayoutData(gd); @@ -194,7 +194,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { protected void editVariables() { PreferencePage page = new StringVariablePreferencePage(); - page.setTitle(StringSubstitutionMessages.StringVariableSelectionDialog_1); //$NON-NLS-1$ + page.setTitle(StringSubstitutionMessages.StringVariableSelectionDialog_1); final IPreferenceNode targetNode = new PreferenceNode("org.eclipse.debug.ui.StringVariablePreferencePage", page); //$NON-NLS-1$ PreferenceManager manager = new PreferenceManager(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java index 072891539..11d4b72f5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java @@ -163,15 +163,15 @@ public abstract class AbstractLaunchHistoryAction implements IWorkbenchWindowPul String mode= getMode(); String label; if (mode.equals(ILaunchManager.RUN_MODE)) { - label= ActionMessages.AbstractLaunchHistoryAction_1; //$NON-NLS-1$ + label= ActionMessages.AbstractLaunchHistoryAction_1; } else if (mode.equals(ILaunchManager.DEBUG_MODE)){ - label= ActionMessages.AbstractLaunchHistoryAction_2; //$NON-NLS-1$ + label= ActionMessages.AbstractLaunchHistoryAction_2; } else if (mode.equals(ILaunchManager.PROFILE_MODE)){ - label= ActionMessages.AbstractLaunchHistoryAction_3; //$NON-NLS-1$ + label= ActionMessages.AbstractLaunchHistoryAction_3; } else { - label= ActionMessages.AbstractLaunchHistoryAction_4; //$NON-NLS-1$ + label= ActionMessages.AbstractLaunchHistoryAction_4; } - return MessageFormat.format(ActionMessages.AbstractLaunchHistoryAction_0, new String[] {label, launchName}); //$NON-NLS-1$ + return MessageFormat.format(ActionMessages.AbstractLaunchHistoryAction_0, new String[] {label, launchName}); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java index dcfcf69f4..e50a2db99 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAsAction.java @@ -77,7 +77,7 @@ public class LaunchAsAction extends Action implements IMenuCreator, IWorkbenchWi super(); fLaunchGroupIdentifier = launchGroupIdentifier; ILaunchMode launchMode = DebugPlugin.getDefault().getLaunchManager().getLaunchMode(getMode()); - setText(MessageFormat.format(ActionMessages.LaunchAsAction_0, new String[]{launchMode.getLabel()})); //$NON-NLS-1$ + setText(MessageFormat.format(ActionMessages.LaunchAsAction_0, new String[]{launchMode.getLabel()})); setMenuCreator(this); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java index 6f5a25974..e74838d4c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchShortcutsAction.java @@ -87,7 +87,7 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork super(); fGroup = DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(launchGroupIdentifier); String label = DebugPlugin.getDefault().getLaunchManager().getLaunchMode(fGroup.getMode()).getLabel(); - setText(MessageFormat.format(ActionMessages.LaunchShortcutsAction_0, new String[] { label })); //$NON-NLS-1$ + setText(MessageFormat.format(ActionMessages.LaunchShortcutsAction_0, new String[] { label })); setMenuCreator(this); setEnabled(existsConfigTypesForMode()); } @@ -207,7 +207,7 @@ public class LaunchShortcutsAction extends Action implements IMenuCreator, IWork } if (accelerator == 1) { // No shortcuts added. Add "none available" action. - IAction action= new Action(ActionMessages.LaunchShortcutsAction_1) {}; //$NON-NLS-1$ + IAction action= new Action(ActionMessages.LaunchShortcutsAction_1) {}; action.setEnabled(false); ActionContributionItem item= new ActionContributionItem(action); item.fill(fCreatedMenu, -1); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java index 1c0c6946d..ff1b59801 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java @@ -93,7 +93,7 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe try { fPartTarget.runToLine(fActivePart, fActivePart.getSite().getSelectionProvider().getSelection(), fTargetElement); } catch (CoreException e) { - DebugUIPlugin.errorDialog(fActivePart.getSite().getWorkbenchWindow().getShell(), ActionMessages.RunToLineAction_0, ActionMessages.RunToLineAction_1, e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(fActivePart.getSite().getWorkbenchWindow().getShell(), ActionMessages.RunToLineAction_0, ActionMessages.RunToLineAction_1, e.getStatus()); // } } } @@ -132,7 +132,7 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe public void init(IAction action) { this.fAction = action; if (action != null) { - action.setText(ActionMessages.RunToLineActionDelegate_4); //$NON-NLS-1$ + action.setText(ActionMessages.RunToLineActionDelegate_4); action.setImageDescriptor(DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_RUN_TO_LINE)); action.setDisabledImageDescriptor(DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RUN_TO_LINE)); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java index 4cb946768..4296abb5f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java @@ -130,7 +130,7 @@ public class RunToLineHandler implements IDebugEventSetListener, IBreakpointMana getBreakpointManager().setEnabled(false); breakpointManager.addBreakpointManagerListener(this); } - Job job = new Job(ActionMessages.RunToLineHandler_0) { //$NON-NLS-1$ + Job job = new Job(ActionMessages.RunToLineHandler_0) { protected IStatus run(IProgressMonitor jobMonitor) { if (!jobMonitor.isCanceled()) { fTarget.breakpointAdded(fBreakpoint); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java index 3e3032ec2..b0c74e038 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java @@ -55,7 +55,7 @@ public class ToggleBreakpointAction extends Action { * @param rulerInfo specifies location the user has double-clicked */ public ToggleBreakpointAction(IWorkbenchPart part, IDocument document, IVerticalRulerInfo rulerInfo) { - super(ActionMessages.ToggleBreakpointAction_0); //$NON-NLS-1$ + super(ActionMessages.ToggleBreakpointAction_0); fPart = part; fDocument = document; fRulerInfo = rulerInfo; @@ -123,7 +123,7 @@ public class ToggleBreakpointAction extends Action { * @param e underlying exception */ private void reportException(Exception e) { - DebugUIPlugin.errorDialog(fPart.getSite().getShell(), ActionMessages.ToggleBreakpointAction_1, ActionMessages.ToggleBreakpointAction_2, e); //$NON-NLS-1$ //$NON-NLS-2$ + DebugUIPlugin.errorDialog(fPart.getSite().getShell(), ActionMessages.ToggleBreakpointAction_1, ActionMessages.ToggleBreakpointAction_2, e); // } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java index cc7b862b1..bf980364b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java @@ -251,9 +251,9 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp */ private void updateActionLabel() { if (fIsShowAddressColumn) { - setText(DebugUIMessages.ShowAddressColumnAction_0); //$NON-NLS-1$ + setText(DebugUIMessages.ShowAddressColumnAction_0); } else { - setText(DebugUIMessages.ShowAddressColumnAction_1); //$NON-NLS-1$ + setText(DebugUIMessages.ShowAddressColumnAction_1); } } } @@ -730,7 +730,7 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp if (!ok) { - DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.AbstractTableRendering_0, null)); //$NON-NLS-1$ + DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.AbstractTableRendering_0, null)); displayError(e); return; } @@ -833,7 +833,7 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp { if(((IMemoryBlockExtension)getMemoryBlock()).getBigBaseAddress() == null) { - DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.AbstractTableRendering_1, null)); //$NON-NLS-1$ + DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.AbstractTableRendering_1, null)); displayError(e); } } @@ -1184,7 +1184,7 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp } TableColumn column0 = new TableColumn(fTableViewer.getTable(),SWT.LEFT,0); - column0.setText(DebugUIMessages.AbstractTableRendering_2); //$NON-NLS-1$ + column0.setText(DebugUIMessages.AbstractTableRendering_2); // create new byte columns TableColumn [] byteColumns = new TableColumn[bytesPerLine/columnSize]; @@ -1329,7 +1329,7 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp styleText = fTextViewer.getTextWidget(); if (styleText != null) - styleText.setText(DebugUIMessages.AbstractTableRendering_3 + e.getMessage()); //$NON-NLS-1$ + styleText.setText(DebugUIMessages.AbstractTableRendering_3 + e.getMessage()); fPageBook.showPage(fTextViewer.getControl()); // clear content cache if we need to display error @@ -1600,7 +1600,7 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp if (fFormatColumnActions.length > 0) { // Format view tab actions - IMenuManager formatMenu = new MenuManager(DebugUIMessages.AbstractTableRendering_5, //$NON-NLS-1$ + IMenuManager formatMenu = new MenuManager(DebugUIMessages.AbstractTableRendering_5, "format"); //$NON-NLS-1$ menu.appendToGroup("topMenu", formatMenu); //$NON-NLS-1$ @@ -1716,7 +1716,7 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp if (fLabel == null) { - fLabel = DebugUIMessages.AbstractTableRendering_8; //$NON-NLS-1$ + fLabel = DebugUIMessages.AbstractTableRendering_8; } try { @@ -1806,7 +1806,7 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp address = ((IMemoryBlockExtension)mem).getBigBaseAddress(); if (address == null) { - DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.AbstractTableRendering_10, null)); //$NON-NLS-1$ + DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.AbstractTableRendering_10, null)); displayError(e); return; } @@ -2108,7 +2108,7 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp { Status stat = new Status( IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), - DebugException.NOT_SUPPORTED, DebugUIMessages.AbstractTableRendering_11, null //$NON-NLS-1$ + DebugException.NOT_SUPPORTED, DebugUIMessages.AbstractTableRendering_11, null ); DebugException e = new DebugException(stat); throw e; @@ -2122,7 +2122,7 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp { Status stat = new Status( IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), - DebugException.NOT_SUPPORTED, DebugUIMessages.AbstractTableRendering_11, null //$NON-NLS-1$ + DebugException.NOT_SUPPORTED, DebugUIMessages.AbstractTableRendering_11, null ); DebugException e = new DebugException(stat); throw e; @@ -2845,7 +2845,7 @@ public abstract class AbstractTableRendering extends AbstractMemoryRendering imp goToAddress(baseAddress); topVisibleAddressChanged(baseAddress); } catch (DebugException e) { - MemoryViewUtil.openError(DebugUIMessages.AbstractTableRendering_12, DebugUIMessages.AbstractTableRendering_13, e); //$NON-NLS-1$ //$NON-NLS-2$ + MemoryViewUtil.openError(DebugUIMessages.AbstractTableRendering_12, DebugUIMessages.AbstractTableRendering_13, e); // } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java index 2b2219c05..53ca7e9a1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java @@ -64,7 +64,7 @@ public class SourceLookupDialog extends TitleAreaDialog { */ protected Control createDialogArea(Composite parent) { // create a composite with standard margins and spacing - setTitle(SourceLookupUIMessages.manageSourceDialog_description); //$NON-NLS-1$ + setTitle(SourceLookupUIMessages.manageSourceDialog_description); setTitleImage(DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_EDIT_SRC_LOC_WIZ)); Composite composite = new Composite(parent, SWT.NONE); @@ -105,7 +105,7 @@ public class SourceLookupDialog extends TitleAreaDialog { */ protected void configureShell(Shell shell) { super.configureShell(shell); - shell.setText(SourceLookupUIMessages.manageSourceDialog_title); //$NON-NLS-1$ + shell.setText(SourceLookupUIMessages.manageSourceDialog_title); } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java index a05d8613d..99248b394 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java @@ -90,7 +90,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab { * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ public String getName() { - return SourceLookupUIMessages.sourceTab_tabTitle; //$NON-NLS-1$ + return SourceLookupUIMessages.sourceTab_tabTitle; } /* (non-Javadoc) diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java index b956ee129..00e12482f 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java @@ -93,7 +93,7 @@ public abstract class AbstractConsole implements IConsole { * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ public void handleException(Throwable exception) { - IStatus status = new Status(IStatus.ERROR, ConsolePlugin.getUniqueIdentifier(), IConsoleConstants.INTERNAL_ERROR, ConsoleMessages.AbstractConsole_0, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, ConsolePlugin.getUniqueIdentifier(), IConsoleConstants.INTERNAL_ERROR, ConsoleMessages.AbstractConsole_0, exception); ConsolePlugin.log(status); } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsolePage.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsolePage.java index e0effbc00..7f89233a5 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsolePage.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsolePage.java @@ -158,7 +158,7 @@ public class TextConsolePage implements IPageBookViewPage, IPropertyChangeListen if (getConsole().getType() != null) { id = getConsole().getType() + "." + id; //$NON-NLS-1$ } - fMenuManager= new MenuManager("#ContextMenu", id); //$NON-NLS-1$//$NON-NLS-2$ + fMenuManager= new MenuManager("#ContextMenu", id); //$NON-NLS-1$ fMenuManager.setRemoveAllWhenShown(true); fMenuManager.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager m) { @@ -171,7 +171,7 @@ public class TextConsolePage implements IPageBookViewPage, IPropertyChangeListen createActions(); configureToolBar(getSite().getActionBars().getToolBarManager()); - getSite().registerContextMenu(id, fMenuManager, fViewer); //$NON-NLS-1$ + getSite().registerContextMenu(id, fMenuManager, fViewer); getSite().setSelectionProvider(fViewer); fViewer.getSelectionProvider().addSelectionChangedListener(selectionChangedListener); diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java index 7508438d4..6b0d8748e 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java @@ -43,8 +43,8 @@ public class ClearOutputAction extends Action { * @since 3.1 */ private ClearOutputAction() { - super(ConsoleMessages.ClearOutputAction_title); //$NON-NLS-1$ - setToolTipText(ConsoleMessages.ClearOutputAction_toolTipText); //$NON-NLS-1$ + super(ConsoleMessages.ClearOutputAction_title); + setToolTipText(ConsoleMessages.ClearOutputAction_toolTipText); setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IConsoleConstants.IMG_LCL_CLEAR)); setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_CLEAR)); setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_CLEAR)); diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/CloseConsoleAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/CloseConsoleAction.java index b30e80191..38918477b 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/CloseConsoleAction.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/CloseConsoleAction.java @@ -30,8 +30,8 @@ public class CloseConsoleAction extends Action { private IConsole fConsole; public CloseConsoleAction(IConsole console) { - super(ConsoleMessages.CloseConsoleAction_0, ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_CLOSE)); //$NON-NLS-1$ - setToolTipText(ConsoleMessages.CloseConsoleAction_1); //$NON-NLS-1$ + super(ConsoleMessages.CloseConsoleAction_0, ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_CLOSE)); + setToolTipText(ConsoleMessages.CloseConsoleAction_1); fConsole = console; } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/TextViewerGotoLineAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/TextViewerGotoLineAction.java index 48870a378..66aa8c322 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/TextViewerGotoLineAction.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/TextViewerGotoLineAction.java @@ -45,10 +45,10 @@ public class TextViewerGotoLineAction extends TextViewerAction { try { int i= Integer.parseInt(input); if (i <= 0 || fLastLine < i) - return ConsoleMessages.TextViewerGotoLineAction_Line_number_out_of_range_1; //$NON-NLS-1$ + return ConsoleMessages.TextViewerGotoLineAction_Line_number_out_of_range_1; } catch (NumberFormatException x) { - return ConsoleMessages.TextViewerGotoLineAction_Not_a_number_2; //$NON-NLS-1$ + return ConsoleMessages.TextViewerGotoLineAction_Not_a_number_2; } return null; @@ -64,9 +64,9 @@ public class TextViewerGotoLineAction extends TextViewerAction { public TextViewerGotoLineAction(ITextViewer viewer) { super(viewer, -1); fTextViewer= viewer; - setText(ConsoleMessages.TextViewerGotoLineAction_Go_to__Line____Ctrl_L_4); //$NON-NLS-1$ - setToolTipText(ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1); //$NON-NLS-1$ - setDescription(ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1); //$NON-NLS-1$ + setText(ConsoleMessages.TextViewerGotoLineAction_Go_to__Line____Ctrl_L_4); + setToolTipText(ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1); + setDescription(ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1); } /** @@ -87,7 +87,7 @@ public class TextViewerGotoLineAction extends TextViewerAction { fTextViewer.getTextWidget().setSelection(start, start + length); fTextViewer.revealRange(start, length); } catch (BadLocationException x) { - ConsolePlugin.errorDialog(fTextViewer.getTextWidget().getShell(), ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1, ConsoleMessages.TextViewerGotoLineAction_Exceptions_occurred_attempt_to_go_to_line_2, x); //$NON-NLS-1$ //$NON-NLS-2$ + ConsolePlugin.errorDialog(fTextViewer.getTextWidget().getShell(), ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1, ConsoleMessages.TextViewerGotoLineAction_Exceptions_occurred_attempt_to_go_to_line_2, x); // } } @@ -100,8 +100,8 @@ public class TextViewerGotoLineAction extends TextViewerAction { IDocument document= fTextViewer.getDocument(); fLastLine= document.getLineOfOffset(document.getLength()) + 1; int startLine= selection == null ? 1 : fTextViewer.getTextWidget().getLineAtOffset(selection.x) + 1; - String title= ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1; //$NON-NLS-1$ - String message= MessageFormat.format(ConsoleMessages.TextViewerGotoLineAction_Enter_line_number__8, new Object[] {new Integer(fLastLine)}); //$NON-NLS-1$ + String title= ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1; + String message= MessageFormat.format(ConsoleMessages.TextViewerGotoLineAction_Enter_line_number__8, new Object[] {new Integer(fLastLine)}); String value= Integer.toString(startLine); Shell activeShell= fTextViewer.getTextWidget().getShell(); InputDialog d= new InputDialog(activeShell, title, message, value, new NumberValidator()); @@ -110,11 +110,11 @@ public class TextViewerGotoLineAction extends TextViewerAction { int line= Integer.parseInt(d.getValue()); gotoLine(line - 1); } catch (NumberFormatException x) { - ConsolePlugin.errorDialog(activeShell, ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1, ConsoleMessages.TextViewerGotoLineAction_Exceptions_occurred_attempt_to_go_to_line_2, x); //$NON-NLS-1$ //$NON-NLS-2$ + ConsolePlugin.errorDialog(activeShell, ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1, ConsoleMessages.TextViewerGotoLineAction_Exceptions_occurred_attempt_to_go_to_line_2, x); // } } } catch (BadLocationException x) { - ConsolePlugin.errorDialog(fTextViewer.getTextWidget().getShell(), ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1, ConsoleMessages.TextViewerGotoLineAction_Exceptions_occurred_attempt_to_go_to_line_2, x); //$NON-NLS-1$ //$NON-NLS-2$ + ConsolePlugin.errorDialog(fTextViewer.getTextWidget().getShell(), ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1, ConsoleMessages.TextViewerGotoLineAction_Exceptions_occurred_attempt_to_go_to_line_2, x); // return; } } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDropDownAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDropDownAction.java index 249f0455d..8ef726327 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDropDownAction.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDropDownAction.java @@ -44,8 +44,8 @@ class ConsoleDropDownAction extends Action implements IMenuCreator, IConsoleList public ConsoleDropDownAction(IConsoleView view) { fView= view; - setText(ConsoleMessages.ConsoleDropDownAction_0); //$NON-NLS-1$ - setToolTipText(ConsoleMessages.ConsoleDropDownAction_1); //$NON-NLS-1$ + setText(ConsoleMessages.ConsoleDropDownAction_0); + setToolTipText(ConsoleMessages.ConsoleDropDownAction_1); setImageDescriptor(ConsolePluginImages.getImageDescriptor(IConsoleConstants.IMG_VIEW_CONSOLE)); setMenuCreator(this); ConsolePlugin.getDefault().getConsoleManager().addConsoleListener(this); diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java index e644956ac..eeb0a271a 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java @@ -135,7 +135,7 @@ public class ConsoleManager implements IConsoleManager { * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable) */ public void handleException(Throwable exception) { - IStatus status = new Status(IStatus.ERROR, ConsolePlugin.getUniqueIdentifier(), IConsoleConstants.INTERNAL_ERROR, ConsoleMessages.ConsoleManager_0, exception); //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, ConsolePlugin.getUniqueIdentifier(), IConsoleConstants.INTERNAL_ERROR, ConsoleMessages.ConsoleManager_0, exception); ConsolePlugin.log(status); } @@ -360,7 +360,7 @@ public class ConsoleManager implements IConsoleManager { for (int i = 0; i < elements.length; i++) { IConfigurationElement config = elements[i]; PatternMatchListenerExtension extension = new PatternMatchListenerExtension(config); - fPatternMatchListeners.add(extension); //$NON-NLS-1$ + fPatternMatchListeners.add(extension); } } ArrayList list = new ArrayList(); diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java index 967b216ce..abfd44a09 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java @@ -199,12 +199,12 @@ public class ConsoleView extends PageBookView implements IConsoleView, IConsoleL protected void updateTitle() { IConsole console = getConsole(); if (console == null) { - setContentDescription(ConsoleMessages.ConsoleView_0); //$NON-NLS-1$ + setContentDescription(ConsoleMessages.ConsoleView_0); } else { String newName = console.getName(); String oldName = getContentDescription(); if (newName!=null && !(newName.equals(oldName))) { - setContentDescription(console.getName()); //$NON-NLS-1$ + setContentDescription(console.getName()); } } } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/FollowHyperlinkAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/FollowHyperlinkAction.java index b6040546a..f7d242141 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/FollowHyperlinkAction.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/FollowHyperlinkAction.java @@ -27,8 +27,8 @@ public class FollowHyperlinkAction extends Action { * Constructs a follow link action */ public FollowHyperlinkAction(TextConsoleViewer consoleViewer) { - super(ConsoleMessages.FollowHyperlinkAction_0); //$NON-NLS-1$ - setToolTipText(ConsoleMessages.FollowHyperlinkAction_1); //$NON-NLS-1$ + super(ConsoleMessages.FollowHyperlinkAction_0); + setToolTipText(ConsoleMessages.FollowHyperlinkAction_1); this.viewer = consoleViewer; } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java index 1c061c568..f65337856 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java @@ -369,7 +369,7 @@ public class IOConsolePartitioner implements IConsoleDocumentPartitioner, IDocum synchronized(partitions) { if (lastPartition == null || lastPartition.isReadOnly()) { - lastPartition = new IOConsolePartition(inputStream, event.fText); //$NON-NLS-1$ + lastPartition = new IOConsolePartition(inputStream, event.fText); lastPartition.setOffset(event.fOffset); partitions.add(lastPartition); inputPartitions.add(lastPartition); diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java index c7d095480..60b40f279 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java @@ -32,8 +32,8 @@ public class OpenConsoleAction extends Action implements IMenuCreator { public OpenConsoleAction() { fFactoryExtensions = ((ConsoleManager)ConsolePlugin.getDefault().getConsoleManager()).getConsoleFactoryExtensions(); - setText(ConsoleMessages.OpenConsoleAction_0); //$NON-NLS-1$ - setToolTipText(ConsoleMessages.OpenConsoleAction_1); //$NON-NLS-1$ + setText(ConsoleMessages.OpenConsoleAction_0); + setToolTipText(ConsoleMessages.OpenConsoleAction_1); setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_NEW_CON)); setMenuCreator(this); } diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PinConsoleAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PinConsoleAction.java index ff324bbee..72ff6ba25 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PinConsoleAction.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PinConsoleAction.java @@ -26,8 +26,8 @@ public class PinConsoleAction extends Action implements IUpdate { * Constructs a 'pin console' action */ public PinConsoleAction(IConsoleView view) { - super(ConsoleMessages.PinConsoleAction_0, IAction.AS_CHECK_BOX); //$NON-NLS-1$ - setToolTipText(ConsoleMessages.PinConsoleAction_1); //$NON-NLS-1$ + super(ConsoleMessages.PinConsoleAction_0, IAction.AS_CHECK_BOX); + setToolTipText(ConsoleMessages.PinConsoleAction_1); setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_PIN)); setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_PIN)); setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_LCL_PIN)); diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ScrollLockAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ScrollLockAction.java index 370024834..1f9663991 100644 --- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ScrollLockAction.java +++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ScrollLockAction.java @@ -24,10 +24,10 @@ public class ScrollLockAction extends Action { private IConsoleView fConsoleView; public ScrollLockAction(IConsoleView consoleView) { - super(ConsoleMessages.ScrollLockAction_0); //$NON-NLS-1$ + super(ConsoleMessages.ScrollLockAction_0); fConsoleView = consoleView; - setToolTipText(ConsoleMessages.ScrollLockAction_1); //$NON-NLS-1$ + setToolTipText(ConsoleMessages.ScrollLockAction_1); setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_LCL_LOCK)); setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_LOCK)); setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_LOCK)); |