diff options
27 files changed, 490 insertions, 393 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 10dab56ab..debd46e6f 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.getString("ExternalToolsBuilderTab.14")); //$NON-NLS-1$ + fLaunchInBackgroundButton = createCheckButton(parent, ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_14); //$NON-NLS-1$ 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.getString("ExternalToolsBuilderTab.Run_this_builder_for__1")); //$NON-NLS-1$ + label.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Run_this_builder_for__1); //$NON-NLS-1$ label.setFont(parent.getFont()); - afterClean= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.&Full_builds_2"), ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.Full"), 2); //$NON-NLS-1$ //$NON-NLS-2$ - manualBuild= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.&Incremental_builds_4"), ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.Inc"), 2); //$NON-NLS-1$ //$NON-NLS-2$ - autoBuildButton= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.&Auto_builds_(Not_recommended)_6"), ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.Auto"), 2); //$NON-NLS-1$ //$NON-NLS-2$ - fDuringClean= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.0"), ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.1"), 2); //$NON-NLS-1$ //$NON-NLS-2$ + 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$ createVerticalSpacer(parent, 2); } - workingSetButton= createButton(parent, selectionListener, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.workingSet_label"), ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.workingSet_tooltip"), 1); //$NON-NLS-1$ //$NON-NLS-2$ - specifyResources= createPushButton(parent, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.13"), null); //$NON-NLS-1$ + 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$ 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.getString("ExternalToolsBuilderTab.2")); //$NON-NLS-1$ + label.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_2); //$NON-NLS-1$ 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.getString("ExternalToolsBuilderTab.Build_Options_9"); //$NON-NLS-1$ + return ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_Build_Options_9; //$NON-NLS-1$ } /* (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.getString("ExternalToolsBuilderTab.buildKindError")); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_buildKindError); //$NON-NLS-1$ return false; } } if (workingSetButton.getSelection() && (workingSet == null || workingSet.getElements().length == 0)) { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.16")); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_16); //$NON-NLS-1$ return false; } @@ -319,7 +319,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab { IWorkingSetManager workingSetManager= PlatformUI.getWorkbench().getWorkingSetManager(); if (workingSet == null){ - workingSet = workingSetManager.createWorkingSet(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsBuilderTab.15"), new IAdaptable[0]); //$NON-NLS-1$ + workingSet = workingSetManager.createWorkingSet(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_15, new IAdaptable[0]); //$NON-NLS-1$ } 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/ExternalToolsLaunchConfigurationMessages.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java index d8b2f6160..d7f657a80 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java @@ -1,34 +1,77 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 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 - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************** + * Copyright (c) 2005 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 http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ + * Contributors: + * IBM - Initial API and implementation + **********************************************************************/ package org.eclipse.ui.externaltools.internal.launchConfigurations; +import org.eclipse.osgi.util.NLS; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +public class ExternalToolsLaunchConfigurationMessages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsLaunchConfigurationMessages";//$NON-NLS-1$ + // + // Copyright (c) 2000, 2005 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 + // http://www.eclipse.org/legal/epl-v10.html + // + // Contributors: + // IBM Corporation - initial API and implementation + // -public class ExternalToolsLaunchConfigurationMessages { + public static String ExternalToolsMainTab__Location___2; + public static String ExternalToolsMainTab__Browse_Workspace____3; + public static String ExternalToolsMainTab_Brows_e_File_System____4; + public static String ExternalToolsMainTab_Working__Directory__5; + public static String ExternalToolsMainTab_Browse_Wor_kspace____6; + public static String ExternalToolsMainTab_Browse_F_ile_System____7; + public static String ExternalToolsMainTab_Error_reading_configuration_10; + public static String ExternalToolsMainTab__Main_17; + public static String ExternalToolsMainTab_External_tool_location_cannot_be_empty_18; + public static String ExternalToolsMainTab_External_tool_location_does_not_exist_19; + public static String ExternalToolsMainTab_External_tool_location_specified_is_not_a_file_20; + public static String ExternalToolsMainTab_External_tool_working_directory_does_not_exist_or_is_invalid_21; + public static String ExternalToolsMainTab_Select_a_resource_22; + public static String ExternalToolsMainTab_23; + public static String ExternalToolsMainTab__Arguments___1; + public static String ExternalToolsMainTab_Varia_bles____2; + public static String ExternalToolsMainTab_3; + public static String ExternalToolsMainTab_Error_reading_configuration_7; + public static String ExternalToolsMainTab_Not_a_directory; + public static String ExternalToolsMainTab_30; + public static String ExternalToolsMainTab_31; + public static String ExternalToolsMainTab_32; - private static final String BUNDLE_NAME = "org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsLaunchConfigurationMessages"; //$NON-NLS-1$ + public static String ExternalToolsUtil_Location_not_specified_by__0__1; + public static String ExternalToolsUtil_invalidLocation__0_; + public static String ExternalToolsUtil_invalidDirectory__0_; - private static final ResourceBundle RESOURCE_BUNDLE = - ResourceBundle.getBundle(BUNDLE_NAME); + public static String ExternalToolsBuilderTab_Run_this_builder_for__1; + public static String ExternalToolsBuilderTab__Full_builds_2; + public static String ExternalToolsBuilderTab_Full; + public static String ExternalToolsBuilderTab__Incremental_builds_4; + public static String ExternalToolsBuilderTab_Inc; + public static String ExternalToolsBuilderTab__Auto_builds__Not_recommended__6; + public static String ExternalToolsBuilderTab_Auto; + public static String ExternalToolsBuilderTab_Build_Options_9; + public static String ExternalToolsBuilderTab_workingSet_label; + public static String ExternalToolsBuilderTab_workingSet_tooltip; + public static String ExternalToolsBuilderTab_buildKindError; + public static String ExternalToolsBuilderTab_14; + public static String ExternalToolsBuilderTab_13; + public static String ExternalToolsBuilderTab_16; + public static String ExternalToolsBuilderTab_15; + public static String ExternalToolsBuilderTab_0; + public static String ExternalToolsBuilderTab_1; + public static String ExternalToolsBuilderTab_2; - private ExternalToolsLaunchConfigurationMessages() { + static { + // load message values from bundle file + NLS.initializeMessages(BUNDLE_NAME, ExternalToolsLaunchConfigurationMessages.class); } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} +}
\ No newline at end of file diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties index 0d368267d..125190365 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties @@ -1,56 +1,56 @@ -############################################################################### -# Copyright (c) 2000, 2005 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -ExternalToolsMainTab.&Location___2=&Location: -ExternalToolsMainTab.&Browse_Workspace..._3=Browse Works&pace... -ExternalToolsMainTab.Brows&e_File_System..._4=Brows&e File System... -ExternalToolsMainTab.Working_&Directory__5=Working &Directory: -ExternalToolsMainTab.Browse_Wor&kspace..._6=Browse Wor&kspace... -ExternalToolsMainTab.Browse_F&ile_System..._7=Browse File Syste&m... -ExternalToolsMainTab.Error_reading_configuration_10=Error reading configuration -ExternalToolsMainTab.&Main_17=Main -ExternalToolsMainTab.External_tool_location_cannot_be_empty_18=External tool location cannot be empty -ExternalToolsMainTab.External_tool_location_does_not_exist_19=External tool location does not exist -ExternalToolsMainTab.External_tool_location_specified_is_not_a_file_20=External tool location specified is not a file -ExternalToolsMainTab.External_tool_working_directory_does_not_exist_or_is_invalid_21=External tool working directory does not exist or is invalid -ExternalToolsMainTab.Select_a_resource_22=Select a resource: -ExternalToolsMainTab.23=Select a working directory: -ExternalToolsMainTab.&Arguments___1=&Arguments: -ExternalToolsMainTab.Varia&bles..._2=Variable&s... -ExternalToolsMainTab.3=Note: Enclose an argument containing spaces using double-quotes (\"). -ExternalToolsMainTab.Error_reading_configuration_7=Error reading configuration -ExternalToolsMainTab.Not_a_directory=The specified location is not a directory -ExternalToolsMainTab.30=Please specify the location of the external tool you would like to configure. -ExternalToolsMainTab.31=Var&iables... -ExternalToolsMainTab.32=Varia&bles... - -ExternalToolsUtil.Location_not_specified_by_{0}_1=Location not specified by {0} -ExternalToolsUtil.invalidLocation_{0} = The file does not exist for the external tool named {0}. -ExternalToolsUtil.invalidDirectory_{0} = The working directory {0} does not exist for the external tool named {1}. - -ExternalToolsBuilderTab.Run_this_builder_for__1=Run the builder: -ExternalToolsBuilderTab.&Full_builds_2=A&fter a \"Clean\" -ExternalToolsBuilderTab.Full=Runs on the first build that occurs after a clean. -ExternalToolsBuilderTab.&Incremental_builds_4=&During manual builds -ExternalToolsBuilderTab.Inc=Runs whenever the user invokes a build (but not for auto-build). -ExternalToolsBuilderTab.&Auto_builds_(Not_recommended)_6=During a&uto builds -ExternalToolsBuilderTab.Auto=Runs whenever a resource in the workspace is modified if autobuilding is enabled. Enabling this option should be paired with a specifying a resource working set. -ExternalToolsBuilderTab.Build_Options_9=&Build Options -ExternalToolsBuilderTab.workingSet_label=Specify working set of &relevant resources -ExternalToolsBuilderTab.workingSet_tooltip=The working set of resources that if changed from a manual or auto build will trigger the external tool builder -ExternalToolsBuilderTab.buildKindError=At least one type of build kind must be selected -ExternalToolsBuilderTab.14=Launch in bac&kground -ExternalToolsBuilderTab.13=&Specify Resources... -ExternalToolsBuilderTab.16=Must select resources in working set. -ExternalToolsBuilderTab.15=workingSet -ExternalToolsBuilderTab.0=During a "&Clean" -ExternalToolsBuilderTab.1=Runs when a "clean" has been initiated -ExternalToolsBuilderTab.2=Note: Not applied for the builds during or after a \"Clean\" +###############################################################################
+# Copyright (c) 2000, 2005 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+ExternalToolsMainTab__Location___2=&Location:
+ExternalToolsMainTab__Browse_Workspace____3=Browse Works&pace...
+ExternalToolsMainTab_Brows_e_File_System____4=Brows&e File System...
+ExternalToolsMainTab_Working__Directory__5=Working &Directory:
+ExternalToolsMainTab_Browse_Wor_kspace____6=Browse Wor&kspace...
+ExternalToolsMainTab_Browse_F_ile_System____7=Browse File Syste&m...
+ExternalToolsMainTab_Error_reading_configuration_10=Error reading configuration
+ExternalToolsMainTab__Main_17=Main
+ExternalToolsMainTab_External_tool_location_cannot_be_empty_18=External tool location cannot be empty
+ExternalToolsMainTab_External_tool_location_does_not_exist_19=External tool location does not exist
+ExternalToolsMainTab_External_tool_location_specified_is_not_a_file_20=External tool location specified is not a file
+ExternalToolsMainTab_External_tool_working_directory_does_not_exist_or_is_invalid_21=External tool working directory does not exist or is invalid
+ExternalToolsMainTab_Select_a_resource_22=Select a resource:
+ExternalToolsMainTab_23=Select a working directory:
+ExternalToolsMainTab__Arguments___1=&Arguments:
+ExternalToolsMainTab_Varia_bles____2=Variable&s...
+ExternalToolsMainTab_3=Note: Enclose an argument containing spaces using double-quotes (\").
+ExternalToolsMainTab_Error_reading_configuration_7=Error reading configuration
+ExternalToolsMainTab_Not_a_directory=The specified location is not a directory
+ExternalToolsMainTab_30=Please specify the location of the external tool you would like to configure.
+ExternalToolsMainTab_31=Var&iables...
+ExternalToolsMainTab_32=Varia&bles...
+
+ExternalToolsUtil_Location_not_specified_by__0__1=Location not specified by {0}
+ExternalToolsUtil_invalidLocation__0_ = The file does not exist for the external tool named {0}.
+ExternalToolsUtil_invalidDirectory__0_ = The working directory {0} does not exist for the external tool named {1}.
+
+ExternalToolsBuilderTab_Run_this_builder_for__1=Run the builder:
+ExternalToolsBuilderTab__Full_builds_2=A&fter a \"Clean\"
+ExternalToolsBuilderTab_Full=Runs on the first build that occurs after a clean.
+ExternalToolsBuilderTab__Incremental_builds_4=&During manual builds
+ExternalToolsBuilderTab_Inc=Runs whenever the user invokes a build (but not for auto-build).
+ExternalToolsBuilderTab__Auto_builds__Not_recommended__6=During a&uto builds
+ExternalToolsBuilderTab_Auto=Runs whenever a resource in the workspace is modified if autobuilding is enabled. Enabling this option should be paired with a specifying a resource working set.
+ExternalToolsBuilderTab_Build_Options_9=&Build Options
+ExternalToolsBuilderTab_workingSet_label=Specify working set of &relevant resources
+ExternalToolsBuilderTab_workingSet_tooltip=The working set of resources that if changed from a manual or auto build will trigger the external tool builder
+ExternalToolsBuilderTab_buildKindError=At least one type of build kind must be selected
+ExternalToolsBuilderTab_14=Launch in bac&kground
+ExternalToolsBuilderTab_13=&Specify Resources...
+ExternalToolsBuilderTab_16=Must select resources in working set.
+ExternalToolsBuilderTab_15=workingSet
+ExternalToolsBuilderTab_0=During a "&Clean"
+ExternalToolsBuilderTab_1=Runs when a "clean" has been initiated
+ExternalToolsBuilderTab_2=Note: Not applied for the builds during or after a \"Clean\"
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 274aa0169..d9d5499a6 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.getString("ExternalToolsMainTab.&Browse_Workspace..._3"), null); //$NON-NLS-1$ + workspaceLocationButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Browse_Workspace____3, null); //$NON-NLS-1$ workspaceLocationButton.addSelectionListener(fListener); addControlAccessibleListener(workspaceLocationButton, group.getText() + " " + workspaceLocationButton.getText()); //$NON-NLS-1$ - fileLocationButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Brows&e_File_System..._4"), null); //$NON-NLS-1$ + fileLocationButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Brows_e_File_System____4, null); //$NON-NLS-1$ fileLocationButton.addSelectionListener(fListener); addControlAccessibleListener(fileLocationButton, group.getText() + " " + fileLocationButton.getText()); //$NON-NLS-1$ - variablesLocationButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.31"), null); //$NON-NLS-1$ + variablesLocationButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_31, null); //$NON-NLS-1$ 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.getString("ExternalToolsMainTab.&Location___2"); //$NON-NLS-1$ + return ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Location___2; //$NON-NLS-1$ } /** @@ -215,15 +215,15 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa buttonComposite.setLayoutData(gridData); buttonComposite.setFont(parent.getFont()); - workspaceWorkingDirectoryButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Browse_Wor&kspace..._6"), null); //$NON-NLS-1$ + workspaceWorkingDirectoryButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Browse_Wor_kspace____6, null); //$NON-NLS-1$ workspaceWorkingDirectoryButton.addSelectionListener(fListener); addControlAccessibleListener(workspaceWorkingDirectoryButton, group.getText() + " " + workspaceWorkingDirectoryButton.getText()); //$NON-NLS-1$ - fileWorkingDirectoryButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Browse_F&ile_System..._7"), null); //$NON-NLS-1$ + fileWorkingDirectoryButton= createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Browse_F_ile_System____7, null); //$NON-NLS-1$ fileWorkingDirectoryButton.addSelectionListener(fListener); addControlAccessibleListener(fileWorkingDirectoryButton, group.getText() + " " + fileLocationButton.getText()); //$NON-NLS-1$ - variablesWorkingDirectoryButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.32"), null); //$NON-NLS-1$ + variablesWorkingDirectoryButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_32, null); //$NON-NLS-1$ 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.getString("ExternalToolsMainTab.Working_&Directory__5"); //$NON-NLS-1$ + return ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Working__Directory__5; //$NON-NLS-1$ } /** @@ -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.getString("ExternalToolsMainTab.&Arguments___1"); //$NON-NLS-1$ + String groupName = ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Arguments___1; //$NON-NLS-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.getString("ExternalToolsMainTab.Varia&bles..._2"), null); //$NON-NLS-1$ + argumentVariablesButton= createPushButton(composite, ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Varia_bles____2, null); //$NON-NLS-1$ argumentVariablesButton.addSelectionListener(fListener); addControlAccessibleListener(argumentVariablesButton, argumentVariablesButton.getText()); // need to strip the mnemonic from buttons Label instruction = new Label(group, SWT.NONE); - instruction.setText(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.3")); //$NON-NLS-1$ + instruction.setText(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_3); //$NON-NLS-1$ 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.getString("ExternalToolsMainTab.Error_reading_configuration_10"), ce); //$NON-NLS-1$ + ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_10, ce); //$NON-NLS-1$ } 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.getString("ExternalToolsMainTab.Error_reading_configuration_10"), ce); //$NON-NLS-1$ + ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_10, ce); //$NON-NLS-1$ } 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.getString("ExternalToolsMainTab.Error_reading_configuration_7"), ce); //$NON-NLS-1$ + ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Error_reading_configuration_7, ce); //$NON-NLS-1$ } 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.getString("ExternalToolsMainTab.&Main_17"); //$NON-NLS-1$ + return ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab__Main_17; //$NON-NLS-1$ } /* (non-Javadoc) @@ -403,9 +403,9 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa if (location.length() < 1) { if (newConfig) { setErrorMessage(null); - setMessage(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.30")); //$NON-NLS-1$ + setMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_30); //$NON-NLS-1$ } else { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.External_tool_location_cannot_be_empty_18")); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_External_tool_location_cannot_be_empty_18); //$NON-NLS-1$ 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.getString("ExternalToolsMainTab.External_tool_location_does_not_exist_19")); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_External_tool_location_does_not_exist_19); //$NON-NLS-1$ } return false; } if (!file.isFile()) { if (!newConfig) { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.getString("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); //$NON-NLS-1$ } 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.getString("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); //$NON-NLS-1$ return false; } if (!file.isDirectory()) { - setErrorMessage(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Not_a_directory")); //$NON-NLS-1$ + setErrorMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Not_a_directory); //$NON-NLS-1$ 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.getString("ExternalToolsMainTab.Select_a_resource_22")); //$NON-NLS-1$ + dialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_Select_a_resource_22); //$NON-NLS-1$ 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.getString("ExternalToolsMainTab.23")); //$NON-NLS-1$ + ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_23); //$NON-NLS-1$ 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.getString("ExternalToolsMainTab.23")); //$NON-NLS-1$ + dialog.setMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsMainTab_23); //$NON-NLS-1$ 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 887636137..cf06a56e3 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.getString("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); //$NON-NLS-1$ } else { String expandedLocation = getStringVariableManager().performStringSubstitution(location); if (expandedLocation == null || expandedLocation.length() == 0) { - String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.invalidLocation_{0}"), new Object[] { configuration.getName()}); //$NON-NLS-1$ + String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_invalidLocation__0_, new Object[] { configuration.getName()}); //$NON-NLS-1$ 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.getString("ExternalToolsUtil.invalidLocation_{0}"), new Object[] { configuration.getName()}); //$NON-NLS-1$ + String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_invalidLocation__0_, new Object[] { configuration.getName()}); //$NON-NLS-1$ abort(msg, null, 0); } } @@ -120,7 +120,7 @@ public class ExternalToolsUtil { if (path.isDirectory()) { return new Path(expandedLocation); } - String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.invalidDirectory_{0}"), new Object[] { expandedLocation, configuration.getName()}); //$NON-NLS-1$ + String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.ExternalToolsUtil_invalidDirectory__0_, new Object[] { expandedLocation, configuration.getName()}); //$NON-NLS-1$ 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 225613d7b..61b96f4bb 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.getString("BuilderUtils.5"), ExternalToolsModelMessages.getString("BuilderUtils.6")); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openError(shell, ExternalToolsModelMessages.BuilderUtils_5, ExternalToolsModelMessages.BuilderUtils_6); //$NON-NLS-1$ //$NON-NLS-2$ } 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.getString("BuilderUtils.7")).toString(); //$NON-NLS-1$ + String newName= new StringBuffer(config.getName()).append(ExternalToolsModelMessages.BuilderUtils_7).toString(); //$NON-NLS-1$ 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 b260cc3b9..3c72c3447 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.getString("ExternalToolBuilder.0"), null); //$NON-NLS-1$ + throw ExternalToolsPlugin.newError(ExternalToolsModelMessages.ExternalToolBuilder_0, null); //$NON-NLS-1$ } 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.getString("ExternalToolBuilder.Running_{0}..._1"), new String[] { config.getName()})); //$NON-NLS-1$ + monitor.subTask(MessageFormat.format(ExternalToolsModelMessages.ExternalToolBuilder_Running__0_____1, new String[] { config.getName()})); //$NON-NLS-1$ 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/ExternalToolsModelMessages.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.java index d524bfaf6..31898b604 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.java @@ -1,32 +1,38 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 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 - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************** + * Copyright (c) 2005 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 http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ + * Contributors: + * IBM - Initial API and implementation + **********************************************************************/ package org.eclipse.ui.externaltools.internal.model; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import org.eclipse.osgi.util.NLS; -public class ExternalToolsModelMessages { +public class ExternalToolsModelMessages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.ui.externaltools.internal.model.ExternalToolsModelMessages";//$NON-NLS-1$ + // + // Copyright (c) 2000, 2005 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 + // http://www.eclipse.org/legal/epl-v10.html + // + // Contributors: + // IBM Corporation - initial API and implementation + // - private static final String BUNDLE_NAME = "org.eclipse.ui.externaltools.internal.model.ExternalToolsModelMessages"; //$NON-NLS-1$ + public static String ImageDescriptorRegistry_Allocating_image_for_wrong_display_1; + public static String ExternalToolBuilder_Running__0_____1; + public static String ExternalToolBuilder_0; + public static String BuilderUtils_5; + public static String BuilderUtils_6; + public static String BuilderUtils_7; - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); - - private ExternalToolsModelMessages() { - } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } + static { + // load message values from bundle file + NLS.initializeMessages(BUNDLE_NAME, ExternalToolsModelMessages.class); } -} +}
\ No newline at end of file diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.properties b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.properties index 62bf30023..abcac7b12 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.properties +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.properties @@ -1,17 +1,17 @@ -############################################################################### -# Copyright (c) 2000, 2005 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -ImageDescriptorRegistry.Allocating_image_for_wrong_display_1=Allocating image for wrong display -ExternalToolBuilder.Running_{0}..._1=Running {0}... -ExternalToolBuilder.0=The builder launch configuration could not be found. -BuilderUtils.5=Command Error -BuilderUtils.6=An error occurred while saving the project's build commands -BuilderUtils.7=\ [Builder] +###############################################################################
+# Copyright (c) 2000, 2005 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+ImageDescriptorRegistry_Allocating_image_for_wrong_display_1=Allocating image for wrong display
+ExternalToolBuilder_Running__0_____1=Running {0}...
+ExternalToolBuilder_0=The builder launch configuration could not be found.
+BuilderUtils_5=Command Error
+BuilderUtils_6=An error occurred while saving the project's build commands
+BuilderUtils_7=\ [Builder]
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 01660beb4..fd6bc765f 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.getString("ImageDescriptorRegistry.Allocating_image_for_wrong_display_1")); //$NON-NLS-1$ + Assert.isTrue(fDisplay == ExternalToolsPlugin.getStandardDisplay(), ExternalToolsModelMessages.ImageDescriptorRegistry_Allocating_image_for_wrong_display_1); //$NON-NLS-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 8c2afbec1..27b25aa86 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.getString("ExternalToolMigration.37"), e); //$NON-NLS-1$ + ExternalToolsPlugin.getDefault().log(ExternalToolsUIMessages.ExternalToolMigration_37, e); //$NON-NLS-1$ } try { ILaunchConfigurationWorkingCopy workingCopy= config.getWorkingCopy(); workingCopy.setAttribute(IDebugUIConstants.ATTR_LAUNCH_IN_BACKGROUND, runInBackground); config= workingCopy.doSave(); } catch (CoreException e) { - ExternalToolsPlugin.getDefault().log(ExternalToolsUIMessages.getString("ExternalToolMigration.38"), e); //$NON-NLS-1$ + ExternalToolsPlugin.getDefault().log(ExternalToolsUIMessages.ExternalToolMigration_38, e); //$NON-NLS-1$ } } 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 f8d871993..5f8e79c2e 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.getString("BuilderPropertyPage.invalidBuildTool"); //$NON-NLS-1$ + return ExternalToolsUIMessages.BuilderPropertyPage_invalidBuildTool; //$NON-NLS-1$ } return super.getText(element); } @@ -70,7 +70,7 @@ class BuilderLabelProvider extends LabelProvider { if (extension != null) { builderName = extension.getLabel(); } else { - builderName = MessageFormat.format(ExternalToolsUIMessages.getString("BuilderPropertyPage.missingBuilder"), new Object[] { builderID }); //$NON-NLS-1$ + builderName = MessageFormat.format(ExternalToolsUIMessages.BuilderPropertyPage_missingBuilder, new Object[] { builderID }); //$NON-NLS-1$ } 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 0bca43c20..16e1b3864 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 @@ -213,9 +213,9 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta Object element= null; if (config != null) { if (!config.isWorkingCopy() && !config.exists()) { - IStatus status = new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, 0, MessageFormat.format(ExternalToolsUIMessages.getString("BuilderPropertyPage.Exists"), new String[]{config.getLocation().toOSString()}), null); //$NON-NLS-1$ - ErrorDialog.openError(getShell(), ExternalToolsUIMessages.getString("BuilderPropertyPage.errorTitle"), //$NON-NLS-1$ - MessageFormat.format(ExternalToolsUIMessages.getString("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); //$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$ status); userHasMadeChanges= true; } else { @@ -240,7 +240,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta boolean prompt= store.getBoolean(IPreferenceConstants.PROMPT_FOR_PROJECT_MIGRATION); boolean proceed= true; if (prompt) { - MessageDialogWithToggle dialog= MessageDialogWithToggle.openYesNoQuestion(getShell(), ExternalToolsUIMessages.getString("BuilderPropertyPage.0"), ExternalToolsUIMessages.getString("BuilderPropertyPage.1"), ExternalToolsUIMessages.getString("BuilderPropertyPage.2"), false, null, null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + MessageDialogWithToggle dialog= MessageDialogWithToggle.openYesNoQuestion(getShell(), ExternalToolsUIMessages.BuilderPropertyPage_0, ExternalToolsUIMessages.BuilderPropertyPage_1, ExternalToolsUIMessages.BuilderPropertyPage_2, false, null, null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ proceed= dialog.getReturnCode() == IDialogConstants.YES_ID; store.setValue(IPreferenceConstants.PROMPT_FOR_PROJECT_MIGRATION, !dialog.getToggleState()); } @@ -288,7 +288,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.getString("BuilderPropertyPage.description")); //$NON-NLS-1$ + description.setText(ExternalToolsUIMessages.BuilderPropertyPage_description); //$NON-NLS-1$ description.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); description.setFont(font); @@ -327,13 +327,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.getString("BuilderPropertyPage.newButton")); //$NON-NLS-1$ - importButton = createButton(buttonArea, ExternalToolsUIMessages.getString("BuilderPropertyPage.&Import..._3")); //$NON-NLS-1$ - editButton = createButton(buttonArea, ExternalToolsUIMessages.getString("BuilderPropertyPage.editButton")); //$NON-NLS-1$ - removeButton = createButton(buttonArea, ExternalToolsUIMessages.getString("BuilderPropertyPage.removeButton")); //$NON-NLS-1$ + 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$ new Label(buttonArea, SWT.LEFT); - upButton = createButton(buttonArea, ExternalToolsUIMessages.getString("BuilderPropertyPage.upButton")); //$NON-NLS-1$ - downButton = createButton(buttonArea, ExternalToolsUIMessages.getString("BuilderPropertyPage.downButton")); //$NON-NLS-1$ + upButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_upButton); //$NON-NLS-1$ + downButton = createButton(buttonArea, ExternalToolsUIMessages.BuilderPropertyPage_downButton); //$NON-NLS-1$ newButton.setEnabled(true); importButton.setEnabled(true); @@ -402,7 +402,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta if (element instanceof ILaunchConfiguration) { enableLaunchConfiguration((ILaunchConfiguration) element, event.getChecked()); } else if (element instanceof ICommand) { - if (MessageDialog.openConfirm(getShell(), ExternalToolsUIMessages.getString("BuilderPropertyPage.6"), ExternalToolsUIMessages.getString("BuilderPropertyPage.7"))) { //$NON-NLS-1$ //$NON-NLS-2$ + if (MessageDialog.openConfirm(getShell(), ExternalToolsUIMessages.BuilderPropertyPage_6, ExternalToolsUIMessages.BuilderPropertyPage_7)) { //$NON-NLS-1$ //$NON-NLS-2$ enableCommand((ICommand)element, event.getChecked()); } else { viewer.removeCheckStateListener(this); @@ -466,8 +466,8 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta } } ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), new BuilderLabelProvider()); - dialog.setTitle(ExternalToolsUIMessages.getString("BuilderPropertyPage.4")); //$NON-NLS-1$ - dialog.setMessage(ExternalToolsUIMessages.getString("BuilderPropertyPage.5")); //$NON-NLS-1$ + dialog.setTitle(ExternalToolsUIMessages.BuilderPropertyPage_4); //$NON-NLS-1$ + dialog.setMessage(ExternalToolsUIMessages.BuilderPropertyPage_5); //$NON-NLS-1$ dialog.setElements(configurations.toArray()); if (dialog.open() == Window.CANCEL) { return; @@ -538,7 +538,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.getString("BuilderPropertyPage.New_Builder_7")); //$NON-NLS-1$ + String name= DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(ExternalToolsUIMessages.BuilderPropertyPage_New_Builder_7); //$NON-NLS-1$ workingCopy = type.newInstance(BuilderUtils.getBuilderFolder(getInputProject(), true), name); StringBuffer buffer= new StringBuffer(IExternalToolConstants.BUILD_TYPE_FULL); @@ -603,8 +603,8 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), new BuilderLabelProvider()); dialog.setElements(externalToolTypes.toArray()); dialog.setMultipleSelection(false); - dialog.setTitle(ExternalToolsUIMessages.getString("BuilderPropertyPage.Choose_configuration_type_8")); //$NON-NLS-1$ - dialog.setMessage(ExternalToolsUIMessages.getString("BuilderPropertyPage.Choose_an_external_tool_type_to_create_9")); //$NON-NLS-1$ + 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.open(); Object result[] = dialog.getResult(); if (result == null || result.length == 0) { @@ -699,9 +699,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.getString("BuilderPropertyPage.Migrate_project_builder_10"), //$NON-NLS-1$ - ExternalToolsUIMessages.getString("BuilderPropertyPage.Not_Support"), //$NON-NLS-1$ - ExternalToolsUIMessages.getString("BuilderPropertyPage.Prompt"), //$NON-NLS-1$ + ExternalToolsUIMessages.BuilderPropertyPage_Migrate_project_builder_10, //$NON-NLS-1$ + ExternalToolsUIMessages.BuilderPropertyPage_Not_Support, //$NON-NLS-1$ + ExternalToolsUIMessages.BuilderPropertyPage_Prompt, //$NON-NLS-1$ false, ExternalToolsPlugin.getDefault().getPreferenceStore(), IPreferenceConstants.PROMPT_FOR_TOOL_MIGRATION); @@ -716,10 +716,10 @@ 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.getString("BuilderPropertyPage.statusMessage"), e); //$NON-NLS-1$ + status = new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsUIMessages.BuilderPropertyPage_statusMessage, e); //$NON-NLS-1$ } - ErrorDialog.openError(getShell(), ExternalToolsUIMessages.getString("BuilderPropertyPage.errorTitle"), //$NON-NLS-1$ - ExternalToolsUIMessages.getString("BuilderPropertyPage.errorMessage"), //$NON-NLS-1$ + ErrorDialog.openError(getShell(), ExternalToolsUIMessages.BuilderPropertyPage_errorTitle, //$NON-NLS-1$ + ExternalToolsUIMessages.BuilderPropertyPage_errorMessage, //$NON-NLS-1$ status); } @@ -895,7 +895,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta IProject project = getInputProject(); //get all the build commands int numCommands = itemData.length; - monitor.beginTask(ExternalToolsUIMessages.getString("BuilderPropertyPage.3"), numCommands + 1); //$NON-NLS-1$ + monitor.beginTask(ExternalToolsUIMessages.BuilderPropertyPage_3, numCommands + 1); //$NON-NLS-1$ List possibleCommands= new ArrayList(numCommands); for (int i = 0; i < numCommands; i++) { Object data = itemData[i]; @@ -935,7 +935,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta try { workingCopy.doSave(); } catch (CoreException e) { - MessageDialog.openError(getShell(), ExternalToolsUIMessages.getString("BuilderPropertyPage.39"), MessageFormat.format(ExternalToolsUIMessages.getString("BuilderPropertyPage.40"), new String[] {workingCopy.getName()})); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openError(getShell(), ExternalToolsUIMessages.BuilderPropertyPage_39, MessageFormat.format(ExternalToolsUIMessages.BuilderPropertyPage_40, new String[] {workingCopy.getName()})); //$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -998,7 +998,7 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta configsToBeDeleted.add(config); return newCommand; } catch (CoreException exception) { - MessageDialog.openError(getShell(), ExternalToolsUIMessages.getString("BuilderPropertyPage.13"), ExternalToolsUIMessages.getString("BuilderPropertyPage.error")); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openError(getShell(), ExternalToolsUIMessages.BuilderPropertyPage_13, ExternalToolsUIMessages.BuilderPropertyPage_error); //$NON-NLS-1$ //$NON-NLS-2$ 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 b17d16a1a..630eb51dc 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.getString("EditCommandDialog.0")); //$NON-NLS-1$ + getShell().setText(ExternalToolsUIMessages.EditCommandDialog_0); //$NON-NLS-1$ Composite composite = (Composite)super.createDialogArea(parent); Label label= new Label(composite, SWT.NONE); - label.setText(ExternalToolsUIMessages.getString("EditCommandDialog.1")); //$NON-NLS-1$ + label.setText(ExternalToolsUIMessages.EditCommandDialog_1); //$NON-NLS-1$ fFullButton = new Button(composite, SWT.CHECK); - fFullButton.setText(ExternalToolsUIMessages.getString("EditCommandDialog.2")); //$NON-NLS-1$ + fFullButton.setText(ExternalToolsUIMessages.EditCommandDialog_2); //$NON-NLS-1$ fFullButton.setSelection(fCommand.isBuilding(IncrementalProjectBuilder.FULL_BUILD)); fIncrementalButton = new Button(composite, SWT.CHECK); - fIncrementalButton.setText(ExternalToolsUIMessages.getString("EditCommandDialog.3")); //$NON-NLS-1$ + fIncrementalButton.setText(ExternalToolsUIMessages.EditCommandDialog_3); //$NON-NLS-1$ fIncrementalButton.setSelection(fCommand.isBuilding(IncrementalProjectBuilder.INCREMENTAL_BUILD)); fAutoButton = new Button(composite, SWT.CHECK); - fAutoButton.setText(ExternalToolsUIMessages.getString("EditCommandDialog.4")); //$NON-NLS-1$ + fAutoButton.setText(ExternalToolsUIMessages.EditCommandDialog_4); //$NON-NLS-1$ fAutoButton.setSelection(fCommand.isBuilding(IncrementalProjectBuilder.AUTO_BUILD)); fCleanButton = new Button(composite, SWT.CHECK); - fCleanButton.setText(ExternalToolsUIMessages.getString("EditCommandDialog.5")); //$NON-NLS-1$ + fCleanButton.setText(ExternalToolsUIMessages.EditCommandDialog_5); //$NON-NLS-1$ 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 25eef40c6..d2c5a22ee 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.getString("ExternalToolsPreferencePage.External_tool_project_builders_migration_2")); //$NON-NLS-1$ + setDescription(ExternalToolsUIMessages.ExternalToolsPreferencePage_External_tool_project_builders_migration_2); //$NON-NLS-1$ } /** @@ -51,8 +51,8 @@ public class ExternalToolsPreferencePage extends PreferencePage implements IWork composite.setLayout(layout); composite.setFont(parent.getFont()); - promptForToolMigrationButton= createCheckButton(composite, ExternalToolsUIMessages.getString("ExternalToolsPreferencePage.Prompt_before_migrating_3"), IPreferenceConstants.PROMPT_FOR_TOOL_MIGRATION); //$NON-NLS-1$ - promptForProjectMigrationButton= createCheckButton(composite, ExternalToolsUIMessages.getString("ExternalToolsPreferencePage.1"), IPreferenceConstants.PROMPT_FOR_PROJECT_MIGRATION); //$NON-NLS-1$ + 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$ applyDialogFont(composite); diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java index 63d91494d..1412e3887 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java @@ -1,42 +1,81 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 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 - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************** + * Copyright (c) 2005 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 http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ + * Contributors: + * IBM - Initial API and implementation + **********************************************************************/ package org.eclipse.ui.externaltools.internal.ui; +import org.eclipse.osgi.util.NLS; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +public class ExternalToolsUIMessages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.ui.externaltools.internal.ui.ExternalToolsUIMessages";//$NON-NLS-1$ + // + // Copyright (c) 2000, 2005 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 + // http://www.eclipse.org/legal/epl-v10.html + // + // Contributors: + // IBM Corporation - initial API and implementation + // -public final class ExternalToolsUIMessages { - private static final String BUNDLE_NAME= "org.eclipse.ui.externaltools.internal.ui.ExternalToolsUIMessages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = - ResourceBundle.getBundle(BUNDLE_NAME); + public static String BuilderPropertyPage_description; + public static String BuilderPropertyPage_newButton; + public static String BuilderPropertyPage_editButton; + public static String BuilderPropertyPage_removeButton; + public static String BuilderPropertyPage_upButton; + public static String BuilderPropertyPage_downButton; + public static String BuilderPropertyPage_statusMessage; + public static String BuilderPropertyPage_errorTitle; + public static String BuilderPropertyPage_errorMessage; + public static String BuilderPropertyPage_invalidBuildTool; + public static String BuilderPropertyPage_missingBuilder; + public static String BuilderPropertyPage_Exists; + public static String BuilderPropertyPage_External_Tool_Builder__0__Not_Added_2; + public static String BuilderPropertyPage__Import____3; + public static String BuilderPropertyPage_New_Builder_7; + public static String BuilderPropertyPage_Choose_configuration_type_8; + public static String BuilderPropertyPage_Choose_an_external_tool_type_to_create_9; + public static String BuilderPropertyPage_Migrate_project_builder_10; + public static String BuilderPropertyPage_Not_Support; + public static String BuilderPropertyPage_Prompt; + public static String BuilderPropertyPage_error; + public static String BuilderPropertyPage_0; + public static String BuilderPropertyPage_2; + public static String BuilderPropertyPage_1; + public static String BuilderPropertyPage_4; + public static String BuilderPropertyPage_5; + public static String BuilderPropertyPage_13; + public static String BuilderPropertyPage_39; + public static String BuilderPropertyPage_3; + public static String BuilderPropertyPage_6; + public static String BuilderPropertyPage_7; + public static String BuilderPropertyPage_40; - private ExternalToolsUIMessages(){ - // prevent instantiation of class + public static String FileSelectionDialog_Choose_Location_1; + public static String FileSelectionDialog_Ok_2; + public static String FileSelectionDialog_Cancel_3; + + public static String ExternalToolsPreferencePage_External_tool_project_builders_migration_2; + public static String ExternalToolsPreferencePage_Prompt_before_migrating_3; + public static String ExternalToolsPreferencePage_1; + + public static String ExternalToolMigration_37; + public static String ExternalToolMigration_38; + public static String EditCommandDialog_0; + public static String EditCommandDialog_1; + public static String EditCommandDialog_2; + public static String EditCommandDialog_3; + public static String EditCommandDialog_4; + public static String EditCommandDialog_5; + + static { + // load message values from bundle file + NLS.initializeMessages(BUNDLE_NAME, ExternalToolsUIMessages.class); } - - /** - * Returns the message with the given key in - * the resource bundle. If there isn't any value under - * the given key, the key is returned. - * - * @param key the message name - * @return the message - */ - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} +}
\ No newline at end of file diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.properties b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.properties index 84b880e66..bf8535d27 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.properties +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.properties @@ -1,60 +1,60 @@ -############################################################################### -# Copyright (c) 2000, 2005 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -BuilderPropertyPage.description = Configure the builders for the &project: -BuilderPropertyPage.newButton = &New... -BuilderPropertyPage.editButton = &Edit... -BuilderPropertyPage.removeButton = &Remove -BuilderPropertyPage.upButton = &Up -BuilderPropertyPage.downButton = &Down -BuilderPropertyPage.statusMessage = Internal error -BuilderPropertyPage.errorTitle = External Tool Builder Problem -BuilderPropertyPage.errorMessage = Internal error -BuilderPropertyPage.invalidBuildTool = Invalid External Tool Builder -BuilderPropertyPage.missingBuilder = Missing builder ({0}) -BuilderPropertyPage.Exists=Builder launch configuration {0} no longer exists -BuilderPropertyPage.External_Tool_Builder_{0}_Not_Added_2=External Tool Builder {0} Not Added -BuilderPropertyPage.&Import..._3=&Import... -BuilderPropertyPage.New_Builder_7=New_Builder -BuilderPropertyPage.Choose_configuration_type_8=Choose configuration type -BuilderPropertyPage.Choose_an_external_tool_type_to_create_9=&Choose an external tool type to create: -BuilderPropertyPage.Migrate_project_builder_10=Migrate project builder -BuilderPropertyPage.Not_Support=This project builder is stored in a format that is no longer supported. If you wish to edit this builder, it will first be migrated to a new format. If you proceed, this project builder will not be understood by installations using the old format.\n\nProceed with migration? -BuilderPropertyPage.Prompt=&Do not prompt before migrating project builders -BuilderPropertyPage.error=An error occurred while saving the project\'s build commands -BuilderPropertyPage.0=Project Migration -BuilderPropertyPage.2=&Do not prompt before migrating projects -BuilderPropertyPage.1=This project stores its builders in a format that is no longer supported. If any changes are made, the project will be migrated to the new format which will not be understood by installations using the old format.\n\nProceed? (Selecting "No" will open the page read-only) -BuilderPropertyPage.4=Import launch configuration -BuilderPropertyPage.5=&Choose a launch configuration from the workspace to import.\nThis will create a copy of the selected configuration. -BuilderPropertyPage.13=Command error -BuilderPropertyPage.39=Error Saving Builder -BuilderPropertyPage.3=Updating builders... -BuilderPropertyPage.6=Confirm Disable Builder -BuilderPropertyPage.7=This is an advanced operation. Disabling a project builder can have many side-effects. Continue? -BuilderPropertyPage.40=An exception occurred while attempting to save builder {0} - -FileSelectionDialog.Choose_Location_1=Choose Location -FileSelectionDialog.Ok_2=Ok -FileSelectionDialog.Cancel_3=Cancel - -ExternalToolsPreferencePage.External_tool_project_builders_migration_2=External tool project builders stored in an old format will be migrated to a new format when edited. Projects which store builders using an old format will be migrated whenever a change is made. Once migrated, project builders will not be understood by installations using these older formats. -ExternalToolsPreferencePage.Prompt_before_migrating_3=&Confirm before migrating external tool project builders for edit -ExternalToolsPreferencePage.1=C&onfirm before migrating projects to the new format - -ExternalToolMigration.37=An exception occurred accessing external tool\'s \"run in background\" attribute -ExternalToolMigration.38=An exception occurred attempting to migrate external tool\'s \"run in background\" attribute -EditCommandDialog.0=Configure Builder -EditCommandDialog.1=Run this builder: -EditCommandDialog.2=After a "&Clean" -EditCommandDialog.3=During &manual builds -EditCommandDialog.4=During &auto builds -EditCommandDialog.5=&During a "Clean" +###############################################################################
+# Copyright (c) 2000, 2005 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+BuilderPropertyPage_description = Configure the builders for the &project:
+BuilderPropertyPage_newButton = &New...
+BuilderPropertyPage_editButton = &Edit...
+BuilderPropertyPage_removeButton = &Remove
+BuilderPropertyPage_upButton = &Up
+BuilderPropertyPage_downButton = &Down
+BuilderPropertyPage_statusMessage = Internal error
+BuilderPropertyPage_errorTitle = External Tool Builder Problem
+BuilderPropertyPage_errorMessage = Internal error
+BuilderPropertyPage_invalidBuildTool = Invalid External Tool Builder
+BuilderPropertyPage_missingBuilder = Missing builder ({0})
+BuilderPropertyPage_Exists=Builder launch configuration {0} no longer exists
+BuilderPropertyPage_External_Tool_Builder__0__Not_Added_2=External Tool Builder {0} Not Added
+BuilderPropertyPage__Import____3=&Import...
+BuilderPropertyPage_New_Builder_7=New_Builder
+BuilderPropertyPage_Choose_configuration_type_8=Choose configuration type
+BuilderPropertyPage_Choose_an_external_tool_type_to_create_9=&Choose an external tool type to create:
+BuilderPropertyPage_Migrate_project_builder_10=Migrate project builder
+BuilderPropertyPage_Not_Support=This project builder is stored in a format that is no longer supported. If you wish to edit this builder, it will first be migrated to a new format. If you proceed, this project builder will not be understood by installations using the old format.\n\nProceed with migration?
+BuilderPropertyPage_Prompt=&Do not prompt before migrating project builders
+BuilderPropertyPage_error=An error occurred while saving the project\'s build commands
+BuilderPropertyPage_0=Project Migration
+BuilderPropertyPage_2=&Do not prompt before migrating projects
+BuilderPropertyPage_1=This project stores its builders in a format that is no longer supported. If any changes are made, the project will be migrated to the new format which will not be understood by installations using the old format.\n\nProceed? (Selecting "No" will open the page read-only)
+BuilderPropertyPage_4=Import launch configuration
+BuilderPropertyPage_5=&Choose a launch configuration from the workspace to import.\nThis will create a copy of the selected configuration.
+BuilderPropertyPage_13=Command error
+BuilderPropertyPage_39=Error Saving Builder
+BuilderPropertyPage_3=Updating builders...
+BuilderPropertyPage_6=Confirm Disable Builder
+BuilderPropertyPage_7=This is an advanced operation. Disabling a project builder can have many side-effects. Continue?
+BuilderPropertyPage_40=An exception occurred while attempting to save builder {0}
+
+FileSelectionDialog_Choose_Location_1=Choose Location
+FileSelectionDialog_Ok_2=Ok
+FileSelectionDialog_Cancel_3=Cancel
+
+ExternalToolsPreferencePage_External_tool_project_builders_migration_2=External tool project builders stored in an old format will be migrated to a new format when edited. Projects which store builders using an old format will be migrated whenever a change is made. Once migrated, project builders will not be understood by installations using these older formats.
+ExternalToolsPreferencePage_Prompt_before_migrating_3=&Confirm before migrating external tool project builders for edit
+ExternalToolsPreferencePage_1=C&onfirm before migrating projects to the new format
+
+ExternalToolMigration_37=An exception occurred accessing external tool\'s \"run in background\" attribute
+ExternalToolMigration_38=An exception occurred attempting to migrate external tool\'s \"run in background\" attribute
+EditCommandDialog_0=Configure Builder
+EditCommandDialog_1=Run this builder:
+EditCommandDialog_2=After a "&Clean"
+EditCommandDialog_3=During &manual builds
+EditCommandDialog_4=During &auto builds
+EditCommandDialog_5=&During a "Clean"
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 b30f51455..947c37664 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.getString("FileSelectionDialog.Choose_Location_1"), null, message, MessageDialog.NONE, new String[] { ExternalToolsUIMessages.getString("FileSelectionDialog.Ok_2"), ExternalToolsUIMessages.getString("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); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 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 0ca1bc3f0..411dd62b5 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.getString("BuildProjectResolver.3"), new String[]{getReferenceExpression(variable, argument)}), null); //$NON-NLS-1$ + abort(MessageFormat.format(VariableMessages.BuildProjectResolver_3, new String[]{getReferenceExpression(variable, argument)}), null); //$NON-NLS-1$ 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 bb109dc2c..cf7242852 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.getString("SystemPathResolver.0"), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, IExternalToolConstants.ERR_INTERNAL_ERROR, VariableMessages.SystemPathResolver_0, null)); //$NON-NLS-1$ } Map map= DebugPlugin.getDefault().getLaunchManager().getNativeEnvironment(); String path= (String) map.get("PATH"); //$NON-NLS-1$ diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.java index 4bf736a57..8d7125c13 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.java @@ -1,31 +1,34 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 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 - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************** + * Copyright (c) 2005 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 http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ + * Contributors: + * IBM - Initial API and implementation + **********************************************************************/ package org.eclipse.ui.externaltools.internal.variables; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import org.eclipse.osgi.util.NLS; -public class VariableMessages { - +public class VariableMessages extends NLS { private static final String BUNDLE_NAME = "org.eclipse.ui.externaltools.internal.variables.VariableMessages";//$NON-NLS-1$ - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); - - private VariableMessages() { - } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } + // + // Copyright (c) 2000, 2005 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 + // http://www.eclipse.org/legal/epl-v10.html + // + // Contributors: + // IBM Corporation - initial API and implementation + // + + public static String BuildProjectResolver_3; + public static String SystemPathResolver_0; + + static { + // load message values from bundle file + NLS.initializeMessages(BUNDLE_NAME, VariableMessages.class); } -} +}
\ No newline at end of file diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.properties b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.properties index e5d83a871..a9f220c84 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.properties +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.properties @@ -1,13 +1,13 @@ -############################################################################### -# Copyright (c) 2000, 2005 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -BuildProjectResolver.3=Variable references non-existent resource : {0} -SystemPathResolver.0=External tool argument must be specified for the system_path variable +###############################################################################
+# Copyright (c) 2000, 2005 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+BuildProjectResolver_3=Variable references non-existent resource : {0}
+SystemPathResolver_0=External tool argument must be specified for the system_path variable
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 c3061c8ba..18ed8d040 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.getString("BackgroundResourceRefresher.0")) { //$NON-NLS-1$ + Job job= new Job(ExternalToolsProgramMessages.BackgroundResourceRefresher_0) { //$NON-NLS-1$ 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/ExternalToolsProgramMessages.java b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.java index d26f1bac5..eb82e5b50 100644 --- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.java +++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.java @@ -1,34 +1,40 @@ -/******************************************************************************* - * Copyright (c) 2000, 2005 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 - * http://www.eclipse.org/legal/epl-v10.html +/********************************************************************** + * Copyright (c) 2005 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 http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ + * Contributors: + * IBM - Initial API and implementation + **********************************************************************/ package org.eclipse.ui.externaltools.internal.program.launchConfigurations; +import org.eclipse.osgi.util.NLS; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +public class ExternalToolsProgramMessages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.ui.externaltools.internal.program.launchConfigurations.ExternalToolsProgramMessages";//$NON-NLS-1$ + // + // Copyright (c) 2000, 2005 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 + // http://www.eclipse.org/legal/epl-v10.html + // + // Contributors: + // IBM Corporation - initial API and implementation + // -public class ExternalToolsProgramMessages { + public static String BackgroundResourceRefresher_0; - private static final String BUNDLE_NAME = "org.eclipse.ui.externaltools.internal.program.launchConfigurations.ExternalToolsProgramMessages"; //$NON-NLS-1$ + public static String ProgramLaunchDelegate_Workbench_Closing_1; + public static String ProgramLaunchDelegate_The_workbench_is_exiting; + public static String ProgramLaunchDelegate_3; + public static String ProgramLaunchDelegate_4; - private static final ResourceBundle RESOURCE_BUNDLE = - ResourceBundle.getBundle(BUNDLE_NAME); + public static String ProgramMainTab_Select; - private ExternalToolsProgramMessages() { + static { + // load message values from bundle file + NLS.initializeMessages(BUNDLE_NAME, ExternalToolsProgramMessages.class); } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} +}
\ No newline at end of file diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.properties b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.properties index 65bd2246a..1e5022ad2 100644 --- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.properties +++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.properties @@ -1,19 +1,19 @@ -############################################################################### -# Copyright (c) 2000, 2005 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -BackgroundResourceRefresher.0=Refreshing resources... - -ProgramLaunchDelegate.Workbench_Closing_1=Workbench Closing -ProgramLaunchDelegate.The_workbench_is_exiting=The workbench is exiting and a program launched from an external tool appears to still be running. These programs will be terminated when the workbench exits. It is recommended that you exit any external programs launched from the workbench before you proceed.\n\nClick OK to continue exiting the workbench. -ProgramLaunchDelegate.3=Running {0}... -ProgramLaunchDelegate.4=An IProcess could not be created for the launch - -ProgramMainTab.Select=&Select a program: +###############################################################################
+# Copyright (c) 2000, 2005 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+BackgroundResourceRefresher_0=Refreshing resources...
+
+ProgramLaunchDelegate_Workbench_Closing_1=Workbench Closing
+ProgramLaunchDelegate_The_workbench_is_exiting=The workbench is exiting and a program launched from an external tool appears to still be running. These programs will be terminated when the workbench exits. It is recommended that you exit any external programs launched from the workbench before you proceed.\n\nClick OK to continue exiting the workbench.
+ProgramLaunchDelegate_3=Running {0}...
+ProgramLaunchDelegate_4=An IProcess could not be created for the launch
+
+ProgramMainTab_Select=&Select a program:
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 6c0ec6485..19cedb961 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.getString("ProgramLaunchDelegate.Workbench_Closing_1"), ExternalToolsProgramMessages.getString("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); //$NON-NLS-1$ //$NON-NLS-2$ 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.getString("ProgramLaunchDelegate.3"), new String[] {configuration.getName()}), IProgressMonitor.UNKNOWN); //$NON-NLS-1$ + monitor.beginTask(MessageFormat.format(ExternalToolsProgramMessages.ProgramLaunchDelegate_3, new String[] {configuration.getName()}), IProgressMonitor.UNKNOWN); //$NON-NLS-1$ 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.getString("ProgramLaunchDelegate.4"), null)); //$NON-NLS-1$ + throw new CoreException(new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, IExternalToolConstants.ERR_INTERNAL_ERROR, ExternalToolsProgramMessages.ProgramLaunchDelegate_4, null)); //$NON-NLS-1$ } } 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 54b58b479..19e2e7848 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.getString("ProgramMainTab.Select")); //$NON-NLS-1$ + dialog = new FileSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), ExternalToolsProgramMessages.ProgramMainTab_Select); //$NON-NLS-1$ dialog.open(); IStructuredSelection result = dialog.getResult(); if (result == null) { |