diff options
author | Michael Rennie | 2007-07-31 19:14:00 +0000 |
---|---|---|
committer | Michael Rennie | 2007-07-31 19:14:00 +0000 |
commit | 8a0865f4ceb272cd8c5514dae6fba68e2662a501 (patch) | |
tree | cbea59461c56a9f0874ec742081e9763eaf2fae5 /org.eclipse.debug.ui | |
parent | 709988f37445acdfe4c004499db055bf374cbd1e (diff) | |
download | eclipse.platform.debug-8a0865f4ceb272cd8c5514dae6fba68e2662a501.tar.gz eclipse.platform.debug-8a0865f4ceb272cd8c5514dae6fba68e2662a501.tar.xz eclipse.platform.debug-8a0865f4ceb272cd8c5514dae6fba68e2662a501.zip |
Bug 198437 EMPTY_STRING constant not used
Diffstat (limited to 'org.eclipse.debug.ui')
74 files changed, 198 insertions, 166 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java index abf7a13f3..f0f1ebb5c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java @@ -168,11 +168,11 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog { Composite comp = (Composite) super.createDialogArea(parent); addCustomHeaderControls(comp); String label = getMessage(); - if(label != null && !"".equals(label)) { //$NON-NLS-1$ + if(label != null && !IInternalDebugUIConstants.EMPTY_STRING.equals(label)) { SWTFactory.createWrapLabel(comp, label, 1); } label = getViewerLabel(); - if(label != null && !"".equals(label)) { //$NON-NLS-1$ + if(label != null && !IInternalDebugUIConstants.EMPTY_STRING.equals(label)) { SWTFactory.createLabel(comp, label, 1); } fViewer = createViewer(comp); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java index e2b4b3c20..0ef5c9350 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -44,7 +44,7 @@ public class DebugModelPropertyTester extends PropertyTester { } if(target != null) { // check that the expected value argument is valid - if (expectedValue == null || expectedValue.equals("")){ //$NON-NLS-1$ + if (expectedValue == null || expectedValue.equals(IInternalDebugUIConstants.EMPTY_STRING)){ return false; } //!target.isTerminated() && !target.isDisconnected() 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 c03e66e94..66176bd47 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 @@ -819,7 +819,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener { public static ILaunch buildAndLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { boolean buildBeforeLaunch = getDefault().getPreferenceStore().getBoolean(IDebugUIConstants.PREF_BUILD_BEFORE_LAUNCH); - monitor.beginTask("", 1); //$NON-NLS-1$ + monitor.beginTask(IInternalDebugUIConstants.EMPTY_STRING, 1); try { return configuration.launch( 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 49a602c9e..c5666fc89 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 @@ -372,7 +372,7 @@ public class DefaultLabelProvider implements ILabelProvider { } catch (CoreException e) { DebugUIPlugin.log(e); } - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } protected String getMarkerImageKey(IMarker marker) { 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 bae918a82..c2b339905 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 @@ -140,7 +140,7 @@ public class MultipleInputDialog extends Dialog { if (!allowEmpty) { validators.add(new Validator() { public boolean validate() { - return !text.getText().equals(""); //$NON-NLS-1$ + return !text.getText().equals(IInternalDebugUIConstants.EMPTY_STRING); } }); text.addModifyListener(new ModifyListener() { @@ -181,7 +181,7 @@ public class MultipleInputDialog extends Dialog { if (!allowEmpty) { validators.add(new Validator() { public boolean validate() { - return !text.getText().equals(""); //$NON-NLS-1$ + return !text.getText().equals(IInternalDebugUIConstants.EMPTY_STRING); } }); @@ -198,7 +198,7 @@ public class MultipleInputDialog extends Dialog { DirectoryDialog dialog = new DirectoryDialog(getShell()); dialog.setMessage(DebugUIMessages.MultipleInputDialog_7); String currentWorkingDir = text.getText(); - if (!currentWorkingDir.trim().equals("")) { //$NON-NLS-1$ + if (!currentWorkingDir.trim().equals(IInternalDebugUIConstants.EMPTY_STRING)) { File path = new File(currentWorkingDir); if (path.exists()) { dialog.setFilterPath(currentWorkingDir); @@ -245,7 +245,7 @@ public class MultipleInputDialog extends Dialog { if (!allowEmpty) { validators.add(new Validator() { public boolean validate() { - return !text.getText().equals(""); //$NON-NLS-1$ + return !text.getText().equals(IInternalDebugUIConstants.EMPTY_STRING); } }); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java index af5d5e8dd..1e2cf800b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java @@ -16,6 +16,7 @@ import java.util.Iterator; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -175,7 +176,7 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate * Default is to return the empty String. */ protected String getStatusMessage(){ - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java index 27e43b719..7f99e2af7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java @@ -14,6 +14,7 @@ package org.eclipse.debug.internal.ui.actions; import java.util.Iterator; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -106,7 +107,7 @@ public abstract class AbstractSelectionActionDelegate implements IViewActionDele * @return the status message */ protected String getStatusMessage() { - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } /* 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 735100000..0de215158 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 @@ -23,6 +23,7 @@ import org.eclipse.debug.core.model.IDebugElement; import org.eclipse.debug.core.model.IProcess; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.ILaunchGroup; @@ -44,7 +45,7 @@ public class AddToFavoritesAction extends SelectionListenerAction { * Constructs a new action. */ public AddToFavoritesAction() { - super(""); //$NON-NLS-1$ + super(IInternalDebugUIConstants.EMPTY_STRING); setEnabled(false); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.EDIT_LAUNCH_CONFIGURATION_ACTION); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java index cb82f4cbb..544f67981 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java @@ -12,6 +12,7 @@ package org.eclipse.debug.internal.ui.actions; import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.contextlaunching.LaunchingResourceManager; import org.eclipse.debug.ui.IDebugUIConstants; @@ -56,7 +57,7 @@ public class DebugLastAction extends RelaunchLastAction { * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getTooltipText() */ protected String getTooltipText() { - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } /* (non-Javadoc) 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 17bdd8ccd..e9891e647 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 @@ -22,6 +22,7 @@ import org.eclipse.debug.core.model.IProcess; import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.ILaunchGroup; import org.eclipse.jface.resource.ImageDescriptor; @@ -43,7 +44,7 @@ public class EditLaunchConfigurationAction extends SelectionListenerAction { * Constructs a new action. */ public EditLaunchConfigurationAction() { - super(""); //$NON-NLS-1$ + super(IInternalDebugUIConstants.EMPTY_STRING); setEnabled(false); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.EDIT_LAUNCH_CONFIGURATION_ACTION); } @@ -77,7 +78,7 @@ public class EditLaunchConfigurationAction extends SelectionListenerAction { // while a launch is waiting for a build. These copied configurations // have an attribute that points to the config that the user is really // launching. - String underlyingHandle = configuration.getAttribute(DebugUIPlugin.ATTR_LAUNCHING_CONFIG_HANDLE, ""); //$NON-NLS-1$ + String underlyingHandle = configuration.getAttribute(DebugUIPlugin.ATTR_LAUNCHING_CONFIG_HANDLE, IInternalDebugUIConstants.EMPTY_STRING); if (underlyingHandle.length() > 0) { ILaunchConfiguration underlyingConfig = DebugPlugin.getDefault().getLaunchManager().getLaunchConfiguration(underlyingHandle); if (underlyingConfig != null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java index 34780d903..09f563a35 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java @@ -12,6 +12,7 @@ package org.eclipse.debug.internal.ui.actions; import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.contextlaunching.LaunchingResourceManager; import org.eclipse.debug.ui.IDebugUIConstants; @@ -57,7 +58,7 @@ public class ProfileLastAction extends RelaunchLastAction { * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getTooltipText() */ protected String getTooltipText() { - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java index abf5d30c3..b4877c383 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java @@ -12,6 +12,7 @@ package org.eclipse.debug.internal.ui.actions; import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.contextlaunching.LaunchingResourceManager; import org.eclipse.debug.ui.IDebugUIConstants; @@ -56,7 +57,7 @@ public class RunLastAction extends RelaunchLastAction { * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getTooltipText() */ protected String getTooltipText() { - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java index 3f01116f3..2763c29cd 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.actions.breakpointGroups; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -25,7 +26,7 @@ public class AdvancedGroupBreakpointsByAction extends Action { private BreakpointsView fView; public AdvancedGroupBreakpointsByAction(BreakpointsView view) { - super("", IAction.AS_RADIO_BUTTON); //$NON-NLS-1$ + super(IInternalDebugUIConstants.EMPTY_STRING, IAction.AS_RADIO_BUTTON); fView= view; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java index b6fd6cd1f..491e0d486 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.actions.breakpointGroups; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView; import org.eclipse.debug.internal.ui.views.breakpoints.IBreakpointOrganizer; import org.eclipse.jface.action.Action; @@ -33,7 +34,7 @@ public class GroupBreakpointsAction extends Action { * @param view the breakpoints view */ public GroupBreakpointsAction(IBreakpointOrganizer organizer, BreakpointsView view) { - super("", IAction.AS_RADIO_BUTTON); //$NON-NLS-1$ + super(IInternalDebugUIConstants.EMPTY_STRING, IAction.AS_RADIO_BUTTON); fOrganzier= organizer; fView= view; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java index a2d8ba77c..b11b4e3b3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,6 +14,7 @@ package org.eclipse.debug.internal.ui.actions.expressions; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.IWatchExpression; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.window.Window; @@ -37,7 +38,7 @@ public class AddWatchExpressionAction extends WatchExpressionAction implements I */ public void run(IAction action) { // create a watch expression - IWatchExpression watchExpression= DebugPlugin.getDefault().getExpressionManager().newWatchExpression(""); //$NON-NLS-1$ + IWatchExpression watchExpression= DebugPlugin.getDefault().getExpressionManager().newWatchExpression(IInternalDebugUIConstants.EMPTY_STRING); // open the watch expression dialog if (new WatchExpressionDialog(DebugUIPlugin.getShell(), watchExpression, false).open() == Window.OK) { // if OK is selected, add the expression to the expression view and try to evaluate the expression. diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java index 2b5adc348..52dd53676 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -100,8 +100,8 @@ public class ChangeVariableValueAction extends SelectionProviderAction { * @param shell a shell for prompting the user */ protected void doDefaultEdit(Shell shell) { - String name= ""; //$NON-NLS-1$ - String value= ""; //$NON-NLS-1$ + String name= IInternalDebugUIConstants.EMPTY_STRING; + String value= IInternalDebugUIConstants.EMPTY_STRING; try { name= fVariable.getName(); value= fVariable.getValue().getValueString(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java index e8bba8725..67a87fb3c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ package org.eclipse.debug.internal.ui.actions.variables; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogSettings; @@ -32,7 +33,7 @@ import org.eclipse.swt.widgets.Text; * A simple input dialog for soliciting an input string * from the user. * <p> - * This concete dialog class can be instantiated as is, + * This concrete dialog class can be instantiated as is, * or further subclassed as required. * </p> */ @@ -52,7 +53,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog { /** * The input value; the empty string by default. */ - private String value= "";//$NON-NLS-1$ + private String value= IInternalDebugUIConstants.EMPTY_STRING; /** * The input validator, or <code>null</code> if none. @@ -93,7 +94,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog { this.title = dialogTitle; message = dialogMessage; if (initialValue == null) - value = "";//$NON-NLS-1$ + value = IInternalDebugUIConstants.EMPTY_STRING; else value = initialValue; this.validator = validator; @@ -168,7 +169,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog { if (okButton.isEnabled()) { return; } - errorMessageLabel.setText(""); //$NON-NLS-1$ + errorMessageLabel.setText(IInternalDebugUIConstants.EMPTY_STRING); errorMessageLabel.getParent().update(); okButton.setEnabled(true); } @@ -241,8 +242,8 @@ public class ChangeVariableValueInputDialog extends TrayDialog { errorMessage = validator.isValid(text.getText()); } - // Bug 16256: important not to treat "" (blank error) the same as null (no error) - errorMessageLabel.setText(errorMessage == null ? "" : errorMessage); //$NON-NLS-1$ + // Bug 16256: important not to treat empty string (blank error) the same as null (no error) + errorMessageLabel.setText(errorMessage == null ? IInternalDebugUIConstants.EMPTY_STRING : errorMessage); okButton.setEnabled(errorMessage == null); errorMessageLabel.getParent().update(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java index c717cae19..d730d5141 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,7 +35,7 @@ public class ToggleDetailPaneAction extends Action { private String fOrientation; public ToggleDetailPaneAction(VariablesView view, String orientation, String hiddenLabel) { - super("", AS_RADIO_BUTTON); //$NON-NLS-1$ + super(IInternalDebugUIConstants.EMPTY_STRING, AS_RADIO_BUTTON); setVariablesView(view); setOrientation(orientation); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java index 83c034edc..e5125988a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java @@ -12,6 +12,7 @@ package org.eclipse.debug.internal.ui.actions.variables.details; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.views.variables.VariablesViewMessages; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.dialogs.IDialogConstants; @@ -164,7 +165,7 @@ public class DetailPaneMaxLengthDialog extends TrayDialog { public void setErrorMessage(String errorMessage) { fErrorMessage = errorMessage; if (fErrorTextWidget != null && !fErrorTextWidget.isDisposed()) { - fErrorTextWidget.setText(errorMessage == null ? "" : errorMessage); //$NON-NLS-1$ + fErrorTextWidget.setText(errorMessage == null ? IInternalDebugUIConstants.EMPTY_STRING : errorMessage); fErrorTextWidget.getParent().update(); // Access the ok button by id, in case clients have overridden button creation. // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=113643 diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java index c00665663..f18075d1f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java @@ -110,7 +110,7 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo /** * Constant denoting the empty string; */ - private static final String EMPTY_STRING = ""; //$NON-NLS-1$ + private static final String EMPTY_STRING = IInternalDebugUIConstants.EMPTY_STRING; /** * Provides a mouse tracker listener for the launching main toolbar diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java index 54203616c..e6945eb3f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -64,7 +64,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { labels[i+1] = getColumnText(element, i+1, tableRendering, (TableRenderingContentDescriptor)tableRendering.getAdapter(TableRenderingContentDescriptor.class)); } - labels[labels.length - 1 ] = ""; //$NON-NLS-1$ + labels[labels.length - 1 ] = IInternalDebugUIConstants.EMPTY_STRING; return labels; } } @@ -111,7 +111,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter { { MemorySegment segment = (MemorySegment)element; if (segment.getBytes().length != tableRendering.getBytesPerLine()) - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } ILabelProvider labelProvider = (ILabelProvider)tableRendering.getAdapter(ILabelProvider.class); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java index 1ce226454..881900295 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java @@ -236,7 +236,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener * @return if the prerequesites of the wizard are met to allow the wizard to complete. */ private boolean detectPageComplete() { - boolean emptyFile = fDestinationNameField.getText().trim().equals(""); //$NON-NLS-1$ + boolean emptyFile = fDestinationNameField.getText().trim().equals(IInternalDebugUIConstants.EMPTY_STRING); if (emptyFile) { setMessage(ImportExportMessages.WizardExportBreakpointsPage_0, IMessageProvider.NONE); return false; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java index 974a6b22f..6fece6f32 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java @@ -124,7 +124,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener */ private boolean detectPageComplete() { String fileName = fFileNameField.getText().trim(); - if (fileName.equals("")) {//$NON-NLS-1$ + if (fileName.equals(IInternalDebugUIConstants.EMPTY_STRING)) { setMessage(ImportExportMessages.WizardImportBreakpointsPage_6); return false; } 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 84c3f713e..47f311788 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 @@ -22,6 +22,7 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.ILaunchConfigurationDialog; import org.eclipse.debug.ui.ILaunchConfigurationTab; @@ -161,7 +162,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia // Set the things that TitleAreaDialog takes care of setTitle(getTitleAreaTitle()); - setMessage(""); //$NON-NLS-1$ + setMessage(IInternalDebugUIConstants.EMPTY_STRING); setModeLabelState(); // Build the launch configuration edit area and put it into the composite. diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java index 51741ce9e..d60ace53a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java @@ -22,6 +22,7 @@ import java.util.Set; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.debug.internal.core.IConfigurationElementConstants; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.ILaunchConfigurationTabGroup; @@ -207,7 +208,7 @@ public class LaunchConfigurationTabGroupExtension { description = fConfig.getAttribute(IConfigurationElementConstants.DESCRIPTION); } - return (description == null ? "" : description); //$NON-NLS-1$ + return (description == null ? IInternalDebugUIConstants.EMPTY_STRING : description); } } 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 10bf2a454..3abf96dd0 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 @@ -79,7 +79,6 @@ import com.ibm.icu.text.MessageFormat; */ public class LaunchConfigurationTabGroupViewer extends Viewer { - private final String EMPTY_STRING = ""; //$NON-NLS-1$ /** * Containing launch dialog */ @@ -449,7 +448,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { public void setName(String name) { if (getWorkingCopy() != null) { if (name == null) { - fNameWidget.setText(EMPTY_STRING); + fNameWidget.setText(IInternalDebugUIConstants.EMPTY_STRING); } else { fNameWidget.setText(name.trim()); @@ -690,7 +689,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { ILaunchConfigurationDialog lcd = getLaunchConfigurationDialog(); if(lcd instanceof LaunchConfigurationsDialog) { if(((LaunchConfigurationsDialog)lcd).isTreeSelectionEmpty()) { - fDescription = EMPTY_STRING; + fDescription = IInternalDebugUIConstants.EMPTY_STRING; } } } @@ -819,7 +818,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { fTabType = configType; ILaunchConfigurationTab[] tabs = getTabs(); CTabItem tab = null; - String name = EMPTY_STRING; + String name = IInternalDebugUIConstants.EMPTY_STRING; Control control = null; for (int i = 0; i < tabs.length; i++) { tab = new CTabItem(fTabFolder, SWT.BORDER); @@ -861,7 +860,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer { description = LaunchConfigurationPresentationManager.getDefault().getDescription(configType, mode); } if (description == null) { - description = EMPTY_STRING; + description = IInternalDebugUIConstants.EMPTY_STRING; } return description; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java index c61d69b1c..e5b7a1418 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java @@ -19,6 +19,7 @@ import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.SWTFactory; import org.eclipse.debug.ui.AbstractDebugView; import org.eclipse.debug.ui.IDebugUIConstants; @@ -383,7 +384,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc if (getViewer() instanceof StructuredViewer) { ((StructuredViewer)getViewer()).addDoubleClickListener(this); } - fFilteredNotice = SWTFactory.createLabel(parent, "", 1); //$NON-NLS-1$ + fFilteredNotice = SWTFactory.createLabel(parent, IInternalDebugUIConstants.EMPTY_STRING, 1); fFilteredNotice.setBackground(parent.getBackground()); } 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 2b0585694..79cd4061b 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 @@ -150,11 +150,6 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun */ public static final int LAUNCH_CONFIGURATION_DIALOG_REUSE_OPEN = 4; /** - * defines the empty string - * @since 3.2 - */ - private static final String EMPTY_STRING = ""; //$NON-NLS-1$ - /** * defines the delimiter used in the persistence of the expanded state * @since 3.2 */ @@ -636,7 +631,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun */ public String generateName(String name) { if (name == null) { - name = EMPTY_STRING; + name = IInternalDebugUIConstants.EMPTY_STRING; } return getLaunchManager().generateUniqueLaunchConfigurationNameFrom(name); } @@ -653,7 +648,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun */ public String generateName(String name, Set reservednames) { if(name == null) { - name = EMPTY_STRING; + name = IInternalDebugUIConstants.EMPTY_STRING; } return ((LaunchManager)getLaunchManager()).generateUniqueLaunchConfigurationNameFrom(name, reservednames); } @@ -1143,14 +1138,14 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun TreeItem[] items = fLaunchConfigurationView.getTreeViewer().getTree().getItems(); String value = settings.get(DIALOG_EXPANDED_NODES); if(value == null) { - value = EMPTY_STRING; + value = IInternalDebugUIConstants.EMPTY_STRING; } ArrayList list = new ArrayList(); String[] persisted = value.split(DELIMITER); for(int i = 0; i < persisted.length; i++) { list.add(persisted[i]); } - String type = EMPTY_STRING; + String type = IInternalDebugUIConstants.EMPTY_STRING; //if the item is not in the list and is expanded add it, otherwise if it //is not expanded do a remove...either way for the else we query the list for(int i = 0; i < items.length; i++) { @@ -1162,7 +1157,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun list.remove(type); } } - value = EMPTY_STRING; + value = IInternalDebugUIConstants.EMPTY_STRING; //build the preference string for(Iterator iter = list.iterator(); iter.hasNext();) { value += iter.next() + DELIMITER; @@ -1523,7 +1518,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ public void propertyChange(final PropertyChangeEvent event) { - WorkbenchJob job = new WorkbenchJob(EMPTY_STRING) { + WorkbenchJob job = new WorkbenchJob(IInternalDebugUIConstants.EMPTY_STRING) { public IStatus runInUIThread(IProgressMonitor monitor) { TreeViewer viewer = fLaunchConfigurationView.getTreeViewer(); boolean newvalue = Boolean.valueOf(event.getNewValue().toString()).booleanValue(); 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 8a1d2ddd6..979d2800a 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 @@ -589,7 +589,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe if (DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugUIConstants.PREF_ACTIVATE_WORKBENCH)) { shell.forceActive(); } - String message = ""; //$NON-NLS-1$ + String message = IInternalDebugUIConstants.EMPTY_STRING; if(IInternalDebugUIConstants.PREF_SWITCH_PERSPECTIVE_ON_SUSPEND.equals(preferenceKey)) { if (getPerspectiveDescription(perspectiveId) != null) { message = LaunchConfigurationsMessages.PerspectiveManager_suspend_description; @@ -966,7 +966,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe lctype = lm.getLaunchConfigurationType(type); ldelegate = lm.getLaunchDelegate(delegate); modes = parseModes(mode); - if(lctype != null && !modes.isEmpty() && !"".equals(perspective)) { //$NON-NLS-1$ + if(lctype != null && !modes.isEmpty() && !IInternalDebugUIConstants.EMPTY_STRING.equals(perspective)) { setLaunchPerspective(lctype, modes, ldelegate, perspective); } } @@ -1000,7 +1000,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe * @return the */ private String createModesetString(Set modes) { - String str = ""; //$NON-NLS-1$ + String str = IInternalDebugUIConstants.EMPTY_STRING; if(modes != null) { for(Iterator iter = modes.iterator(); iter.hasNext();) { str += iter.next(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java index 34cc56eff..753df0563 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java @@ -296,7 +296,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende private class SwitchPageJob extends UIJob { private Object fLock = new Object(); private boolean fShowMessagePage = false; - private String fMessage = ""; //$NON-NLS-1$ + private String fMessage = IInternalDebugUIConstants.EMPTY_STRING; private SwitchPageJob() { super("SwitchPageJob");//$NON-NLS-1$ @@ -1898,7 +1898,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende } private String buildLabel(boolean showAddress) { - String label = ""; //$NON-NLS-1$ + String label = IInternalDebugUIConstants.EMPTY_STRING; if (getMemoryBlock() instanceof IMemoryBlockExtension) { label = ((IMemoryBlockExtension)getMemoryBlock()).getExpression(); @@ -2103,7 +2103,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende public String getSelectedAsString() { if (getSelectedAddress() == null) - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; MemoryByte[] bytes = getSelectedAsBytes(); if (bytes.length > 0) @@ -2111,7 +2111,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende return getString(this.getRenderingId(), getSelectedAddress(), bytes); } else - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java index 83f29482e..7bdfc4d15 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ import java.math.BigInteger; import org.eclipse.debug.core.model.MemoryByte; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.IDebugUIConstants; /** @@ -88,7 +89,7 @@ abstract public class AbstractAsyncTextRendering extends AbstractAsyncTableRende try { String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR); if(fCodePage == null) - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; boolean[] invalid = new boolean[data.length]; boolean hasInvalid = false; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java index a2690632e..d2e60e1f1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ package org.eclipse.debug.internal.ui.model.elements; import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; import org.eclipse.jface.resource.ImageDescriptor; @@ -38,7 +39,7 @@ public class RegisterGroupLabelProvider extends DebugElementLabelProvider { if (columnId == null || VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(columnId)) { return super.getLabel(elementPath, context, columnId); } else { - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/IDebugPreferenceConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/IDebugPreferenceConstants.java index c65679c98..3d36510a9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/IDebugPreferenceConstants.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/IDebugPreferenceConstants.java @@ -151,8 +151,8 @@ public interface IDebugPreferenceConstants { public static final String PREF_PROMPT_REMOVE_ALL_BREAKPOINTS = IDebugUIConstants.PLUGIN_ID + ".remove_all_breakpoints_prompt"; //$NON-NLS-1$ /** - * stroes the boolean preference of whether or not to promtp wehen removing all of the breakpopints form a breakpoints - * container. + * stores the boolean preference of whether or not to prompt when removing all of the breakpoints + * from a breakpoints container. * @since 3.3 */ public static final String PREF_PROMPT_REMOVE_BREAKPOINTS_FROM_CONTAINER = IDebugUIConstants.PLUGIN_ID + ".remove_breakpoints_from_container_prompt"; //$NON-NLS-1$ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java index 06a41c34f..82c97cc0e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java @@ -397,7 +397,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement DebugPlugin.getDefault().getPluginPreferences().setValue( LaunchManager.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE, fDeleteConfigs.getSelection()); //save table - String types = ""; //$NON-NLS-1$ + String types = IInternalDebugUIConstants.EMPTY_STRING; TableItem[] items = fTable.getItems(); ILaunchConfigurationType type; for(int i = 0; i < items.length; i++) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java index 63d19f9f9..9264c8990 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java @@ -149,11 +149,11 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I protected void createPanel(Composite parent, String heading) { fMainComposite = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH); SWTFactory.createWrapLabel(fMainComposite, heading, 2); - fMessage = SWTFactory.createWrapLabel(fMainComposite, "", 2, 250); //$NON-NLS-1$ + fMessage = SWTFactory.createWrapLabel(fMainComposite, IInternalDebugUIConstants.EMPTY_STRING, 2, 250); } public void setMessage(String msg) { - fMessage.setText((msg == null ? "" : msg)); //$NON-NLS-1$ + fMessage.setText((msg == null ? IInternalDebugUIConstants.EMPTY_STRING : msg)); } public void refreshPanel(IStructuredSelection selection) { @@ -354,7 +354,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I fPerspectivesPanel.setMessage(DebugPreferencesMessages.LaunchPerspectivePreferencePage_1); return; } - fPerspectivesPanel.setMessage(""); //$NON-NLS-1$ + fPerspectivesPanel.setMessage(IInternalDebugUIConstants.EMPTY_STRING); List fmodes = null; Combo combo = null; Set smodes = null; @@ -362,7 +362,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I smodes = (Set) iter.next(); fmodes = LaunchConfigurationPresentationManager.getDefault().getLaunchModeNames(smodes); if(!fmodes.isEmpty()) { - //add the modeset and create a combo + //add the mode set and create a combo SWTFactory.createLabel(parent, fmodes.toString()+":", 1); //$NON-NLS-1$ combo = SWTFactory.createCombo(parent, SWT.READ_ONLY, 1, fgPerspectiveLabels); String text = getComboSelection(smodes); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java index 721b41174..4b05a776c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java @@ -24,6 +24,7 @@ import org.eclipse.debug.internal.core.LaunchManager; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.DefaultLabelProvider; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.SWTFactory; import org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPresentationManager; import org.eclipse.jface.preference.PreferencePage; @@ -54,18 +55,15 @@ import org.eclipse.ui.model.WorkbenchViewerComparator; * This class provides a preference page for selecting and changing preferred launch delegates for those of them * that have conflicting delegates. * - * Delegates are considered to be conflicting if they are for the same launc configuraiton type, and apply to the same + * Delegates are considered to be conflicting if they are for the same launch configuration type, and apply to the same * mode sets. * * @since 3.3 - * - * TODO create a help topic for this page....it needs a good description - * */ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { /** - * Class to collect and persist attributes to sufficiently describe a dupicate launch delegate + * Class to collect and persist attributes to sufficiently describe a duplicate launch delegate */ class DuplicateDelegate { private ILaunchConfigurationType fType = null; @@ -222,7 +220,7 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc fDescription.setText(((ILaunchDelegate)ss.getFirstElement()).getDescription()); } else { - fDescription.setText(""); //$NON-NLS-1$ + fDescription.setText(IInternalDebugUIConstants.EMPTY_STRING); } } }); 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 ea5ac778d..224bc5625 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 @@ -20,6 +20,7 @@ import org.eclipse.core.variables.IValueVariable; import org.eclipse.core.variables.VariablesPlugin; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.MultipleInputDialog; import org.eclipse.debug.internal.ui.SWTFactory; import org.eclipse.jface.dialogs.IDialogConstants; @@ -662,17 +663,17 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor case 1: String value= variable.getValue(); if (value == null) { - value= ""; //$NON-NLS-1$ + value= IInternalDebugUIConstants.EMPTY_STRING; } return value; case 2: String description= variable.getDescription(); if (description == null) { - description= ""; //$NON-NLS-1$ + description= IInternalDebugUIConstants.EMPTY_STRING; } return description; case 3: - String contribution = ""; //$NON-NLS-1$ + String contribution = IInternalDebugUIConstants.EMPTY_STRING; if (variable.isContributed()) { String pluginId = getVariableManager().getContributingPluginId(variable.getUnderlyingVariable()); if (pluginId != null) { 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 faa9bad5d..d40c47b4c 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 @@ -183,7 +183,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor getPreferenceStore().setValue(IInternalDebugUIConstants.PREF_TRACK_VIEWS, trackViews); if (fResetPressed || !trackViews) { // Reset if the user has pressed reset or chosen to no longer track views - getPreferenceStore().setValue(IInternalDebugUIConstants.PREF_USER_VIEW_BINDINGS, ""); //$NON-NLS-1$ + getPreferenceStore().setValue(IInternalDebugUIConstants.PREF_USER_VIEW_BINDINGS, IInternalDebugUIConstants.EMPTY_STRING); } return super.performOk(); } @@ -211,7 +211,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor * Always disable if "track views" is turned off. */ private void updateResetButton() { - boolean enableReset= !"".equals(getPreferenceStore().getString(IInternalDebugUIConstants.PREF_USER_VIEW_BINDINGS)); //$NON-NLS-1$ + boolean enableReset= !IInternalDebugUIConstants.EMPTY_STRING.equals(getPreferenceStore().getString(IInternalDebugUIConstants.PREF_USER_VIEW_BINDINGS)); // Only enable the button if there are views to clear, the user hasn't pressed the reset // button, and the option to "track views" is turned on. fResetViewsButton.setEnabled(enableReset && !fResetPressed && fTrackViewsButton.getSelection()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java index 7190bd564..e619ecc62 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ import org.eclipse.debug.core.sourcelookup.containers.ArchiveSourceContainer; import org.eclipse.debug.core.sourcelookup.containers.DirectorySourceContainer; import org.eclipse.debug.core.sourcelookup.containers.ExternalArchiveSourceContainer; import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.model.IWorkbenchAdapter; @@ -62,7 +63,7 @@ public class SourceContainerWorkbenchAdapter implements IWorkbenchAdapter { IPath path = new Path(container.getName()); return SourceElementWorkbenchAdapter.getQualifiedName(path); } - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java index f993e2f7d..2e5f10617 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ import java.io.File; import org.eclipse.core.runtime.IPath; import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage; import org.eclipse.debug.core.sourcelookup.containers.ZipEntryStorage; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -58,7 +59,7 @@ public class SourceElementWorkbenchAdapter implements IWorkbenchAdapter { buffer.append(storage.getArchive().getName()); return buffer.toString(); } - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) @@ -84,6 +85,6 @@ public class SourceElementWorkbenchAdapter implements IWorkbenchAdapter { } return buffer.toString(); } - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } } 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 17f7ad955..a8bbafa5e 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 @@ -22,6 +22,7 @@ import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; import org.eclipse.debug.core.sourcelookup.containers.ArchiveSourceContainer; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIMessages; import org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser; import org.eclipse.jface.viewers.ILabelProvider; @@ -43,14 +44,14 @@ public class ArchiveSourceContainerBrowser extends AbstractSourceContainerBrowse private ISelectionStatusValidator validator= new ISelectionStatusValidator() { public IStatus validate(Object[] selection) { if (selection.length == 0) { - return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$ + return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugUIConstants.EMPTY_STRING, null); } for (int i= 0; i < selection.length; i++) { if (!(selection[i] instanceof IFile)) { - return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$ + return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugUIConstants.EMPTY_STRING, null); } } - return new Status(IStatus.OK, DebugUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$ + return new Status(IStatus.OK, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugUIConstants.EMPTY_STRING, null); } }; 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 66fddc1dc..c95e83c9c 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 @@ -64,7 +64,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { * @param shell shell */ public DirectorySourceContainerDialog(Shell shell) { - this(shell, "", DebugUIPlugin.getDefault().getDialogSettings().getBoolean(LAST_SUBDIR_SETTING)); //$NON-NLS-1$ + this(shell, IInternalDebugUIConstants.EMPTY_STRING, DebugUIPlugin.getDefault().getDialogSettings().getBoolean(LAST_SUBDIR_SETTING)); fNewContainer = true; } @@ -73,7 +73,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { * * @param shell shell * @param directory directory to edit or empty string - * @param searchSubfolders whether the search subfolders button should be checked + * @param searchSubfolders whether the search sub-folders button should be checked * @param newContainer */ public DirectorySourceContainerDialog(Shell shell, String directory, boolean searchSubfolders) { @@ -209,7 +209,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog { last = DebugUIPlugin.getDefault().getDialogSettings().get(LAST_PATH_SETTING); } if (last == null) { - last = ""; //$NON-NLS-1$ + last = IInternalDebugUIConstants.EMPTY_STRING; } DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SINGLE); dialog.setText(SourceLookupUIMessages.DirectorySourceContainerDialog_0); 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 82281a49a..b095cc4a3 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 @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIMessages; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; @@ -91,7 +92,7 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog { return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), -1, SourceLookupUIMessages.sourceSearch_folderSelectionError, null); // } } - return new Status(IStatus.OK, DebugUIPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$ + return new Status(IStatus.OK, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugUIConstants.EMPTY_STRING, null); } }; setValidator(validator); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java index a1cab7294..45d444523 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java @@ -11,6 +11,7 @@ package org.eclipse.debug.internal.ui.viewers.model; import org.eclipse.debug.internal.core.commands.Request; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; import org.eclipse.jface.resource.ImageDescriptor; @@ -166,7 +167,7 @@ class LabelUpdate extends Request implements ILabelUpdate { for (int i=0; i<fNumColumns; i++){ // text might be null if the launch has been terminated - fItem.setText(i,(fLabels[i] == null ? "" : fLabels[i])); //$NON-NLS-1$ + fItem.setText(i,(fLabels[i] == null ? IInternalDebugUIConstants.EMPTY_STRING : fLabels[i])); } fItem.setData(PREV_LABEL_KEY, fLabels); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeCursor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeCursor.java index c9670cca6..0462112ec 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeCursor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeCursor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.viewers.model; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; @@ -416,7 +417,7 @@ void paint(Event event) { x += imageSize.width; } String text = row.getText(columnIndex); - if (text != "") { //$NON-NLS-1$ + if (text != IInternalDebugUIConstants.EMPTY_STRING) { Rectangle bounds = row.getBounds(columnIndex); Point extent = gc.stringExtent(text); // Temporary code - need a better way to determine table trim diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java index 32c0b1229..1e1e2445a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.actions.AbstractDebugActionDelegate; import org.eclipse.debug.internal.ui.actions.ActionMessages; import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate; @@ -41,7 +42,6 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel private ContentViewer fViewer; private static final String TAB = "\t"; //$NON-NLS-1$ - private static final String EMPTY_STRING = ""; //$NON-NLS-1$ private static final String SEPARATOR = "line.separator"; //$NON-NLS-1$ private boolean fDone = false; @@ -88,7 +88,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel if(count > 0) { for (int i = 0; i < count; i++) { String text = labels[i]; - if(text != null && !text.trim().equals(EMPTY_STRING)) { + if(text != null && !text.trim().equals(IInternalDebugUIConstants.EMPTY_STRING)) { buffer.append(text+TAB); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java index 6d34eccc9..471e4b601 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java @@ -1024,7 +1024,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi DebugContextViewBindings binding = (DebugContextViewBindings) bindings.next(); binding.saveBindings(document, root, done); } - String prefValue = ""; //$NON-NLS-1$ + String prefValue = IInternalDebugUIConstants.EMPTY_STRING; if (root.hasChildNodes()) { prefValue = DebugPlugin.serializeDocument(document); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java index 9026b3d36..ca0c3f641 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,6 +11,7 @@ package org.eclipse.debug.internal.ui.views.breakpoints; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.RGB; @@ -59,7 +60,7 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I } return container.getOrganizer().getLabel(); } - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } /* (non-Javadoc) 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 b736b65b6..95a5f8468 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 @@ -308,7 +308,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate * default working set or <code>null</code> */ public static void setDefaultWorkingSet(IWorkingSet set) { - String name = ""; //$NON-NLS-1$ + String name = IInternalDebugUIConstants.EMPTY_STRING; if (set != null) { // only consider breakpoint working sets if (IInternalDebugUIConstants.ID_BREAKPOINT_WORKINGSET.equals(set.getId())) { 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 f93d1fef4..03ea24066 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 @@ -18,6 +18,7 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.SWTFactory; import org.eclipse.debug.internal.ui.importexport.breakpoints.EmbeddedBreakpointsViewer; import org.eclipse.debug.internal.ui.views.DebugUIViewsMessages; @@ -185,7 +186,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP if (newText.equals(newText.trim()) == false) errorMessage = DebugUIViewsMessages.BreakpointWorkingSetPage_4; - if (newText.equals("")) { //$NON-NLS-1$ + if (newText.equals(IInternalDebugUIConstants.EMPTY_STRING)) { if (fFirstCheck) { setPageComplete(false); fFirstCheck= false; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java index 18779645a..dc8aec16f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.debug.core.model.ILineBreakpoint; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jface.viewers.IBasicPropertyConstants; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.StructuredViewer; @@ -63,8 +64,8 @@ public class BreakpointsComparator extends ViewerComparator { if (result != 0) { return result; } - String type1= ""; //$NON-NLS-1$ - String type2= ""; //$NON-NLS-1$ + String type1= IInternalDebugUIConstants.EMPTY_STRING; + String type2= IInternalDebugUIConstants.EMPTY_STRING; IMarker marker1= b1.getMarker(); if (!marker1.exists()) { return 0; 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 d1749e0a1..d707450f2 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 @@ -48,6 +48,7 @@ import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage; import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugUIConstants; @@ -115,7 +116,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe * @param encoding the desired encoding for this console */ public ProcessConsole(IProcess process, IConsoleColorProvider colorProvider, String encoding) { - super("", IDebugUIConstants.ID_PROCESS_CONSOLE_TYPE, null, encoding, true); //$NON-NLS-1$ + super(IInternalDebugUIConstants.EMPTY_STRING, IDebugUIConstants.ID_PROCESS_CONSOLE_TYPE, null, encoding, true); fProcess = process; ILaunchConfiguration configuration = process.getLaunch().getLaunchConfiguration(); 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 989368772..01357ae11 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 @@ -153,7 +153,7 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene if (input.length() == 0) { - expressions.add(""); //$NON-NLS-1$ + expressions.add(IInternalDebugUIConstants.EMPTY_STRING); } else { 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 3c27300d3..887ba141b 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -23,6 +23,7 @@ import org.eclipse.debug.core.model.IMemoryBlock; import org.eclipse.debug.core.model.IMemoryBlockExtension; import org.eclipse.debug.internal.ui.DebugUIMessages; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.memory.IMemoryRendering; @@ -458,7 +459,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog { String[] labels = new String[memoryBlocks.length]; for (int i=0; i<memoryBlocks.length; i++) { - String text = ""; //$NON-NLS-1$ + String text = IInternalDebugUIConstants.EMPTY_STRING; if (memoryBlocks[i] instanceof IMemoryBlockExtension) { try { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java index 289650cba..9257878e5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,6 +24,7 @@ import org.eclipse.debug.core.model.IDebugElement; import org.eclipse.debug.core.model.IDebugTarget; import org.eclipse.debug.core.model.IMemoryBlockRetrieval; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -145,7 +146,7 @@ public class MemoryViewUtil { public IStatus runInUIThread(IProgressMonitor monitor) { // open error for the exception - String detail = ""; //$NON-NLS-1$ + String detail = IInternalDebugUIConstants.EMPTY_STRING; if (e != null) detail = e.getMessage(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java index bb8c32ccc..3fdc9ea13 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java @@ -15,6 +15,7 @@ package org.eclipse.debug.internal.ui.views.memory; import org.eclipse.debug.core.model.IMemoryBlockRetrieval; import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension; import org.eclipse.debug.internal.ui.DebugUIMessages; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.SWTFactory; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.dialogs.IDialogConstants; @@ -137,7 +138,7 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen String lengthText = lengthInput.getText(); String input = expressionInput.getText(); - if (input == null || input.equals("") || lengthText == null || lengthText.equals("")) //$NON-NLS-1$ //$NON-NLS-2$ + if (input == null || input.equals(IInternalDebugUIConstants.EMPTY_STRING) || lengthText == null || lengthText.equals(IInternalDebugUIConstants.EMPTY_STRING)) { getButton(IDialogConstants.OK_ID).setEnabled(false); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java index 2c3cfe2f8..356b1764a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java @@ -24,6 +24,7 @@ import org.eclipse.debug.core.model.IMemoryBlock; import org.eclipse.debug.core.model.IMemoryBlockExtension; import org.eclipse.debug.core.model.IMemoryBlockRetrieval; import org.eclipse.debug.internal.ui.DebugUIMessages; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.contexts.DebugContextEvent; import org.eclipse.debug.ui.contexts.IDebugContextListener; @@ -177,8 +178,8 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega } private void getLabels(final IMemoryBlock memBlk) { - StringBuffer text = new StringBuffer(""); //$NON-NLS-1$ - String label = new String(""); //$NON-NLS-1$ + StringBuffer text = new StringBuffer(IInternalDebugUIConstants.EMPTY_STRING); + String label = new String(IInternalDebugUIConstants.EMPTY_STRING); if (memBlk instanceof IMemoryBlockExtension) { String expression = ((IMemoryBlockExtension)memBlk).getExpression(); if (expression == null) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java index ae822df0c..59040ea9e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java @@ -25,7 +25,7 @@ class ViewPaneOrientationAction extends Action ViewPaneOrientationAction(MemoryView view, int orientation) { - super("", AS_RADIO_BUTTON); //$NON-NLS-1$ + super(IInternalDebugUIConstants.EMPTY_STRING, AS_RADIO_BUTTON); fView = view; fOrientation = orientation; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java index 3b2b5a0e6..8956d0dd3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -25,6 +25,7 @@ import org.eclipse.debug.core.model.IDebugTarget; import org.eclipse.debug.core.model.IMemoryBlock; import org.eclipse.debug.internal.core.LaunchManager; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.memory.IMemoryRendering; import org.eclipse.debug.ui.memory.IMemoryRenderingContainer; @@ -243,7 +244,7 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{ private void storeRenderings() { Preferences prefs = DebugUIPlugin.getDefault().getPluginPreferences(); - String renderingsStr= ""; //$NON-NLS-1$ + String renderingsStr= IInternalDebugUIConstants.EMPTY_STRING; try { renderingsStr= getRenderingsAsXML(); } catch (IOException e) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java index 4fa94076d..7c1b8cba5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java @@ -886,7 +886,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { TableItem item = getTable().getItem(idx); return item.getText(columnIndex); } - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } public void addListener(ILabelProviderListener listener) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java index 332409881..57d20298f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java @@ -175,7 +175,7 @@ public class CopyTableRenderingToClipboardAction extends Action TableItem[] tableItems = table.getItems(); String tableAsString = new String(); tableAsString = concatenateTableAsString(tableItems); - if (!tableAsString.equals("")) { //$NON-NLS-1$ + if (!tableAsString.equals(IInternalDebugUIConstants.EMPTY_STRING)) { TextTransfer plainTextTransfer = TextTransfer.getInstance(); clip.setContents(new Object[] {tableAsString}, new Transfer[] {plainTextTransfer}); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java index 345558987..6198bfb6a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,6 +14,7 @@ package org.eclipse.debug.internal.ui.views.memory.renderings; import java.util.Vector; import org.eclipse.debug.internal.ui.DebugUIMessages; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TrayDialog; @@ -122,7 +123,7 @@ public class GoToAddressDialog extends TrayDialog implements ModifyListener{ String input = expressionInput.getText(); - if (input == null || input.equals("")) //$NON-NLS-1$ + if (input == null || input.equals(IInternalDebugUIConstants.EMPTY_STRING)) { getButton(IDialogConstants.OK_ID).setEnabled(false); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java index ecf9ec972..8ef675d21 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.model.IDebugTarget; import org.eclipse.debug.core.model.IIndexedValue; import org.eclipse.debug.core.model.IVariable; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; /** * A parition (subrange) of values of an indexed value @@ -68,7 +69,7 @@ public class IndexedValuePartition implements IIndexedValue { * @see org.eclipse.debug.core.model.IValue#getValueString() */ public String getValueString() { - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } /* (non-Javadoc) 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 7046169da..8984c1d5f 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 @@ -20,6 +20,7 @@ import org.eclipse.debug.core.model.IDebugTarget; import org.eclipse.debug.core.model.IIndexedValue; import org.eclipse.debug.core.model.IValue; import org.eclipse.debug.core.model.IVariable; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.IDebugUIConstants; /** @@ -92,7 +93,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl IVariable variable = (IVariable) fOriginalVariable; return variable.getReferenceTypeName(); } - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/StatusLineContributionItem.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/StatusLineContributionItem.java index 224fcaa6b..86dd6a37e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/StatusLineContributionItem.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/StatusLineContributionItem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,6 +17,7 @@ import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.jface.action.ContributionItem; import org.eclipse.jface.action.IContributionManager; import org.eclipse.jface.action.StatusLineLayoutData; @@ -33,7 +34,7 @@ public class StatusLineContributionItem extends ContributionItem { * initialized. */ private Composite statusLine = null; - private String text= ""; //$NON-NLS-1$ + private String text= IInternalDebugUIConstants.EMPTY_STRING; private int widthHint = -1; public StatusLineContributionItem(String id) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java index 52606da5e..28753b96f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java @@ -195,7 +195,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable, } // When selecting a index partition, clear the pane if (val instanceof IndexedValuePartition) { - detailComputed(null, ""); //$NON-NLS-1$ + detailComputed(null, IInternalDebugUIConstants.EMPTY_STRING); val = null; } if (element instanceof String) { @@ -220,7 +220,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable, // or use the message, if the variable was a java.lang.String if (!fComputed){ if (message == null) { - detailComputed(null,""); //$NON-NLS-1$ + detailComputed(null,IInternalDebugUIConstants.EMPTY_STRING); } else { detailComputed(null, message); } @@ -439,7 +439,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable, TextViewerAction textAction= new TextViewerAction(fSourceViewer, ISourceViewer.CONTENTASSIST_PROPOSALS); textAction.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS); - textAction.configureAction(DetailMessages.DefaultDetailPane_Co_ntent_Assist_3, "",""); //$NON-NLS-1$ //$NON-NLS-2$ + textAction.configureAction(DetailMessages.DefaultDetailPane_Co_ntent_Assist_3, IInternalDebugUIConstants.EMPTY_STRING,IInternalDebugUIConstants.EMPTY_STRING); 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)); @@ -451,25 +451,25 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable, handlerService.activateHandler(textAction.getActionDefinitionId(), actionHandler); textAction= new TextViewerAction(fSourceViewer, ITextOperationTarget.SELECT_ALL); - textAction.configureAction(DetailMessages.DefaultDetailPane_Select__All_5, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ + textAction.configureAction(DetailMessages.DefaultDetailPane_Select__All_5, IInternalDebugUIConstants.EMPTY_STRING,IInternalDebugUIConstants.EMPTY_STRING); textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.SELECT_ALL); PlatformUI.getWorkbench().getHelpSystem().setHelp(textAction, IDebugHelpContextIds.DETAIL_PANE_SELECT_ALL_ACTION); setAction(DETAIL_SELECT_ALL_ACTION, textAction); textAction= new TextViewerAction(fSourceViewer, ITextOperationTarget.COPY); - textAction.configureAction(DetailMessages.DefaultDetailPane__Copy_8, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ + textAction.configureAction(DetailMessages.DefaultDetailPane__Copy_8, IInternalDebugUIConstants.EMPTY_STRING,IInternalDebugUIConstants.EMPTY_STRING); textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.COPY); PlatformUI.getWorkbench().getHelpSystem().setHelp(textAction, IDebugHelpContextIds.DETAIL_PANE_COPY_ACTION); setAction(DETAIL_COPY_ACTION, textAction); textAction= new TextViewerAction(fSourceViewer, ITextOperationTarget.CUT); - textAction.configureAction(DetailMessages.DefaultDetailPane_Cu_t_11, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ + textAction.configureAction(DetailMessages.DefaultDetailPane_Cu_t_11, IInternalDebugUIConstants.EMPTY_STRING,IInternalDebugUIConstants.EMPTY_STRING); textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.CUT); PlatformUI.getWorkbench().getHelpSystem().setHelp(textAction, IDebugHelpContextIds.DETAIL_PANE_CUT_ACTION); setAction(DETAIL_CUT_ACTION, textAction); textAction= new TextViewerAction(fSourceViewer, ITextOperationTarget.PASTE); - textAction.configureAction(DetailMessages.DefaultDetailPane__Paste_14, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ + textAction.configureAction(DetailMessages.DefaultDetailPane__Paste_14, IInternalDebugUIConstants.EMPTY_STRING,IInternalDebugUIConstants.EMPTY_STRING); textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.PASTE); PlatformUI.getWorkbench().getHelpSystem().setHelp(textAction, IDebugHelpContextIds.DETAIL_PANE_PASTE_ACTION); setAction(ActionFactory.PASTE.getId(), textAction); @@ -675,7 +675,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable, fDetailJob.cancel(); } fLastDisplayed = null; - fDetailDocument.set(""); //$NON-NLS-1$ + fDetailDocument.set(IInternalDebugUIConstants.EMPTY_STRING); fSourceViewer.setEditable(false); } @@ -718,7 +718,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable, protected String getCursorPosition() { if (fSourceViewer == null) { - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } StyledText styledText= fSourceViewer.getTextWidget(); @@ -726,7 +726,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable, IDocument document= fSourceViewer.getDocument(); if (document == null) { - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } try { @@ -748,7 +748,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable, return MessageFormat.format(fPositionLabelPattern, fPositionLabelPatternArguments); } catch (BadLocationException x) { - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } } 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 f3234bb3d..0738767fd 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 @@ -109,8 +109,6 @@ public class CommonTab extends AbstractLaunchConfigurationTab { } } - private static final String EMPTY_STRING = ""; //$NON-NLS-1$ - /** * This attribute exists solely for the purpose of making sure that invalid shared locations * can be revertible. This attribute is not saveable and will never appear in a saved @@ -360,7 +358,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { private void createEncodingComponent(Composite parent) { Group group = SWTFactory.createGroup(parent, LaunchConfigurationsMessages.CommonTab_1, 2, 1, GridData.FILL_BOTH); - fDefaultEncodingButton = createRadioButton(group, ""); //$NON-NLS-1$ + fDefaultEncodingButton = createRadioButton(group, IInternalDebugUIConstants.EMPTY_STRING); GridData gd = new GridData(SWT.BEGINNING, SWT.NORMAL, true, false); gd.horizontalSpan = 2; fDefaultEncodingButton.setLayoutData(gd); @@ -438,7 +436,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { } private String getDefaultSharedConfigLocation(ILaunchConfiguration config) { - String path = EMPTY_STRING; + String path = IInternalDebugUIConstants.EMPTY_STRING; try { IResource[] res = config.getMappedResources(); if(res != null) { @@ -503,7 +501,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab { setSharedEnabled(isShared); fSharedLocationText.setText(getDefaultSharedConfigLocation(configuration)); if(isShared) { - String containerName = EMPTY_STRING; + String containerName = IInternalDebugUIConstants.EMPTY_STRING; IFile file = configuration.getFile(); if (file != null) { IContainer parent = file.getParent(); 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 5d31e9a49..7c70b91db 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 @@ -14,6 +14,7 @@ import org.eclipse.core.variables.IDynamicVariable; import org.eclipse.core.variables.IStringVariable; import org.eclipse.core.variables.VariablesPlugin; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.SWTFactory; import org.eclipse.debug.internal.ui.preferences.StringVariablePreferencePage; import org.eclipse.debug.internal.ui.stringsubstitution.IArgumentSelector; @@ -249,7 +250,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { text = variable.getDescription(); } if (text == null) { - text = ""; //$NON-NLS-1$ + text = IInternalDebugUIConstants.EMPTY_STRING; } fArgumentText.setEnabled(argEnabled); fArgumentButton.setEnabled(buttonEnabled); 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 57e1f7ed7..31af359c5 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 @@ -16,6 +16,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.ILaunchHistoryChangedListener; import org.eclipse.debug.internal.ui.ILaunchLabelChangedListener; import org.eclipse.debug.internal.ui.actions.ActionMessages; @@ -221,7 +222,7 @@ public abstract class AbstractLaunchHistoryAction implements IWorkbenchWindowPul } else { label = ActionMessages.AbstractLaunchHistoryAction_4; } - if("".equals(launchName)) { //$NON-NLS-1$ + if(IInternalDebugUIConstants.EMPTY_STRING.equals(launchName)) { return MessageFormat.format(ActionMessages.AbstractLaunchHistoryAction_5, new String[] {label}); } else { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java index f2ccf1900..b93dcbb46 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java @@ -153,7 +153,7 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress { marker.setAttribute(IImportExportConstants.IE_NODE_TYPE, child.getString(IImportExportConstants.IE_NODE_TYPE)); marker.setAttribute(IImportExportConstants.CHARSTART, child.getString(IImportExportConstants.CHARSTART)); childnodes = child.getChildren(IImportExportConstants.IE_NODE_ATTRIB); - String workingsets = ""; //$NON-NLS-1$ + String workingsets = IInternalDebugUIConstants.EMPTY_STRING; for (int j = 0; j < childnodes.length; j++) { // get the attribute and try to convert it to either Integer, Boolean or leave it alone (String) String name = childnodes[j].getString(IImportExportConstants.IE_NODE_NAME), diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java index 59d3f570c..202797069 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IMemoryBlock; import org.eclipse.debug.core.model.IMemoryBlockExtension; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.views.memory.PropertyChangeNotifier; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.jface.action.IMenuListener; @@ -244,16 +245,16 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements public String getLabel() { if (fMemoryBlock == null) - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; - StringBuffer label = new StringBuffer(""); //$NON-NLS-1$ + StringBuffer label = new StringBuffer(IInternalDebugUIConstants.EMPTY_STRING); if (fMemoryBlock instanceof IMemoryBlockExtension) { String expression = ((IMemoryBlockExtension)fMemoryBlock).getExpression(); if (expression == null) - expression = ""; //$NON-NLS-1$ + expression = IInternalDebugUIConstants.EMPTY_STRING; label.append(expression); 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 87f305732..814e388c9 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 @@ -1988,7 +1988,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering } private String buildLabel(boolean showAddress) { - String label = ""; //$NON-NLS-1$ + String label = IInternalDebugUIConstants.EMPTY_STRING; if (getMemoryBlock() instanceof IMemoryBlockExtension) { label = ((IMemoryBlockExtension)getMemoryBlock()).getExpression(); @@ -3190,7 +3190,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering public String getSelectedAsString() { if (isAddressOutOfRange(fSelectedAddress)) - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; int col = fTableCursor.getColumn(); TableItem rowItem = fTableCursor.getRow(); @@ -3204,7 +3204,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering // check precondition if (col > getBytesPerLine()/getBytesPerColumn()) { - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; } TableItem tableItem = getTableViewer().getTable().getItem(row); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java index 06a441749..9841dc961 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,6 +15,7 @@ import java.math.BigInteger; import org.eclipse.debug.core.model.MemoryByte; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.IDebugUIConstants; /** @@ -87,7 +88,7 @@ abstract public class AbstractTextRendering extends AbstractTableRendering { try { String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR); if(fCodePage == null) - return ""; //$NON-NLS-1$ + return IInternalDebugUIConstants.EMPTY_STRING; boolean[] invalid = new boolean[data.length]; boolean hasInvalid = false; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java index 886d5a049..ba1da82fe 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,6 +13,7 @@ package org.eclipse.debug.ui.sourcelookup; import com.ibm.icu.text.MessageFormat; import org.eclipse.core.runtime.PlatformObject; +import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIMessages; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugModelPresentation; @@ -53,7 +54,7 @@ public class CommonSourceNotFoundEditorInput extends PlatformObject implements I pres.dispose(); } if (fLabel == null) { - fLabel = ""; //$NON-NLS-1$ + fLabel = IInternalDebugUIConstants.EMPTY_STRING; } } |