diff options
Diffstat (limited to 'org.eclipse.ui.externaltools')
17 files changed, 94 insertions, 94 deletions
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java index debd46e6f..0725e16bb 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java @@ -101,7 +101,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { * @param parent the composite to create the controls in */ protected void createLaunchInBackgroundComposite(Composite parent) { - fLaunchInBackgroundButton = createCheckButton(parent, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_14); //$NON-NLS-1$ + fLaunchInBackgroundButton = createCheckButton(parent, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_14); GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); data.horizontalSpan = 2; fLaunchInBackgroundButton.setLayoutData(data); @@ -115,18 +115,18 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { protected void createBuildScheduleComponent(Composite parent) { if (fCreateBuildScheduleComponent) { Label label= new Label(parent, SWT.NONE); - label.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Run_this_builder_for__1); //$NON-NLS-1$ + label.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Run_this_builder_for__1); label.setFont(parent.getFont()); - afterClean= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Full_builds_2, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Full, 2); //$NON-NLS-1$ //$NON-NLS-2$ - manualBuild= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Incremental_builds_4, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Inc, 2); //$NON-NLS-1$ //$NON-NLS-2$ - autoBuildButton= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Auto_builds__Not_recommended__6, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Auto, 2); //$NON-NLS-1$ //$NON-NLS-2$ - fDuringClean= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_0, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_1, 2); //$NON-NLS-1$ //$NON-NLS-2$ + afterClean= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Full_builds_2, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Full, 2); + manualBuild= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Incremental_builds_4, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Inc, 2); + autoBuildButton= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab__Auto_builds__Not_recommended__6, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Auto, 2); + fDuringClean= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_0, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_1, 2); createVerticalSpacer(parent, 2); } - workingSetButton= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_workingSet_label, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_workingSet_tooltip, 1); //$NON-NLS-1$ //$NON-NLS-2$ - specifyResources= createPushButton(parent, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_13, null); //$NON-NLS-1$ + workingSetButton= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_workingSet_label, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_workingSet_tooltip, 1); + specifyResources= createPushButton(parent, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_13, null); GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_END); specifyResources.setLayoutData(gd); specifyResources.addSelectionListener(new SelectionAdapter() { @@ -135,7 +135,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { } }); Label label= new Label(parent, SWT.NONE); - label.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_2); //$NON-NLS-1$ + label.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_2); label.setFont(parent.getFont()); } @@ -275,7 +275,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ public String getName() { - return ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Build_Options_9; //$NON-NLS-1$ + return ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Build_Options_9; } /* (non-Javadoc) @@ -294,12 +294,12 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { if (fCreateBuildScheduleComponent) { boolean buildKindSelected= afterClean.getSelection() || manualBuild.getSelection() || autoBuildButton.getSelection() || fDuringClean.getSelection(); if (!buildKindSelected) { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_buildKindError); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_buildKindError); return false; } } if (workingSetButton.getSelection() && (workingSet == null || workingSet.getElements().length == 0)) { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_16); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_16); return false; } @@ -319,7 +319,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { IWorkingSetManager workingSetManager= PlatformUI.getWorkbench().getWorkingSetManager(); if (workingSet == null){ - workingSet = workingSetManager.createWorkingSet(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_15, new IAdaptable[0]); //$NON-NLS-1$ + workingSet = workingSetManager.createWorkingSet(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_15, new IAdaptable[0]); } IWorkingSetEditWizard wizard= workingSetManager.createWorkingSetEditWizard(workingSet); WizardDialog dialog = new WizardDialog(ExternalToolsPlugin.getStandardDisplay().getActiveShell(), wizard); diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java index d9d5499a6..37c28ffcb 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java @@ -162,15 +162,15 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa buttonComposite.setLayoutData(gridData); buttonComposite.setFont(parent.getFont()); - workspaceLocationButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Browse_Workspace____3, null); //$NON-NLS-1$ + workspaceLocationButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Browse_Workspace____3, null); workspaceLocationButton.addSelectionListener(fListener); addControlAccessibleListener(workspaceLocationButton, group.getText() + " " + workspaceLocationButton.getText()); //$NON-NLS-1$ - fileLocationButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Brows_e_File_System____4, null); //$NON-NLS-1$ + fileLocationButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Brows_e_File_System____4, null); fileLocationButton.addSelectionListener(fListener); addControlAccessibleListener(fileLocationButton, group.getText() + " " + fileLocationButton.getText()); //$NON-NLS-1$ - variablesLocationButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_31, null); //$NON-NLS-1$ + variablesLocationButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_31, null); variablesLocationButton.addSelectionListener(fListener); addControlAccessibleListener(variablesLocationButton, group.getText() + " " + variablesLocationButton.getText()); //$NON-NLS-1$ } @@ -179,7 +179,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa * Returns the label used for the location widgets. Subclasses may wish to override. */ protected String getLocationLabel() { - return ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Location___2; //$NON-NLS-1$ + return ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Location___2; } /** @@ -215,15 +215,15 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa buttonComposite.setLayoutData(gridData); buttonComposite.setFont(parent.getFont()); - workspaceWorkingDirectoryButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Browse_Wor_kspace____6, null); //$NON-NLS-1$ + workspaceWorkingDirectoryButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Browse_Wor_kspace____6, null); workspaceWorkingDirectoryButton.addSelectionListener(fListener); addControlAccessibleListener(workspaceWorkingDirectoryButton, group.getText() + " " + workspaceWorkingDirectoryButton.getText()); //$NON-NLS-1$ - fileWorkingDirectoryButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Browse_F_ile_System____7, null); //$NON-NLS-1$ + fileWorkingDirectoryButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Browse_F_ile_System____7, null); fileWorkingDirectoryButton.addSelectionListener(fListener); addControlAccessibleListener(fileWorkingDirectoryButton, group.getText() + " " + fileLocationButton.getText()); //$NON-NLS-1$ - variablesWorkingDirectoryButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_32, null); //$NON-NLS-1$ + variablesWorkingDirectoryButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_32, null); variablesWorkingDirectoryButton.addSelectionListener(fListener); addControlAccessibleListener(variablesWorkingDirectoryButton, group.getText() + " " + variablesWorkingDirectoryButton.getText()); //$NON-NLS-1$ } @@ -233,7 +233,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa * Subclasses may wish to override. */ protected String getWorkingDirectoryLabel() { - return ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Working__Directory__5; //$NON-NLS-1$ + return ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Working__Directory__5; } /** @@ -244,7 +244,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa */ protected void createArgumentComponent(Composite parent) { Group group = new Group(parent, SWT.NONE); - String groupName = ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Arguments___1; //$NON-NLS-1$ + String groupName = ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Arguments___1; group.setText(groupName); GridLayout layout = new GridLayout(); layout.numColumns = 1; @@ -271,12 +271,12 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa composite.setLayoutData(gridData); composite.setFont(parent.getFont()); - argumentVariablesButton= createPushButton(composite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Varia_bles____2, null); //$NON-NLS-1$ + argumentVariablesButton= createPushButton(composite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Varia_bles____2, null); argumentVariablesButton.addSelectionListener(fListener); addControlAccessibleListener(argumentVariablesButton, argumentVariablesButton.getText()); // need to strip the mnemonic from buttons Label instruction = new Label(group, SWT.NONE); - instruction.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_3); //$NON-NLS-1$ + instruction.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_3); gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL); gridData.horizontalSpan = 2; instruction.setLayoutData(gridData); @@ -310,7 +310,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa try { workingDir= configuration.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, ""); //$NON-NLS-1$ } catch (CoreException ce) { - ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_10, ce); //$NON-NLS-1$ + ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_10, ce); } workDirectoryField.setText(workingDir); } @@ -324,7 +324,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa try { location= configuration.getAttribute(IExternalToolConstants.ATTR_LOCATION, ""); //$NON-NLS-1$ } catch (CoreException ce) { - ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_10, ce); //$NON-NLS-1$ + ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_10, ce); } locationField.setText(location); } @@ -338,7 +338,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa try { arguments= configuration.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, ""); //$NON-NLS-1$ } catch (CoreException ce) { - ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_7, ce); //$NON-NLS-1$ + ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_7, ce); } argumentField.setText(arguments); } @@ -377,7 +377,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName() */ public String getName() { - return ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Main_17; //$NON-NLS-1$ + return ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Main_17; } /* (non-Javadoc) @@ -403,9 +403,9 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa if (location.length() < 1) { if (newConfig) { setErrorMessage(null); - setMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_30); //$NON-NLS-1$ + setMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_30); } else { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_External_tool_location_cannot_be_empty_18); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_External_tool_location_cannot_be_empty_18); setMessage(null); } return false; @@ -425,13 +425,13 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa File file = new File(expandedLocation); if (!file.exists()) { // The file does not exist. if (!newConfig) { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_External_tool_location_does_not_exist_19); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_External_tool_location_does_not_exist_19); } return false; } if (!file.isFile()) { if (!newConfig) { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_External_tool_location_specified_is_not_a_file_20); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_External_tool_location_specified_is_not_a_file_20); } return false; } @@ -494,11 +494,11 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa File file = new File(expandedDir); if (!file.exists()) { // The directory does not exist. - setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_External_tool_working_directory_does_not_exist_or_is_invalid_21); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_External_tool_working_directory_does_not_exist_or_is_invalid_21); return false; } if (!file.isDirectory()) { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Not_a_directory); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Not_a_directory); return false; } return true; @@ -524,7 +524,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa */ protected void handleWorkspaceLocationButtonSelected() { ResourceSelectionDialog dialog; - dialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Select_a_resource_22); //$NON-NLS-1$ + dialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Select_a_resource_22); dialog.open(); Object[] results = dialog.getResult(); if (results == null || results.length < 1) { @@ -545,7 +545,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa getShell(), ResourcesPlugin.getWorkspace().getRoot(), false, - ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_23); //$NON-NLS-1$ + ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_23); containerDialog.open(); Object[] resource = containerDialog.getResult(); String text= null; @@ -570,7 +570,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa */ protected void handleFileWorkingDirectoryButtonSelected() { DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SAVE); - dialog.setMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_23); //$NON-NLS-1$ + dialog.setMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_23); dialog.setFilterPath(workDirectoryField.getText()); String text= dialog.open(); if (text != null) { diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java index cf06a56e3..4016808df 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java @@ -64,11 +64,11 @@ public class ExternalToolsUtil { public static IPath getLocation(ILaunchConfiguration configuration) throws CoreException { String location = configuration.getAttribute(IExternalToolConstants.ATTR_LOCATION, (String) null); if (location == null) { - abort(MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_Location_not_specified_by__0__1, new String[] { configuration.getName()}), null, 0); //$NON-NLS-1$ + abort(MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_Location_not_specified_by__0__1, new String[] { configuration.getName()}), null, 0); } else { String expandedLocation = getStringVariableManager().performStringSubstitution(location); if (expandedLocation == null || expandedLocation.length() == 0) { - String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_invalidLocation__0_, new Object[] { configuration.getName()}); //$NON-NLS-1$ + String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_invalidLocation__0_, new Object[] { configuration.getName()}); abort(msg, null, 0); } else { File file = new File(expandedLocation); @@ -76,7 +76,7 @@ public class ExternalToolsUtil { return new Path(expandedLocation); } - String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_invalidLocation__0_, new Object[] { configuration.getName()}); //$NON-NLS-1$ + String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_invalidLocation__0_, new Object[] { configuration.getName()}); abort(msg, null, 0); } } @@ -120,7 +120,7 @@ public class ExternalToolsUtil { if (path.isDirectory()) { return new Path(expandedLocation); } - String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_invalidDirectory__0_, new Object[] { expandedLocation, configuration.getName()}); //$NON-NLS-1$ + String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_invalidDirectory__0_, new Object[] { expandedLocation, configuration.getName()}); abort(msg, null, 0); } } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/BuilderUtils.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/BuilderUtils.java index 61b96f4bb..2759e9cd0 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/BuilderUtils.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/BuilderUtils.java @@ -136,7 +136,7 @@ public class BuilderUtils { } catch (CoreException exception) { Shell shell= ExternalToolsPlugin.getActiveWorkbenchShell(); if (shell != null) { - MessageDialog.openError(shell, ExternalToolsModelMessages.BuilderUtils_5, ExternalToolsModelMessages.BuilderUtils_6); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openError(shell, ExternalToolsModelMessages.BuilderUtils_5, ExternalToolsModelMessages.BuilderUtils_6); } return null; } @@ -277,7 +277,7 @@ public class BuilderUtils { */ public static ILaunchConfiguration duplicateConfiguration(IProject project, ILaunchConfiguration config) throws CoreException { Map attributes= config.getAttributes(); - String newName= new StringBuffer(config.getName()).append(ExternalToolsModelMessages.BuilderUtils_7).toString(); //$NON-NLS-1$ + String newName= new StringBuffer(config.getName()).append(ExternalToolsModelMessages.BuilderUtils_7).toString(); newName= DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(newName); ILaunchConfigurationType newType= getConfigurationDuplicationType(config); ILaunchConfigurationWorkingCopy newWorkingCopy= newType.newInstance(getBuilderFolder(project, true), newName); diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java index 3c72c3447..0f66a49f2 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java @@ -68,7 +68,7 @@ public final class ExternalToolBuilder extends IncrementalProjectBuilder { ILaunchConfiguration config= BuilderUtils.configFromBuildCommandArgs(getProject(), args, new String[1]); if (config == null) { - throw ExternalToolsPlugin.newError(ExternalToolsModelMessages.ExternalToolBuilder_0, null); //$NON-NLS-1$ + throw ExternalToolsPlugin.newError(ExternalToolsModelMessages.ExternalToolBuilder_0, null); } IProject[] projectsWithinScope= null; IResource[] resources = ExternalToolsUtil.getResourcesForBuildScope(config); @@ -166,7 +166,7 @@ public final class ExternalToolBuilder extends IncrementalProjectBuilder { } private void launchBuild(int kind, ILaunchConfiguration config, IProgressMonitor monitor) throws CoreException { - monitor.subTask(MessageFormat.format(ExternalToolsModelMessages.ExternalToolBuilder_Running__0_____1, new String[] { config.getName()})); //$NON-NLS-1$ + monitor.subTask(MessageFormat.format(ExternalToolsModelMessages.ExternalToolBuilder_Running__0_____1, new String[] { config.getName()})); buildStarted(kind); // The default value for "launch in background" is true in debug core. If // the user doesn't go through the UI, the new attribute won't be set. This means diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ImageDescriptorRegistry.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ImageDescriptorRegistry.java index fd6bc765f..36fd08585 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ImageDescriptorRegistry.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ImageDescriptorRegistry.java @@ -62,7 +62,7 @@ public class ImageDescriptorRegistry { if (result != null) return result; - Assert.isTrue(fDisplay == ExternalToolsPlugin.getStandardDisplay(), ExternalToolsModelMessages.ImageDescriptorRegistry_Allocating_image_for_wrong_display_1); //$NON-NLS-1$ + Assert.isTrue(fDisplay == ExternalToolsPlugin.getStandardDisplay(), ExternalToolsModelMessages.ImageDescriptorRegistry_Allocating_image_for_wrong_display_1); result= descriptor.createImage(); if (result != null) fRegistry.put(descriptor, result); diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java index 27b25aa86..8d4149518 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java @@ -355,14 +355,14 @@ public final class ExternalToolMigration { try { runInBackground = config.getAttribute(ATTR_RUN_IN_BACKGROUND, runInBackground); } catch (CoreException e) { - ExternalToolsPlugin.getDefault().log(ExternalToolsUIMessages.ExternalToolMigration_37, e); //$NON-NLS-1$ + ExternalToolsPlugin.getDefault().log(ExternalToolsUIMessages.ExternalToolMigration_37, e); } try { ILaunchConfigurationWorkingCopy workingCopy= config.getWorkingCopy(); workingCopy.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, runInBackground); config= workingCopy.doSave(); } catch (CoreException e) { - ExternalToolsPlugin.getDefault().log(ExternalToolsUIMessages.ExternalToolMigration_38, e); //$NON-NLS-1$ + ExternalToolsPlugin.getDefault().log(ExternalToolsUIMessages.ExternalToolMigration_38, e); } } return config; diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderLabelProvider.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderLabelProvider.java index 5f8e79c2e..3d3f07913 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderLabelProvider.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderLabelProvider.java @@ -42,7 +42,7 @@ class BuilderLabelProvider extends LabelProvider { } else if (element instanceof ILaunchConfiguration || element instanceof ILaunchConfigurationType) { return getDebugModelText(element); } else if (element instanceof ErrorConfig) { - return ExternalToolsUIMessages.BuilderPropertyPage_invalidBuildTool; //$NON-NLS-1$ + return ExternalToolsUIMessages.BuilderPropertyPage_invalidBuildTool; } return super.getText(element); } @@ -70,7 +70,7 @@ class BuilderLabelProvider extends LabelProvider { if (extension != null) { builderName = extension.getLabel(); } else { - builderName = MessageFormat.format(ExternalToolsUIMessages.BuilderPropertyPage_missingBuilder, new Object[] { builderID }); //$NON-NLS-1$ + builderName = MessageFormat.format(ExternalToolsUIMessages.BuilderPropertyPage_missingBuilder, new Object[] { builderID }); } return builderName; } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java index fde835601..35cd99269 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java @@ -206,7 +206,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta for (int i = 0; i < commands.length; i++) { String[] version= new String[] {""}; //$NON-NLS-1$ ILaunchConfiguration config = BuilderUtils.configFromBuildCommandArgs(project, commands[i].getArguments(), version); - if (BuilderUtils.VERSION_2_1.equals(version[0])) { //$NON-NLS-1$ + if (BuilderUtils.VERSION_2_1.equals(version[0])) { // Storing the .project file of a project with 2.1 configs, will // edit the file in a way that isn't backwards compatible. projectNeedsMigration= true; @@ -218,9 +218,9 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta if (shell == null) { return; } - IStatus status = new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, 0, MessageFormat.format(ExternalToolsUIMessages.BuilderPropertyPage_Exists, new String[]{config.getLocation().toOSString()}), null); //$NON-NLS-1$ - ErrorDialog.openError(getShell(), ExternalToolsUIMessages.BuilderPropertyPage_errorTitle, //$NON-NLS-1$ - MessageFormat.format(ExternalToolsUIMessages.BuilderPropertyPage_External_Tool_Builder__0__Not_Added_2, new String[]{config.getName()}), //$NON-NLS-1$ + IStatus status = new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, 0, MessageFormat.format(ExternalToolsUIMessages.BuilderPropertyPage_Exists, new String[]{config.getLocation().toOSString()}), null); + ErrorDialog.openError(getShell(), ExternalToolsUIMessages.BuilderPropertyPage_errorTitle, + MessageFormat.format(ExternalToolsUIMessages.BuilderPropertyPage_External_Tool_Builder__0__Not_Added_2, new String[]{config.getName()}), status); userHasMadeChanges= true; } else { @@ -249,7 +249,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta if (shell == null) { return; } - MessageDialogWithToggle dialog= MessageDialogWithToggle.openYesNoQuestion(shell, ExternalToolsUIMessages.BuilderPropertyPage_0, ExternalToolsUIMessages.BuilderPropertyPage_1, ExternalToolsUIMessages.BuilderPropertyPage_2, false, null, null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + MessageDialogWithToggle dialog= MessageDialogWithToggle.openYesNoQuestion(shell, ExternalToolsUIMessages.BuilderPropertyPage_0, ExternalToolsUIMessages.BuilderPropertyPage_1, ExternalToolsUIMessages.BuilderPropertyPage_2, false, null, null); proceed= dialog.getReturnCode() == IDialogConstants.YES_ID; store.setValue(IPreferenceConstants.PROMPT_FOR_PROJECT_MIGRATION, !dialog.getToggleState()); } @@ -297,7 +297,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta topLevel.setLayoutData(new GridData(GridData.FILL_BOTH)); Label description = new Label(topLevel, SWT.WRAP); - description.setText(ExternalToolsUIMessages.BuilderPropertyPage_description); //$NON-NLS-1$ + description.setText(ExternalToolsUIMessages.BuilderPropertyPage_description); description.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); description.setFont(font); @@ -336,13 +336,13 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta buttonArea.setLayout(layout); buttonArea.setFont(font); buttonArea.setLayoutData(new GridData(GridData.FILL_VERTICAL)); - newButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_newButton); //$NON-NLS-1$ - importButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage__Import____3); //$NON-NLS-1$ - editButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_editButton); //$NON-NLS-1$ - removeButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_removeButton); //$NON-NLS-1$ + newButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_newButton); + importButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage__Import____3); + editButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_editButton); + removeButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_removeButton); new Label(buttonArea, SWT.LEFT); - upButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_upButton); //$NON-NLS-1$ - downButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_downButton); //$NON-NLS-1$ + upButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_upButton); + downButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_downButton); newButton.setEnabled(true); importButton.setEnabled(true); @@ -418,7 +418,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta if (shell == null) { return; } - if (MessageDialog.openConfirm(shell, ExternalToolsUIMessages.BuilderPropertyPage_6, ExternalToolsUIMessages.BuilderPropertyPage_7)) { //$NON-NLS-1$ //$NON-NLS-2$ + if (MessageDialog.openConfirm(shell, ExternalToolsUIMessages.BuilderPropertyPage_6, ExternalToolsUIMessages.BuilderPropertyPage_7)) { enableCommand((ICommand)element, event.getChecked()); } else { viewer.removeCheckStateListener(this); @@ -486,8 +486,8 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta return; } ElementListSelectionDialog dialog= new ElementListSelectionDialog(shell, new BuilderLabelProvider()); - dialog.setTitle(ExternalToolsUIMessages.BuilderPropertyPage_4); //$NON-NLS-1$ - dialog.setMessage(ExternalToolsUIMessages.BuilderPropertyPage_5); //$NON-NLS-1$ + dialog.setTitle(ExternalToolsUIMessages.BuilderPropertyPage_4); + dialog.setMessage(ExternalToolsUIMessages.BuilderPropertyPage_5); dialog.setElements(configurations.toArray()); if (dialog.open() == Window.CANCEL) { return; @@ -558,7 +558,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta boolean wasAutobuilding= ResourcesPlugin.getWorkspace().getDescription().isAutoBuilding(); try { ILaunchConfigurationWorkingCopy workingCopy = null; - String name= DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(ExternalToolsUIMessages.BuilderPropertyPage_New_Builder_7); //$NON-NLS-1$ + String name= DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(ExternalToolsUIMessages.BuilderPropertyPage_New_Builder_7); workingCopy = type.newInstance(BuilderUtils.getBuilderFolder(getInputProject(), true), name); StringBuffer buffer= new StringBuffer(IExternalToolConstants.BUILD_TYPE_FULL); @@ -630,8 +630,8 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta ElementListSelectionDialog dialog = new ElementListSelectionDialog(shell, new BuilderLabelProvider()); dialog.setElements(externalToolTypes.toArray()); dialog.setMultipleSelection(false); - dialog.setTitle(ExternalToolsUIMessages.BuilderPropertyPage_Choose_configuration_type_8); //$NON-NLS-1$ - dialog.setMessage(ExternalToolsUIMessages.BuilderPropertyPage_Choose_an_external_tool_type_to_create_9); //$NON-NLS-1$ + dialog.setTitle(ExternalToolsUIMessages.BuilderPropertyPage_Choose_configuration_type_8); + dialog.setMessage(ExternalToolsUIMessages.BuilderPropertyPage_Choose_an_external_tool_type_to_create_9); dialog.open(); Object result[] = dialog.getResult(); if (result == null || result.length == 0) { @@ -730,9 +730,9 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta } // Warn the user that editing an old config will cause storage migration. MessageDialogWithToggle dialog= MessageDialogWithToggle.openYesNoQuestion(getShell(), - ExternalToolsUIMessages.BuilderPropertyPage_Migrate_project_builder_10, //$NON-NLS-1$ - ExternalToolsUIMessages.BuilderPropertyPage_Not_Support, //$NON-NLS-1$ - ExternalToolsUIMessages.BuilderPropertyPage_Prompt, //$NON-NLS-1$ + ExternalToolsUIMessages.BuilderPropertyPage_Migrate_project_builder_10, + ExternalToolsUIMessages.BuilderPropertyPage_Not_Support, + ExternalToolsUIMessages.BuilderPropertyPage_Prompt, false, ExternalToolsPlugin.getDefault().getPreferenceStore(), IPreferenceConstants.PROMPT_FOR_TOOL_MIGRATION); @@ -747,12 +747,12 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta if (e instanceof CoreException) { status = ((CoreException) e).getStatus(); } else { - status = new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsUIMessages.BuilderPropertyPage_statusMessage, e); //$NON-NLS-1$ + status = new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsUIMessages.BuilderPropertyPage_statusMessage, e); } Shell shell= getShell(); if (shell != null) { - ErrorDialog.openError(shell, ExternalToolsUIMessages.BuilderPropertyPage_errorTitle, //$NON-NLS-1$ - ExternalToolsUIMessages.BuilderPropertyPage_errorMessage, //$NON-NLS-1$ + ErrorDialog.openError(shell, ExternalToolsUIMessages.BuilderPropertyPage_errorTitle, + ExternalToolsUIMessages.BuilderPropertyPage_errorMessage, status); } } @@ -929,7 +929,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta IProject project = getInputProject(); //get all the build commands int numCommands = itemData.length; - monitor.beginTask(ExternalToolsUIMessages.BuilderPropertyPage_3, numCommands + 1); //$NON-NLS-1$ + monitor.beginTask(ExternalToolsUIMessages.BuilderPropertyPage_3, numCommands + 1); List possibleCommands= new ArrayList(numCommands); for (int i = 0; i < numCommands; i++) { Object data = itemData[i]; @@ -971,7 +971,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta } catch (CoreException e) { Shell shell= getShell(); if (shell != null) { - MessageDialog.openError(shell, ExternalToolsUIMessages.BuilderPropertyPage_39, MessageFormat.format(ExternalToolsUIMessages.BuilderPropertyPage_40, new String[] {workingCopy.getName()})); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openError(shell, ExternalToolsUIMessages.BuilderPropertyPage_39, MessageFormat.format(ExternalToolsUIMessages.BuilderPropertyPage_40, new String[] {workingCopy.getName()})); } } } @@ -1037,7 +1037,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta } catch (CoreException exception) { Shell shell= getShell(); if (shell != null) { - MessageDialog.openError(shell, ExternalToolsUIMessages.BuilderPropertyPage_13, ExternalToolsUIMessages.BuilderPropertyPage_error); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openError(shell, ExternalToolsUIMessages.BuilderPropertyPage_13, ExternalToolsUIMessages.BuilderPropertyPage_error); } return null; } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/EditCommandDialog.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/EditCommandDialog.java index 630eb51dc..4a2befedc 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/EditCommandDialog.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/EditCommandDialog.java @@ -42,24 +42,24 @@ public class EditCommandDialog extends Dialog { */ protected Control createDialogArea(Composite parent) { - getShell().setText(ExternalToolsUIMessages.EditCommandDialog_0); //$NON-NLS-1$ + getShell().setText(ExternalToolsUIMessages.EditCommandDialog_0); Composite composite = (Composite)super.createDialogArea(parent); Label label= new Label(composite, SWT.NONE); - label.setText(ExternalToolsUIMessages.EditCommandDialog_1); //$NON-NLS-1$ + label.setText(ExternalToolsUIMessages.EditCommandDialog_1); fFullButton = new Button(composite, SWT.CHECK); - fFullButton.setText(ExternalToolsUIMessages.EditCommandDialog_2); //$NON-NLS-1$ + fFullButton.setText(ExternalToolsUIMessages.EditCommandDialog_2); fFullButton.setSelection(fCommand.isBuilding(IncrementalProjectBuilder.FULL_BUILD)); fIncrementalButton = new Button(composite, SWT.CHECK); - fIncrementalButton.setText(ExternalToolsUIMessages.EditCommandDialog_3); //$NON-NLS-1$ + fIncrementalButton.setText(ExternalToolsUIMessages.EditCommandDialog_3); fIncrementalButton.setSelection(fCommand.isBuilding(IncrementalProjectBuilder.INCREMENTAL_BUILD)); fAutoButton = new Button(composite, SWT.CHECK); - fAutoButton.setText(ExternalToolsUIMessages.EditCommandDialog_4); //$NON-NLS-1$ + fAutoButton.setText(ExternalToolsUIMessages.EditCommandDialog_4); fAutoButton.setSelection(fCommand.isBuilding(IncrementalProjectBuilder.AUTO_BUILD)); fCleanButton = new Button(composite, SWT.CHECK); - fCleanButton.setText(ExternalToolsUIMessages.EditCommandDialog_5); //$NON-NLS-1$ + fCleanButton.setText(ExternalToolsUIMessages.EditCommandDialog_5); fCleanButton.setSelection(fCommand.isBuilding(IncrementalProjectBuilder.CLEAN_BUILD)); applyDialogFont(composite); return composite; diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsPreferencePage.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsPreferencePage.java index d2c5a22ee..46c8cdf0f 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsPreferencePage.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsPreferencePage.java @@ -35,7 +35,7 @@ public class ExternalToolsPreferencePage extends PreferencePage implements IWork public ExternalToolsPreferencePage() { setPreferenceStore(ExternalToolsPlugin.getDefault().getPreferenceStore()); - setDescription(ExternalToolsUIMessages.ExternalToolsPreferencePage_External_tool_project_builders_migration_2); //$NON-NLS-1$ + setDescription(ExternalToolsUIMessages.ExternalToolsPreferencePage_External_tool_project_builders_migration_2); } /** @@ -51,8 +51,8 @@ public class ExternalToolsPreferencePage extends PreferencePage implements IWork composite.setLayout(layout); composite.setFont(parent.getFont()); - promptForToolMigrationButton= createCheckButton(composite, ExternalToolsUIMessages.ExternalToolsPreferencePage_Prompt_before_migrating_3, IPreferenceConstants.PROMPT_FOR_TOOL_MIGRATION); //$NON-NLS-1$ - promptForProjectMigrationButton= createCheckButton(composite, ExternalToolsUIMessages.ExternalToolsPreferencePage_1, IPreferenceConstants.PROMPT_FOR_PROJECT_MIGRATION); //$NON-NLS-1$ + promptForToolMigrationButton= createCheckButton(composite, ExternalToolsUIMessages.ExternalToolsPreferencePage_Prompt_before_migrating_3, IPreferenceConstants.PROMPT_FOR_TOOL_MIGRATION); + promptForProjectMigrationButton= createCheckButton(composite, ExternalToolsUIMessages.ExternalToolsPreferencePage_1, IPreferenceConstants.PROMPT_FOR_PROJECT_MIGRATION); applyDialogFont(composite); diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java index 947c37664..db5a4b10d 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/FileSelectionDialog.java @@ -70,7 +70,7 @@ public class FileSelectionDialog extends MessageDialog { * <code>null</code> to display a default message */ public FileSelectionDialog(Shell parentShell, IAdaptable rootElement, String message) { - super(parentShell, ExternalToolsUIMessages.FileSelectionDialog_Choose_Location_1, null, message, MessageDialog.NONE, new String[] { ExternalToolsUIMessages.FileSelectionDialog_Ok_2, ExternalToolsUIMessages.FileSelectionDialog_Cancel_3}, 0); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + super(parentShell, ExternalToolsUIMessages.FileSelectionDialog_Choose_Location_1, null, message, MessageDialog.NONE, new String[] { ExternalToolsUIMessages.FileSelectionDialog_Ok_2, ExternalToolsUIMessages.FileSelectionDialog_Cancel_3}, 0); root = rootElement; setShellStyle(getShellStyle() | SWT.RESIZE); } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildProjectResolver.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildProjectResolver.java index 411dd62b5..3bf74d4e4 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildProjectResolver.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildProjectResolver.java @@ -36,7 +36,7 @@ public class BuildProjectResolver implements IDynamicVariableResolver { if (resource != null && resource.exists()) { return resource.getLocation().toOSString(); } - abort(MessageFormat.format(VariableMessages.BuildProjectResolver_3, new String[]{getReferenceExpression(variable, argument)}), null); //$NON-NLS-1$ + abort(MessageFormat.format(VariableMessages.BuildProjectResolver_3, new String[]{getReferenceExpression(variable, argument)}), null); return null; } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/SystemPathResolver.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/SystemPathResolver.java index cf7242852..e282a56d1 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/SystemPathResolver.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/SystemPathResolver.java @@ -29,7 +29,7 @@ public class SystemPathResolver implements IDynamicVariableResolver { */ public String resolveValue(IDynamicVariable variable, String argument) throws CoreException { if (argument == null) { - throw new CoreException(new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, IExternalToolConstants.ERR_INTERNAL_ERROR, VariableMessages.SystemPathResolver_0, null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, IExternalToolConstants.ERR_INTERNAL_ERROR, VariableMessages.SystemPathResolver_0, null)); } Map map= DebugPlugin.getDefault().getLaunchManager().getNativeEnvironment(); String path= (String) map.get("PATH"); //$NON-NLS-1$ diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/BackgroundResourceRefresher.java b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/BackgroundResourceRefresher.java index 18ed8d040..2d7ab0a78 100644 --- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/BackgroundResourceRefresher.java +++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/BackgroundResourceRefresher.java @@ -71,7 +71,7 @@ public class BackgroundResourceRefresher implements IDebugEventSetListener { * Submits a job to do the refresh */ protected void refresh() { - Job job= new Job(ExternalToolsProgramMessages.BackgroundResourceRefresher_0) { //$NON-NLS-1$ + Job job= new Job(ExternalToolsProgramMessages.BackgroundResourceRefresher_0) { public IStatus run(IProgressMonitor monitor) { try { RefreshTab.refreshResources(fConfiguration, monitor); diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java index 19cedb961..fb110740f 100644 --- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java +++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java @@ -80,7 +80,7 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate { } if (configType.equals(programType)) { if (!launches[i].isTerminated()) { - MessageDialog.openWarning(window.getShell(), ExternalToolsProgramMessages.ProgramLaunchDelegate_Workbench_Closing_1, ExternalToolsProgramMessages.ProgramLaunchDelegate_The_workbench_is_exiting); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openWarning(window.getShell(), ExternalToolsProgramMessages.ProgramLaunchDelegate_Workbench_Closing_1, ExternalToolsProgramMessages.ProgramLaunchDelegate_The_workbench_is_exiting); break; } } @@ -163,11 +163,11 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate { processAttributes.put(IProcess.ATTR_PROCESS_TYPE, programName); if (p != null) { - monitor.beginTask(MessageFormat.format(ExternalToolsProgramMessages.ProgramLaunchDelegate_3, new String[] {configuration.getName()}), IProgressMonitor.UNKNOWN); //$NON-NLS-1$ + monitor.beginTask(MessageFormat.format(ExternalToolsProgramMessages.ProgramLaunchDelegate_3, new String[] {configuration.getName()}), IProgressMonitor.UNKNOWN); process = DebugPlugin.newProcess(launch, p, location.toOSString(), processAttributes); if (process == null) { p.destroy(); - throw new CoreException(new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, IExternalToolConstants.ERR_INTERNAL_ERROR, ExternalToolsProgramMessages.ProgramLaunchDelegate_4, null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, IExternalToolConstants.ERR_INTERNAL_ERROR, ExternalToolsProgramMessages.ProgramLaunchDelegate_4, null)); } } diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramMainTab.java b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramMainTab.java index 19e2e7848..6969274f6 100644 --- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramMainTab.java +++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramMainTab.java @@ -29,7 +29,7 @@ public class ProgramMainTab extends ExternalToolsMainTab { */ protected void handleWorkspaceLocationButtonSelected() { FileSelectionDialog dialog; - dialog = new FileSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), ExternalToolsProgramMessages.ProgramMainTab_Select); //$NON-NLS-1$ + dialog = new FileSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), ExternalToolsProgramMessages.ProgramMainTab_Select); dialog.open(); IStructuredSelection result = dialog.getResult(); if (result == null) { |