Author: sflanigan
Date: 2009-05-25 00:46:05 -0400 (Mon, 25 May 2009)
New Revision: 15474
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DebugServerActionDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/marker/ConfigureRuntimeMarkerResolution.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathChangeValueAction.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/J2EEModuleExportOperation.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-25
04:46:05 UTC (rev 15474)
@@ -6,3 +6,4 @@
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -2,7 +2,7 @@
public interface IPreferenceKeys {
- public static final String ENABLED_DECORATORS =
"org.jboss.ide.eclipse.as.ui.preferences.enabledDecorators.1";
- public static final String DISABLE_SHOW_SERVER_VIEW =
"org.jboss.ide.eclipse.as.ui.preferences.disabled.automatic.server.view";
- public static final String RUNTIME_HOME_PREF_KEY_PREFIX =
"org.jboss.ide.eclipse.as.ui.preferences.runtime.last.type.";
+ public static final String ENABLED_DECORATORS =
"org.jboss.ide.eclipse.as.ui.preferences.enabledDecorators.1"; //$NON-NLS-1$
+ public static final String DISABLE_SHOW_SERVER_VIEW =
"org.jboss.ide.eclipse.as.ui.preferences.disabled.automatic.server.view";
//$NON-NLS-1$
+ public static final String RUNTIME_HOME_PREF_KEY_PREFIX =
"org.jboss.ide.eclipse.as.ui.preferences.runtime.last.type."; //$NON-NLS-1$
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -69,8 +69,8 @@
if( !prefs.getBoolean(IPreferenceKeys.ENABLED_DECORATORS)) {
IDecoratorManager manager = WorkbenchPlugin.getDefault().getDecoratorManager();
- manager.setEnabled("org.jboss.tools.as.wst.server.ui.navigatorDecorator",
true);
- manager.setEnabled("org.jboss.ide.eclipse.as.ui.extensions.xml.decorator",
true);
+ manager.setEnabled("org.jboss.tools.as.wst.server.ui.navigatorDecorator",
true); //$NON-NLS-1$
+ manager.setEnabled("org.jboss.ide.eclipse.as.ui.extensions.xml.decorator",
true); //$NON-NLS-1$
prefs.setValue(IPreferenceKeys.ENABLED_DECORATORS, true);
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -36,25 +36,25 @@
*/
public class JBossServerUISharedImages {
- public static final String IMG_JBOSS = "jboss";
- public static final String IMG_JBOSS_CONFIGURATION = "jbossconfiguration";
+ public static final String IMG_JBOSS = "jboss"; //$NON-NLS-1$
+ public static final String IMG_JBOSS_CONFIGURATION = "jbossconfiguration";
//$NON-NLS-1$
- public static final String WIZBAN_JBOSS32_LOGO = "jboss3.2logo";
- public static final String WIZBAN_JBOSS40_LOGO = "jboss4.0logo";
- public static final String WIZBAN_JBOSS42_LOGO = "jboss4.2logo";
- public static final String WIZBAN_JBOSS50_LOGO = "jboss5.0logo";
- public static final String WIZBAN_JBOSS_EAP_LOGO = "jbossEAPlogo";
- public static final String WIZBAN_DEPLOY_ONLY_LOGO = "jbossdeployerlogo";
- public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE";
- public static final String INACTIVE_CATEGORY_IMAGE =
"INACTIVE_CATEGORY_IMAGE";
- public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE";
- public static final String PUBLISH_IMAGE = "PUBLISH_IMAGE";
- public static final String UNPUBLISH_IMAGE = "UNPUBLISH_IMAGE";
- public static final String JMX_IMAGE = "JMX_IMAGE";
- public static final String EXPLORE_IMAGE = "EXPLORE_IMAGE";
- public static final String XPATH_LEVEL_1 = "xpath_level_1";
- public static final String XPATH_LEVEL_2 = "xpath_level_2";
- public static final String XPATH_LEVEL_3 = "xpath_level_3";
+ public static final String WIZBAN_JBOSS32_LOGO = "jboss3.2logo";
//$NON-NLS-1$
+ public static final String WIZBAN_JBOSS40_LOGO = "jboss4.0logo";
//$NON-NLS-1$
+ public static final String WIZBAN_JBOSS42_LOGO = "jboss4.2logo";
//$NON-NLS-1$
+ public static final String WIZBAN_JBOSS50_LOGO = "jboss5.0logo";
//$NON-NLS-1$
+ public static final String WIZBAN_JBOSS_EAP_LOGO = "jbossEAPlogo";
//$NON-NLS-1$
+ public static final String WIZBAN_DEPLOY_ONLY_LOGO = "jbossdeployerlogo";
//$NON-NLS-1$
+ public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE"; //$NON-NLS-1$
+ public static final String INACTIVE_CATEGORY_IMAGE =
"INACTIVE_CATEGORY_IMAGE"; //$NON-NLS-1$
+ public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE";
//$NON-NLS-1$
+ public static final String PUBLISH_IMAGE = "PUBLISH_IMAGE"; //$NON-NLS-1$
+ public static final String UNPUBLISH_IMAGE = "UNPUBLISH_IMAGE"; //$NON-NLS-1$
+ public static final String JMX_IMAGE = "JMX_IMAGE"; //$NON-NLS-1$
+ public static final String EXPLORE_IMAGE = "EXPLORE_IMAGE"; //$NON-NLS-1$
+ public static final String XPATH_LEVEL_1 = "xpath_level_1"; //$NON-NLS-1$
+ public static final String XPATH_LEVEL_2 = "xpath_level_2"; //$NON-NLS-1$
+ public static final String XPATH_LEVEL_3 = "xpath_level_3"; //$NON-NLS-1$
@@ -68,24 +68,24 @@
descriptors = new Hashtable<String, Object>();
Bundle pluginBundle = JBossServerUIPlugin.getDefault().getBundle();
- descriptors.put(IMG_JBOSS, createImageDescriptor(pluginBundle,
"/icons/jboss.gif"));
- descriptors.put(IMG_JBOSS_CONFIGURATION, createImageDescriptor(pluginBundle,
"/icons/jboss-configuration.gif"));
+ descriptors.put(IMG_JBOSS, createImageDescriptor(pluginBundle,
"/icons/jboss.gif")); //$NON-NLS-1$
+ descriptors.put(IMG_JBOSS_CONFIGURATION, createImageDescriptor(pluginBundle,
"/icons/jboss-configuration.gif")); //$NON-NLS-1$
- descriptors.put(WIZBAN_JBOSS32_LOGO, createImageDescriptor(pluginBundle,
"/icons/logo32.gif"));
- descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle,
"/icons/logo40.gif"));
- descriptors.put(WIZBAN_JBOSS42_LOGO, createImageDescriptor(pluginBundle,
"/icons/logo42.gif"));
- descriptors.put(WIZBAN_JBOSS50_LOGO, createImageDescriptor(pluginBundle,
"/icons/logo50.gif"));
- descriptors.put(WIZBAN_JBOSS_EAP_LOGO, createImageDescriptor(pluginBundle,
"/icons/logoEAP.gif"));
- descriptors.put(WIZBAN_DEPLOY_ONLY_LOGO, createImageDescriptor(pluginBundle,
"/icons/blank.gif"));
- descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle,
"icons/twiddle.gif"));
- descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle,
"/icons/inactiveCat.gif"));
- descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle,
"/icons/publish.gif"));
- descriptors.put(UNPUBLISH_IMAGE, createImageDescriptor(pluginBundle,
"/icons/unpublish.gif"));
- descriptors.put(JMX_IMAGE, createImageDescriptor(pluginBundle,
"/icons/jmeth_obj.gif"));
- descriptors.put(EXPLORE_IMAGE, createImageDescriptor(pluginBundle,
"/icons/actions/xpl/explore.gif"));
- descriptors.put(XPATH_LEVEL_1, createImageDescriptor(pluginBundle,
"icons/xpath_level_1.gif"));
- descriptors.put(XPATH_LEVEL_2, createImageDescriptor(pluginBundle,
"icons/xpath_level_2.gif"));
- descriptors.put(XPATH_LEVEL_3, createImageDescriptor(pluginBundle,
"icons/xpath_level_3.gif"));
+ descriptors.put(WIZBAN_JBOSS32_LOGO, createImageDescriptor(pluginBundle,
"/icons/logo32.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle,
"/icons/logo40.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS42_LOGO, createImageDescriptor(pluginBundle,
"/icons/logo42.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS50_LOGO, createImageDescriptor(pluginBundle,
"/icons/logo50.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS_EAP_LOGO, createImageDescriptor(pluginBundle,
"/icons/logoEAP.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_DEPLOY_ONLY_LOGO, createImageDescriptor(pluginBundle,
"/icons/blank.gif")); //$NON-NLS-1$
+ descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle,
"icons/twiddle.gif")); //$NON-NLS-1$
+ descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle,
"/icons/inactiveCat.gif")); //$NON-NLS-1$
+ descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle,
"/icons/publish.gif")); //$NON-NLS-1$
+ descriptors.put(UNPUBLISH_IMAGE, createImageDescriptor(pluginBundle,
"/icons/unpublish.gif")); //$NON-NLS-1$
+ descriptors.put(JMX_IMAGE, createImageDescriptor(pluginBundle,
"/icons/jmeth_obj.gif")); //$NON-NLS-1$
+ descriptors.put(EXPLORE_IMAGE, createImageDescriptor(pluginBundle,
"/icons/actions/xpl/explore.gif")); //$NON-NLS-1$
+ descriptors.put(XPATH_LEVEL_1, createImageDescriptor(pluginBundle,
"icons/xpath_level_1.gif")); //$NON-NLS-1$
+ descriptors.put(XPATH_LEVEL_2, createImageDescriptor(pluginBundle,
"icons/xpath_level_2.gif")); //$NON-NLS-1$
+ descriptors.put(XPATH_LEVEL_3, createImageDescriptor(pluginBundle,
"icons/xpath_level_3.gif")); //$NON-NLS-1$
Iterator<String> iter = descriptors.keySet().iterator();
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -118,7 +118,7 @@
if(isEar) {
IVirtualComponent component = ComponentCore.createComponent(project);
IPath path = component.getRootFolder().getProjectRelativePath();
- IFile f =
project.getFile(path.append("META-INF").append("application.xml"));
+ IFile f =
project.getFile(path.append("META-INF").append("application.xml"));
//$NON-NLS-1$ //$NON-NLS-2$
if(f != null && f.exists()) {
fs.add(f);
}
@@ -126,7 +126,7 @@
if(isWar && !isReferencedByEar) {
IVirtualComponent component = ComponentCore.createComponent(project);
IPath path = component.getRootFolder().getProjectRelativePath();
- IFile f =
project.getFile(path.append("WEB-INF").append("web.xml"));
+ IFile f =
project.getFile(path.append("WEB-INF").append("web.xml"));
//$NON-NLS-1$ //$NON-NLS-2$
if(f != null && f.exists()) {
fs.add(f);
}
@@ -134,7 +134,7 @@
if(isESBProject(project)) {
IVirtualComponent component = ComponentCore.createComponent(project);
IPath path = component.getRootFolder().getProjectRelativePath();
- IFile f =
project.getFile(path.append("META-INF").append("jboss-esb.xml"));
+ IFile f =
project.getFile(path.append("META-INF").append("jboss-esb.xml"));
//$NON-NLS-1$ //$NON-NLS-2$
if(f != null && f.exists()) {
fs.add(f);
}
@@ -143,7 +143,7 @@
return fs;
}
- private final static String ESB_PROJECT_FACET = "jst.jboss.esb";
+ private final static String ESB_PROJECT_FACET = "jst.jboss.esb";
//$NON-NLS-1$
private static boolean isESBProject(IProject project) {
IFacetedProject facetedProject = null;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DebugServerActionDelegate.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DebugServerActionDelegate.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DebugServerActionDelegate.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -26,7 +26,7 @@
String name = selected == null ? "" : selected.getName(); //$NON-NLS-1$
if( selected != null && selected.getServerState() == IServer.STATE_STARTED)
return NLS.bind(ServerActionMessages.RESTART_IN_DEBUG_MODE, name);
- return NLS.bind(ServerActionMessages.START_IN_DEBUG_MODE, name); //$NON-NLS-2$
+ return NLS.bind(ServerActionMessages.START_IN_DEBUG_MODE, name);
}
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -23,6 +23,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.Messages;
/**
* @author snjeza
@@ -31,9 +32,9 @@
public class ExploreUtils {
- public final static String PATH = "{%}";
- public final static String EXPLORE = "Explore";
- public final static String EXPLORE_DESCRIPTION = "Explore deploy directory";
+ public final static String PATH = "{%}"; //$NON-NLS-1$
+ public final static String EXPLORE = Messages.ExploreUtils_Action_Text;
+ public final static String EXPLORE_DESCRIPTION = Messages.ExploreUtils_Description;
private static String exploreFolderCommand;
private static String[] exploreFolderCommandArray;
private static String exploreFileCommand;
@@ -52,27 +53,28 @@
return exploreFileCommand;
}
+ @SuppressWarnings("nls")
private static void setExploreCommands() {
if (Platform.OS_MACOSX.equals(Platform.getOS())) {
- exploreFolderCommand = "/usr/bin/open -a /System/Library/CoreServices/Finder.app
\""
- + PATH + "\"";
+ exploreFolderCommand = "/usr/bin/open -a /System/Library/CoreServices/Finder.app
\"" //$NON-NLS-1$
+ + PATH + "\""; //$NON-NLS-1$
exploreFileCommand = exploreFolderCommand;
} else if (Platform.OS_WIN32.equals(Platform.getOS())) {
- exploreFolderCommand = "cmd /C start explorer /root,/e,\""
- + PATH + "\"";
- exploreFileCommand = "cmd /C start explorer /select,/e,\""
- + PATH + "\"";
+ exploreFolderCommand = "cmd /C start explorer /root,/e,\""
//$NON-NLS-1$
+ + PATH + "\""; //$NON-NLS-1$
+ exploreFileCommand = "cmd /C start explorer /select,/e,\""
//$NON-NLS-1$
+ + PATH + "\""; //$NON-NLS-1$
} else if (Platform.OS_LINUX.equals(Platform.getOS())) {
- if (new File("/usr/bin/nautilus").exists()) {
+ if (new File("/usr/bin/nautilus").exists()) { //$NON-NLS-1$
exploreFolderCommandArray = new String[3];
- exploreFolderCommandArray[0]="/usr/bin/nautilus";
- exploreFolderCommandArray[1]="--no-desktop";
- exploreFolderCommand = "";
- } else if (new File("/usr/bin/konqueror").exists()) {
+ exploreFolderCommandArray[0]="/usr/bin/nautilus"; //$NON-NLS-1$
+ exploreFolderCommandArray[1]="--no-desktop"; //$NON-NLS-1$
+ exploreFolderCommand = ""; //$NON-NLS-1$
+ } else if (new File("/usr/bin/konqueror").exists()) { //$NON-NLS-1$
exploreFolderCommandArray = new String[2];
- exploreFolderCommandArray[0]="/usr/bin/konqueror";
- exploreFolderCommand = "";
+ exploreFolderCommandArray[0]="/usr/bin/konqueror"; //$NON-NLS-1$
+ exploreFolderCommand = ""; //$NON-NLS-1$
}
exploreFileCommand = exploreFolderCommand;
}
@@ -87,7 +89,7 @@
ServerAttributeHelper helper = new ServerAttributeHelper(swc
.getOriginal(), swc);
String deployDirectory = helper.getAttribute(
- IDeployableServer.DEPLOY_DIRECTORY, "");
+ IDeployableServer.DEPLOY_DIRECTORY, ""); //$NON-NLS-1$
return deployDirectory.trim();
}
@@ -130,6 +132,7 @@
}
}
+ @SuppressWarnings("nls")
public static IPath getDeployPath(IDeployableServer server,IModule[] moduleTree) {
IPath root = new Path( server.getDeployFolder() );
String type, name;
@@ -139,18 +142,18 @@
if( new Path(name).segmentCount() > 1 )
// we strongly suspect this is a binary object and not a project
return root.append(new Path(name).lastSegment());
- if( "jst.ear".equals(type))
- root = root.append(name + ".ear");
- else if( "jst.web".equals(type))
- root = root.append(name + ".war");
- else if( "jst.utility".equals(type) && i >= 1 &&
"jst.web".equals(moduleTree[i-1].getModuleType().getId()))
- root = root.append("WEB-INF").append("lib").append(name +
".jar");
- else if( "jst.connector".equals(type)) {
- root = root.append(name + ".rar");
- } else if( "jst.jboss.esb".equals(type)){
- root = root.append(name + ".esb");
+ if( "jst.ear".equals(type)) //$NON-NLS-1$
+ root = root.append(name + ".ear"); //$NON-NLS-1$
+ else if( "jst.web".equals(type)) //$NON-NLS-1$
+ root = root.append(name + ".war"); //$NON-NLS-1$
+ else if( "jst.utility".equals(type) && i >= 1 &&
"jst.web".equals(moduleTree[i-1].getModuleType().getId())) //$NON-NLS-1$
//$NON-NLS-2$
+ root = root.append("WEB-INF").append("lib").append(name +
".jar"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ else if( "jst.connector".equals(type)) { //$NON-NLS-1$
+ root = root.append(name + ".rar"); //$NON-NLS-1$
+ } else if( "jst.jboss.esb".equals(type)){ //$NON-NLS-1$
+ root = root.append(name + ".esb"); //$NON-NLS-1$
}else
- root = root.append(name + ".jar");
+ root = root.append(name + ".jar"); //$NON-NLS-1$
}
return root;
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -118,7 +118,7 @@
private void createNewServerItem(Menu menu) {
MenuItem item = new MenuItem(menu, SWT.PUSH);
- item.setText("New server...");
+ item.setText(ServerActionMessages.SelectServerActionDelegate_NewServerMenuItem);
item.setImage(JBossServerUISharedImages.getImage(JBossServerUISharedImages.GENERIC_SERVER_IMAGE));
item.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerManager.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerManager.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerManager.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -110,7 +110,7 @@
public String getSelectedServerId() {
String result = getDefaultWebServer();
- return result == null ? "" : result;
+ return result == null ? "" : result; //$NON-NLS-1$
}
public IServer getSelectedServer() {
@@ -156,7 +156,7 @@
}
}
- static String DEFAULT_WEB_SERVER = JBossServerUIPlugin.PLUGIN_ID +
".defaultWebServer";
+ static String DEFAULT_WEB_SERVER = JBossServerUIPlugin.PLUGIN_ID +
".defaultWebServer"; //$NON-NLS-1$
static String getDefaultWebServer() {
String result = getInstancePreference(DEFAULT_WEB_SERVER);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -169,7 +169,7 @@
dialog.run(true, false, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
- monitor.beginTask("Loading...", items.length);
+ monitor.beginTask(Messages.ChangePortDialog_LoadingTaskName, items.length);
for( int i = 0; i < items.length; i++ ) {
countMatches(currentQuery);
monitor.worked(1);
@@ -218,7 +218,7 @@
return new Integer(count).toString();
}
private String safeString(String s) {
- return s == null ? "" : s;
+ return s == null ? "" : s; //$NON-NLS-1$
}
public String getSelection() {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -69,12 +69,12 @@
private Node node;
private ArrayList keyRows;
- private static final String NO_ATTRIBUTE = "NONE";
+ private static final String NO_ATTRIBUTE = "NONE"; //$NON-NLS-1$
protected ConvertNodeToXPathDialog(Shell parentShell, Node node, String attributeName)
{
super(parentShell);
this.node = node;
- setAttribute(attributeName == null ? "" : attributeName);
+ setAttribute(attributeName == null ? "" : attributeName); //$NON-NLS-1$
}
protected void configureShell(Shell shell) {
@@ -117,9 +117,9 @@
main.setLayout(new GridLayout(2, false));
keyRows = new ArrayList();
Node localNode = node;
- String pathText = "";
+ String pathText = ""; //$NON-NLS-1$
while( localNode != null && !(localNode instanceof IDOMDocument)) {
- if( !localNode.getNodeName().equals("#text")) {
+ if( !localNode.getNodeName().equals("#text")) { //$NON-NLS-1$
keyRows.add(0, new NameComboPair(main, localNode));
}
localNode = localNode.getParentNode();
@@ -129,7 +129,7 @@
((NameComboPair)keyRows.get(i)).create();
}
- main.setText("Keyed Attributes");
+ main.setText(Messages.ConvertNodeToXPathDialog_KeyedAttributes);
// The very last row should not key off the same attribute name that they wish to
change
@@ -148,15 +148,15 @@
ArrayList errors = super.getErrors();
NameComboPair pair = (NameComboPair)keyRows.get(keyRows.size()-1);
String val = pair.combo.getItem(pair.combo.getSelectionIndex());
- if(attribute != null && val.startsWith(attribute + "=")) {
- errors.add("You should not key off the value you wish to change");
+ if(attribute != null && val.startsWith(attribute + "=")) {
//$NON-NLS-1$
+ errors.add(Messages.ConvertNodeToXPathDialog_ErrorMessage);
}
return errors;
}
public void refreshXPath() {
- String finalString = "";
+ String finalString = ""; //$NON-NLS-1$
for( int i = 0; i < keyRows.size(); i++ ) {
finalString += ((NameComboPair)keyRows.get(i)).toString();
}
@@ -189,8 +189,8 @@
Node attr = map.item(i);
if( attr instanceof AttrImpl ) {
AttrImpl impl = ((AttrImpl)attr);
- list.add(impl.getName() + "='" + impl.getValue() +
"'");
- if( impl.getName().equals("name") &&
!attribute.equals("name"))
+ list.add(impl.getName() + "='" + impl.getValue() + "'");
//$NON-NLS-1$ //$NON-NLS-2$
+ if( impl.getName().equals("name") &&
!attribute.equals("name")) //$NON-NLS-1$ //$NON-NLS-2$
selectedIndex = i+1;
}
}
@@ -210,10 +210,10 @@
}
public String toString() {
- String ret = "/" + node.getNodeName();
+ String ret = "/" + node.getNodeName(); //$NON-NLS-1$
String comboSelection = combo.getItem(combo.getSelectionIndex());
if( !comboSelection.equals(NO_ATTRIBUTE))
- ret += "[@" + comboSelection + "]";
+ ret += "[@" + comboSelection + "]"; //$NON-NLS-1$ //$NON-NLS-2$
return ret;
}
}
@@ -239,7 +239,7 @@
}
public String getDisplayString() {
- return "Add to XPaths";
+ return Messages.ConvertNodeToXPathDialog_DisplayString;
}
public Image getImage() {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -58,7 +58,7 @@
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText("Server Credentials Required");
+ newShell.setText(Messages.RequiredCredentialsDialog_ShellText);
}
protected Control createDialogArea(Composite parent) {
@@ -124,7 +124,7 @@
// create OK and Cancel buttons by default
createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
true);
- createButton(parent, IDialogConstants.CANCEL_ID, "Ignore", false);
+ createButton(parent, IDialogConstants.CANCEL_ID,
Messages.RequiredCredentialsDialog_IgnoreButton, false);
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -124,7 +124,7 @@
} );
}
} catch( Exception e ) {
- IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID,
"Unexpected error in TwiddleDialog", e);
+ IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID,
Messages.TwiddleDialog_UnexpectedError, e);
JBossServerUIPlugin.getDefault().getLog().log(status);
}
@@ -150,7 +150,7 @@
queryLabel.setLayoutData(queryLabelData);
Workbench.getInstance().getHelpSystem().setHelp(getShell(),
- "org.jboss.ide.eclipse.as.ui.twiddle_usage_tutorial_help");
+ "org.jboss.ide.eclipse.as.ui.twiddle_usage_tutorial_help"); //$NON-NLS-1$
query = new Text(main, SWT.BORDER);
FormData queryData = new FormData();
@@ -169,7 +169,7 @@
resultsData.bottom = new FormAttachment(100,-5);
resultsData.top = new FormAttachment(query, 5);
results.setLayoutData(resultsData);
- results.setFont(new Font(null, "Courier New", 8, SWT.NONE));
+ results.setFont(new Font(null, "Courier New", 8, SWT.NONE)); //$NON-NLS-1$
// set the default text
try {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -216,7 +216,7 @@
protected void createButtonsForButtonBar(Composite parent) {
// create OK and Cancel buttons by default
super.createButtonsForButtonBar(parent);
- previewButton = createButton(parent, previewId, "Preview", true);
+ previewButton = createButton(parent, previewId, Messages.XPathDialogs_PreviewButton,
true);
if( name == null ) getButton(IDialogConstants.OK_ID).setEnabled(false);
addListeners();
checkErrors();
@@ -351,13 +351,13 @@
}
protected String getServerError() {
- if( server == null ) return "Please Select a Server";
+ if( server == null ) return Messages.XPathDialogs_SelectServer;
return null;
}
protected String getCategoryError() {
- if( "".equals(category)) {
- return "Category must not be blank";
+ if( "".equals(category)) { //$NON-NLS-1$
+ return Messages.XPathDialogs_BlankCategoryError;
}
return null;
}
@@ -366,7 +366,7 @@
if( message == null ) {
errorImage.setVisible(false);
errorLabel.setVisible(false);
- errorLabel.setText("");
+ errorLabel.setText(""); //$NON-NLS-1$
} else {
errorImage.setVisible(true);
errorLabel.setVisible(true);
@@ -375,7 +375,7 @@
}
protected String getNameError() {
- if( nameText.getText().equals("")) {
+ if( nameText.getText().equals("")) { //$NON-NLS-1$
return Messages.XPathNameEmpty;
}
if( server == null ) return null;
@@ -428,7 +428,7 @@
final String attText = attributeText.getText();
IRunnableWithProgress op = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException,
InterruptedException {
- XPathQuery tmp = new XPathQuery("", getConfigFolder(server), null, xpText,
attText);
+ XPathQuery tmp = new XPathQuery("", getConfigFolder(server), null, xpText,
attText); //$NON-NLS-1$
tmp.setRepository(repository);
final ArrayList<XPathFileResult> list = new
ArrayList<XPathFileResult>();
list.addAll(Arrays.asList(tmp.getResults()));
@@ -437,7 +437,7 @@
previewTreeViewer.setInput(list);
if( list.size() == 0 ) {
errorImage.setVisible(true);
- errorLabel.setText("No XML elements matched your search.");
+ errorLabel.setText(Messages.XPathDialogs_NoElementsMatched);
errorLabel.setVisible(true);
previewTreeViewer.getTree().setEnabled(false);
} else {
@@ -458,9 +458,7 @@
protected void layoutWidgets(Composite c) {
// create widgets
descriptionLabel = new Label(c, SWT.WRAP);
- descriptionLabel.setText("An XPath is a way to find a specific XML element inside
an xml file. \n" +
- "This dialog will help you create one. These XPaths' values can then be
modified\n"
- + "by using the JBoss Servers View with the Properties View.");
+ descriptionLabel.setText(Messages.XPathDialogs_XPathDescriptionLabel);
descriptionLabel.setVisible(true);
errorLabel = new Label(c, SWT.NONE);
errorImage = new Label(c, SWT.NONE);
@@ -604,8 +602,8 @@
// set some text
nameLabel.setText(Messages.XPathName);
- if( serverLabel != null ) serverLabel.setText("Server: ");
- if( categoryLabel != null ) categoryLabel.setText("Category: ");
+ if( serverLabel != null ) serverLabel.setText(Messages.XPathDialogs_ServerLabel);
+ if( categoryLabel != null )
categoryLabel.setText(Messages.XPathDialogs_CategoryLabel);
xpathLabel.setText(Messages.XPathPattern);
attributeLabel.setText(Messages.XPathAttribute);
return gridComposite;
@@ -699,16 +697,16 @@
}
public IContentProposal[] getProposals(String contents, int position) {
- if( contents.equals("") || contents.equals("/") ||
contents.equals(" ")) {
- return new IContentProposal[] { new XPathContentProposal("/server/",
"/server/".length(), null, null)};
+ if( contents.equals("") || contents.equals("/") ||
contents.equals(" ")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return new IContentProposal[] { new XPathContentProposal("/server/",
"/server/".length(), null, null)}; //$NON-NLS-1$ //$NON-NLS-2$
}
int type = getType(contents);
- if( type == NEW_ELEMENT ) return getElementProposals(contents, "");
+ if( type == NEW_ELEMENT ) return getElementProposals(contents, "");
//$NON-NLS-1$
if( type == IN_ELEMENT ) return getElementProposals(contents);
- if( type == NEW_ATTRIBUTE ) return getAttributeNameProposals(contents.substring(0,
contents.length()-1), "");
+ if( type == NEW_ATTRIBUTE ) return getAttributeNameProposals(contents.substring(0,
contents.length()-1), ""); //$NON-NLS-1$
if( type == IN_ATTRIBUTE ) return getAttributeNameProposals(contents);
- if( type == NEW_ATTRIBUTE_VALUE ) return getAttributeValueProposals(contents,
"");
+ if( type == NEW_ATTRIBUTE_VALUE ) return getAttributeValueProposals(contents,
""); //$NON-NLS-1$
if( type == IN_ATTRIBUTE_VALUE ) return getAttributeValueProposals(contents);
return new IContentProposal[]{};
}
@@ -721,7 +719,7 @@
ArrayList list = xpathCache.get(xpath);
return (XPathResultNode[]) list.toArray(new XPathResultNode[list.size()]);
}
- XPathQuery tmp = new XPathQuery("", path, "**/*.xml", xpath,
null);
+ XPathQuery tmp = new XPathQuery("", path, "**/*.xml", xpath,
null); //$NON-NLS-1$ //$NON-NLS-2$
tmp.setRepository(repository);
ArrayList<XPathResultNode> list = new ArrayList<XPathResultNode>();
XPathFileResult[] items = tmp.getResults();
@@ -749,11 +747,11 @@
public String[] getElementProposalStrings(String parentPath, String elementPrefix) {
TreeSet<String> set = new TreeSet<String>();
- XPathResultNode[] items = getXPath(parentPath + "*");
+ XPathResultNode[] items = getXPath(parentPath + "*"); //$NON-NLS-1$
for( int i = 0; i < items.length; i++ ) {
if( items[i].getElementName().startsWith(elementPrefix)) {
if( items[i].getElementName().equals(elementPrefix)) {
- set.addAll(Arrays.asList(getAttributeNameProposalStrings(parentPath +
elementPrefix, "")));
+ set.addAll(Arrays.asList(getAttributeNameProposalStrings(parentPath +
elementPrefix, ""))); //$NON-NLS-1$
} else {
set.add(parentPath + items[i].getElementName());
}
@@ -787,7 +785,7 @@
String[] results = new String[names.size()];
for( int i = 0; i < results.length; i++ ) {
- results[i] = parentPath + "[@" + names.get(i) + "=";
+ results[i] = parentPath + "[@" + names.get(i) + "=";
//$NON-NLS-1$ //$NON-NLS-2$
}
return results;
}
@@ -803,7 +801,7 @@
if( eqIndex < brackIndex ) eqIndex = parentPath.length();
String attName = parentPath.substring(brackIndex+2, eqIndex);
- if( remainder.startsWith("'")) remainder = remainder.substring(1);
+ if( remainder.startsWith("'")) remainder = remainder.substring(1);
//$NON-NLS-1$
ArrayList<String> values = new ArrayList<String>();
XPathResultNode[] items = getXPath(parentElementPath);
String[] attributes;
@@ -816,9 +814,9 @@
}
String[] results = new String[values.size()];
- String prefix = parentElementPath + "[@" + attName + "='";
+ String prefix = parentElementPath + "[@" + attName + "='";
//$NON-NLS-1$ //$NON-NLS-2$
for( int i = 0; i < results.length; i++ ) {
- results[i] = prefix + values.get(i) + "']/";
+ results[i] = prefix + values.get(i) + "']/"; //$NON-NLS-1$
}
Arrays.sort(results);
return convertProposals(results);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -265,10 +265,10 @@
}
private String getDeployDir() {
- return server.getRuntime() == null ? "" :
makeRelative(getServer().getDeployFolder());
+ return server.getRuntime() == null ? "" :
makeRelative(getServer().getDeployFolder()); //$NON-NLS-1$
}
private String getTempDeployDir() {
- return server.getRuntime() == null ? "" :
makeRelative(getServer().getTempDeployFolder());
+ return server.getRuntime() == null ? "" :
makeRelative(getServer().getTempDeployFolder()); //$NON-NLS-1$
}
private IDeployableServer getServer() {
@@ -276,25 +276,25 @@
}
public IStatus[] getSaveStatus() {
- String error = "";
+ String error = ""; //$NON-NLS-1$
List<Status> status = new ArrayList<Status>();
if( getRuntime() == null ) {
String msg = Messages.EditorNoRuntimeSelected;
status.add(new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, msg));
- error = error + msg + "\n";
+ error = error + msg + "\n"; //$NON-NLS-1$
}
if(!new File(makeGlobal(deployText.getText())).exists()) {
String msg = NLS.bind(Messages.EditorDeployDNE, deployText.getText());
status.add(new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, msg));
- error = error + msg + "\n";
+ error = error + msg + "\n"; //$NON-NLS-1$
}
if(!new File(makeGlobal(tempDeployText.getText())).exists()) {
String msg = NLS.bind(Messages.EditorTempDeployDNE, tempDeployText.getText());
status.add(new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, msg));
- error = error + msg + "\n";
+ error = error + msg + "\n"; //$NON-NLS-1$
}
- setErrorMessage(error.equals("") ? null : error);
+ setErrorMessage(error.equals("") ? null : error); //$NON-NLS-1$
return status.size() == 0 ? null : status.toArray(new IStatus[status.size()]);
}
@@ -310,7 +310,7 @@
this.text = deployText;
this.newDir = deployText.getText();
this.listener = deployListener;
- this.oldDir = helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "");
+ this.oldDir = helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "");
//$NON-NLS-1$
}
public void execute() {
helper.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, newDir);
@@ -357,7 +357,7 @@
text = tempDeployText;
newDir = tempDeployText.getText();
listener = tempDeployListener;
- oldDir = helper.getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, "");
+ oldDir = helper.getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, "");
//$NON-NLS-1$
}
public void execute() {
helper.setAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, newDir);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -53,7 +53,7 @@
FormToolkit toolkit = new FormToolkit(parent.getDisplay());
Section section = toolkit.createSection(parent,
ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED|ExpandableComposite.TITLE_BAR);
- section.setText("Server Polling");
+ section.setText(Messages.PollerSection_ServerPollingSection);
section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL |
GridData.VERTICAL_ALIGN_FILL));
Composite composite = toolkit.createComposite(section);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -60,10 +60,10 @@
if (sectionList.size() <= 0) {
IExtensionRegistry registry = Platform.getExtensionRegistry();
IConfigurationElement[] cf = registry.getConfigurationElementsFor(
- JBossServerUIPlugin.PLUGIN_ID, "ServerEditorPortSection");
+ JBossServerUIPlugin.PLUGIN_ID, "ServerEditorPortSection"); //$NON-NLS-1$
for (int i = 0; i < cf.length; i++) {
try {
- Object o = cf[i].createExecutableExtension("class");
+ Object o = cf[i].createExecutableExtension("class"); //$NON-NLS-1$
if (o != null && o instanceof IPortEditorExtension)
sectionList.add((IPortEditorExtension) o);
} catch (CoreException ce) { /* ignore */
@@ -190,7 +190,7 @@
label.setText(labelText);
detect.setText(Messages.EditorAutomaticallyDetectPort);
- link.setText("<a href=\"\">" + Messages.Configure +
"</a>");
+ link.setText("<a href=\"\">" + Messages.Configure +
"</a>"); //$NON-NLS-1$ //$NON-NLS-2$
return child;
}
protected void initialize() {
@@ -203,7 +203,7 @@
if( shouldDetect )
text.setText(findPort(helper.getServer(), new Path(currentXPath)));
else
- text.setText(helper.getAttribute(IJBossServerConstants.JNDI_PORT, ""));
+ text.setText(helper.getAttribute(IJBossServerConstants.JNDI_PORT, ""));
//$NON-NLS-1$
}
protected void addListeners() {
listener = new Listener() {
@@ -366,7 +366,7 @@
button.removeListener(SWT.Selection, listener);
button.setSelection(preOverride);
- text.setText(preText == null ? "" : preText);
+ text.setText(preText == null ? "" : preText); //$NON-NLS-1$
text.setEnabled(!preOverride);
text.setEditable(!preOverride);
button.addListener(SWT.Selection, listener);
@@ -378,12 +378,12 @@
protected static String findPort(IServer server, IPath path) {
XPathQuery query = XPathModel.getDefault().getQuery(server, path);
- String result = "";
+ String result = ""; //$NON-NLS-1$
if(query!=null) {
try {
query.refresh();
result = query.getFirstResult();
- result = result == null ? "" : result;
+ result = result == null ? "" : result; //$NON-NLS-1$
return new Integer(Integer.parseInt(result)).toString();
} catch(NumberFormatException nfe) {
} catch( IllegalStateException ise ) {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -73,8 +73,8 @@
Label username = toolkit.createLabel(composite, Messages.swf_Username);
username.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
- String n = helper.getAttribute(JBossServer.SERVER_USERNAME, "");
- String p = helper.getAttribute(JBossServer.SERVER_PASSWORD, "");
+ String n = helper.getAttribute(JBossServer.SERVER_USERNAME, "");
//$NON-NLS-1$
+ String p = helper.getAttribute(JBossServer.SERVER_PASSWORD, "");
//$NON-NLS-1$
nameText = toolkit.createText(composite, n);
Label password = toolkit.createLabel(composite, Messages.swf_Password);
password.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
@@ -133,7 +133,7 @@
this.key = attributeKey;
this.newVal = newVal;
this.listener = listener;
- this.oldVal = helper.getAttribute(attributeKey, "");
+ this.oldVal = helper.getAttribute(attributeKey, ""); //$NON-NLS-1$
}
public void execute() {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -73,8 +73,8 @@
super.initializeFrom(configuration);
try {
String startArgs =
configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
(String)null);
- originalHost = ArgsUtil.getValue(startArgs, "-b", "--host");
- originalConf = ArgsUtil.getValue(startArgs, "-c",
"--configuration");
+ originalHost = ArgsUtil.getValue(startArgs, "-b", "--host");
//$NON-NLS-1$ //$NON-NLS-2$
+ originalConf = ArgsUtil.getValue(startArgs, "-c",
"--configuration"); //$NON-NLS-1$ //$NON-NLS-2$
} catch( CoreException ce ) { }
}
public boolean isValid(ILaunchConfiguration config) {
@@ -82,8 +82,8 @@
return false;
try {
String startArgs =
config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
(String)null);
- String newHost = ArgsUtil.getValue(startArgs, "-b", "--host");
- String newConf = ArgsUtil.getValue(startArgs, "-c",
"--configuration");
+ String newHost = ArgsUtil.getValue(startArgs, "-b", "--host");
//$NON-NLS-1$ //$NON-NLS-2$
+ String newConf = ArgsUtil.getValue(startArgs, "-c",
"--configuration"); //$NON-NLS-1$ //$NON-NLS-2$
if( newConf == null || !newConf.equals(originalConf))
return false;
if( newHost == null || !newHost.equals(originalHost))
@@ -95,8 +95,8 @@
String m = super.getErrorMessage();
if (m == null) {
String startArgs = getAttributeValueFrom(fPrgmArgumentsText);
- String newHost = ArgsUtil.getValue(startArgs, "-b", "--host");
- String newConf = ArgsUtil.getValue(startArgs, "-c",
"--configuration");
+ String newHost = ArgsUtil.getValue(startArgs, "-b", "--host");
//$NON-NLS-1$ //$NON-NLS-2$
+ String newConf = ArgsUtil.getValue(startArgs, "-c",
"--configuration"); //$NON-NLS-1$ //$NON-NLS-2$
if( newConf == null || !newConf.equals(originalConf))
return Messages.LaunchInvalidConfigChanged;
if( newHost == null || !newHost.equals(originalHost))
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/marker/ConfigureRuntimeMarkerResolution.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/marker/ConfigureRuntimeMarkerResolution.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/marker/ConfigureRuntimeMarkerResolution.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -7,12 +7,13 @@
import org.eclipse.ui.IMarkerResolution2;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.dialogs.PropertyDialog;
+import org.jboss.ide.eclipse.as.ui.Messages;
public class ConfigureRuntimeMarkerResolution implements IMarkerResolution2 {
- private static final String RUNTIME_PROPERTY_PAGE =
"org.eclipse.wst.common.project.facet.ui.internal.RuntimesPropertyPage";
+ private static final String RUNTIME_PROPERTY_PAGE =
"org.eclipse.wst.common.project.facet.ui.internal.RuntimesPropertyPage";
//$NON-NLS-1$
public String getDescription() {
- return "Configure Targeted Runtimes";
+ return Messages.ConfigureRuntimeMarkerResolution_Description;
}
public Image getImage() {
@@ -21,7 +22,7 @@
}
public String getLabel() {
- return "Configure Targeted Runtimes";
+ return Messages.ConfigureRuntimeMarkerResolution_Description;
}
public void run(IMarker marker) {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -1,5 +1,6 @@
package org.jboss.ide.eclipse.as.ui.views;
+import java.text.MessageFormat;
import java.util.Date;
import org.eclipse.core.runtime.IStatus;
@@ -15,6 +16,7 @@
import org.jboss.ide.eclipse.as.core.extensions.polling.JMXPoller;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
+import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.views.ServerLogView.EventCategory;
public class LogLabelProvider extends LabelProvider implements ITableLabelProvider {
@@ -82,11 +84,11 @@
if( element instanceof EventCategory ) {
int type = ((EventCategory)element).getType();
if( type == 0 )
- return "Unknown Event Type";
+ return Messages.LogLabelProvider_UnknownEventType;
if( type == IEventCodes.POLLING_CODE)
- return "Server Startup / Shutdown";
+ return Messages.LogLabelProvider_StartupShutdownEventType;
if( type == IEventCodes.PUBLISHING_CODE)
- return "Publishing";
+ return Messages.LogLabelProvider_PublishingEventType;
}
if( element instanceof LogEntry ) {
@@ -109,14 +111,16 @@
sec -= (hours * 60 * 60);
}
if( hours > 0 ) {
- return hours + " hours, " + minutes + " minutes ago";
+ return MessageFormat.format(Messages.LogLabelProvider_HoursMinutesAgo, hours,
+ minutes);
} else if( minutes > 0 ) {
- return minutes + " minutes, " + sec + " seconds ago";
+ return MessageFormat.format(Messages.LogLabelProvider_MinutesSecondsAgo, minutes,
+ sec);
} else {
- return sec + " seconds ago";
+ return MessageFormat.format(Messages.LogLabelProvider_SecondsAgo, sec);
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
public Image getColumnImage(Object element, int columnIndex) {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -71,7 +71,7 @@
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
public class ServerLogView extends ViewPart implements IServerLogListener {
- public static final String VIEW_ID =
"org.jboss.ide.eclipse.as.ui.view.serverLogView";
+ public static final String VIEW_ID =
"org.jboss.ide.eclipse.as.ui.view.serverLogView"; //$NON-NLS-1$
public final static byte MESSAGE = 0x0;
public final static byte DATE = 0x1;
public static int ASCENDING = 1;
@@ -240,7 +240,7 @@
protected void reloadLog() {
IRunnableWithProgress op = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) {
- monitor.beginTask("Importing Server Log", IProgressMonitor.UNKNOWN);
+ monitor.beginTask(org.jboss.ide.eclipse.as.ui.Messages.ServerLogView_ImportingLogTaskName,
IProgressMonitor.UNKNOWN);
List<AbstractEntry> entries = new ArrayList<AbstractEntry>();
LogReader.parseLogFile(fInputFile, entries, fMemento);
elements.addAll(entries);
@@ -273,7 +273,7 @@
display.asyncExec(new Runnable() {
public void run() {
IServer selected = ServerLogger.findServerForFile(fInputFile);
- setContentDescription(selected == null ? "No Log Selected" :
selected.getName());
+ setContentDescription(selected == null ?
org.jboss.ide.eclipse.as.ui.Messages.ServerLogView_NoLogSelected : selected.getName());
if (!viewer.getTree().isDisposed()) {
viewer.refresh();
viewer.expandToLevel(2);
@@ -463,7 +463,7 @@
fileStore);
IEditorDescriptor desc = PlatformUI.getWorkbench()
.getEditorRegistry().getDefaultEditor(
- "dummy.txt");
+ "dummy.txt"); //$NON-NLS-1$
if (desc != null)
page.openEditor(input, desc.getId());
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -73,7 +73,7 @@
.getSelection();
}
- IContributionItem quick =
menu.find("org.eclipse.ui.navigate.showInQuickMenu");
+ IContributionItem quick =
menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
if( quick != null && selection != null && selection.toArray().length
== 1 ) {
if( selection.getFirstElement() instanceof IServer ) {
if( menu instanceof MenuManager ) {
@@ -178,7 +178,7 @@
public String getText(Object element) {
if( element instanceof IConnectionWrapper ) {
- return "JMX";
+ return "JMX"; //$NON-NLS-1$
}
return delegate.getText(element);
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -57,7 +57,7 @@
selection = (IStructuredSelection) wsSite.getSelectionProvider()
.getSelection();
}
- IContributionItem quick =
menu.find("org.eclipse.ui.navigate.showInQuickMenu");
+ IContributionItem quick =
menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
if( quick != null && selection != null && selection.toArray().length ==
1 ) {
if( selection.getFirstElement() instanceof IServer ) {
if( menu instanceof MenuManager ) {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -74,7 +74,7 @@
}
}
};
- newXPathCategoryAction.setText("New Category");
+ newXPathCategoryAction.setText(Messages.XPathActionProvider_NewCategoryAction);
deleteXPathCategoryAction = new Action() {
public void run() {
@@ -82,7 +82,7 @@
MessageBox messageBox = new MessageBox(Display.getCurrent()
.getActiveShell(), style);
messageBox
- .setText(Messages.DescriptorXPathRemoveCategory + "?");
+ .setText(Messages.XPathActionProvider_RemoveCategoryQuestion);
messageBox
.setMessage(Messages.DescriptorXPathRemoveCategoryDesc);
if (messageBox.open() == SWT.YES) {
@@ -198,12 +198,12 @@
}
}
} catch (Exception exc) {
- JBossServerUIPlugin.log("Error running edit file action",
+ JBossServerUIPlugin.log(Messages.XPathActionProvider_ErrorRunningAction,
exc);
}
}
};
- editFileAction.setText("Edit File");
+ editFileAction.setText(Messages.XPathActionProvider_EditFileAction);
xpathChangeValueAction = new XPathChangeValueAction(shell, tableViewer, provider);
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathChangeValueAction.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathChangeValueAction.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathChangeValueAction.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -31,6 +31,7 @@
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
import
org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
+import org.jboss.ide.eclipse.as.ui.Messages;
/**
* Action to rename a server.
*/
@@ -48,7 +49,7 @@
protected boolean saving = false;
public XPathChangeValueAction(Shell shell, TreeViewer viewer, ISelectionProvider
selectionProvider) {
- super(selectionProvider, "Change Value");
+ super(selectionProvider, Messages.XPathChangeValueAction_ActionText);
this.shell = shell;
this.viewer = viewer;
this.tree = viewer.getTree();
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -20,18 +20,18 @@
if( element instanceof XPathQuery) {
XPathResultNode[] nodes = XPathModel.getResultNodes((XPathQuery)element);
if(nodes.length == 1 ) {
- return " " + nodes[0].getText();
+ return " " + nodes[0].getText(); //$NON-NLS-1$
}
}
if( element instanceof XPathFileResult ) {
XPathResultNode[] nodes = ((XPathFileResult)element).getChildren();
if( nodes.length == 1 )
- return " " + nodes[0].getText();
+ return " " + nodes[0].getText(); //$NON-NLS-1$
}
if( element instanceof XPathResultNode ) {
- return " " + ((XPathResultNode)element).getText();
+ return " " + ((XPathResultNode)element).getText(); //$NON-NLS-1$
}
return null;
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -16,6 +16,7 @@
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
import
org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
+import org.jboss.ide.eclipse.as.ui.Messages;
public class XPathTreeContentProvider implements ITreeContentProvider {
@@ -91,7 +92,7 @@
}
protected void launchLoad(final XPathCategory cat) {
- new Job("Loading XPaths") {
+ new Job(Messages.XPathTreeContentProvider_JobName) {
protected IStatus run(IProgressMonitor monitor) {
loading.add(cat);
XPathQuery[] queries = cat.getQueries();
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -1,5 +1,6 @@
package org.jboss.ide.eclipse.as.ui.views.server.extensions;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -14,13 +15,14 @@
import
org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
+import org.jboss.ide.eclipse.as.ui.Messages;
import
org.jboss.ide.eclipse.as.ui.views.server.extensions.XPathTreeContentProvider.ServerWrapper;
public class XPathTreeLabelProvider extends LabelProvider {
private Image rootImage;
public XPathTreeLabelProvider() {
super();
- ImageDescriptor des =
ImageDescriptor.createFromURL(JBossServerUIPlugin.getDefault().getBundle().getEntry("icons/XMLFile.gif"));
+ ImageDescriptor des =
ImageDescriptor.createFromURL(JBossServerUIPlugin.getDefault().getBundle().getEntry("icons/XMLFile.gif"));
//$NON-NLS-1$
rootImage = des.createImage();
}
@@ -46,9 +48,9 @@
public String getText(Object element) {
if( element instanceof ServerWrapper )
- return "XML Configuration";
+ return Messages.XPathTreeLabelProvider_XMLConfigLabel;
if( element == XPathTreeContentProvider.LOADING )
- return "Loading...";
+ return Messages.XPathTreeLabelProvider_LoadingLabel;
if (element instanceof XPathCategory)
return ((XPathCategory) element).getName();
@@ -60,9 +62,9 @@
return ((XPathFileResult)element).getFileLocation();
if( element instanceof XPathResultNode )
- return "Match " + ((XPathResultNode)element).getIndex();
+ return MessageFormat.format(Messages.XPathTreeLabelProvider_MatchIndexLabel,
((XPathResultNode)element).getIndex());
- return "";
+ return ""; //$NON-NLS-1$
}
public XPathResultNode[] getResultNodes(XPathQuery query) {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -40,7 +40,7 @@
int size = serverTypes.length;
for (int i = 0; i < size; i++) {
- if( serverTypes[i].getId().equals("org.jboss.ide.eclipse.as.42"))
+ if( serverTypes[i].getId().equals("org.jboss.ide.eclipse.as.42"))
//$NON-NLS-1$
return serverTypes[i];
}
return serverTypes[0];
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -121,9 +121,9 @@
File serviceDescriptor = new File(types[i]
.getAbsolutePath()
+ File.separator
- + "conf"
+ + "conf" //$NON-NLS-1$
+ File.separator
- + "jboss-service.xml");
+ + "jboss-service.xml"); //$NON-NLS-1$
if (types[i].isDirectory() && serviceDescriptor.exists()) {
String configuration = types[i].getName();
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -150,14 +150,14 @@
version);
handle.setImageDescriptor(getImageDescriptor());
handle.setDescription(description);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
"org.jboss.ide.eclipse.as.doc.user.new_server_runtime");
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
"org.jboss.ide.eclipse.as.doc.user.new_server_runtime"); //$NON-NLS-1$
return main;
}
protected boolean isEAP() {
IRuntime rt = (IRuntime) getTaskModel().getObject(
TaskModel.TASK_RUNTIME);
- return
rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.");
+ return
rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.");
//$NON-NLS-1$
}
protected ImageDescriptor getImageDescriptor() {
@@ -231,7 +231,7 @@
.getObject(TaskModel.TASK_RUNTIME);
String oldName = r.getName();
if( r.isWorkingCopy() ) {
- String newName = oldName.replace("Enterprise Application Platform",
"EAP");
+ String newName = oldName.replace("Enterprise Application Platform",
"EAP"); //$NON-NLS-1$ //$NON-NLS-2$
newName = LocalJBossServerRuntime.getNextRuntimeName(newName);
((IRuntimeWorkingCopy)r).setName(newName);
}
@@ -537,8 +537,8 @@
}
protected void configDeletePressed() {
MessageDialog dialog = new MessageDialog(configBrowse.getShell(),
- "Delete Configuration?", null,
- "Are you sure you want to delete this folder? This cannot be
undone.",
+ Messages.JBossRuntimeWizardFragment_DeleteConfigTitle, null,
+ Messages.JBossRuntimeWizardFragment_DeleteConfigConfirmation,
MessageDialog.WARNING, new String[] { IDialogConstants.YES_LABEL,
IDialogConstants.NO_LABEL }, 0); // yes is the default
if(dialog.open() == 0) {
@@ -608,17 +608,17 @@
if (!isHomeValid())
return Messages.rwf_homeMissingFiles;
- if (name == null || name.equals(""))
+ if (name == null || name.equals("")) //$NON-NLS-1$
return Messages.rwf_nameTextBlank;
- if (homeDir == null || homeDir.equals(""))
+ if (homeDir == null || homeDir.equals("")) //$NON-NLS-1$
return Messages.rwf_homeDirBlank;
if (jreComboIndex < 0)
return Messages.rwf_NoVMSelected;
if( configurations.getSelection().isEmpty())
- return "User must select a valid configuration";
+ return Messages.JBossRuntimeWizardFragment_MustSelectValidConfig;
return null;
}
@@ -631,7 +631,7 @@
protected boolean isHomeValid() {
if( homeDir == null || !(new File(homeDir).exists())) return false;
- return new
Path(homeDir).append("bin").append("run.jar").toFile().exists();
+ return new
Path(homeDir).append("bin").append("run.jar").toFile().exists();
//$NON-NLS-1$ //$NON-NLS-2$
}
protected String getHomeVersionWarning() {
@@ -676,9 +676,9 @@
PreferenceManager manager = PlatformUI.getWorkbench()
.getPreferenceManager();
IPreferenceNode node = manager
- .find("org.eclipse.jdt.ui.preferences.JavaBasePreferencePage")
+ .find("org.eclipse.jdt.ui.preferences.JavaBasePreferencePage")
//$NON-NLS-1$
.findSubNode(
- "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage");
+ "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"); //$NON-NLS-1$
PreferenceManager manager2 = new PreferenceManager();
manager2.addToRoot(node);
final PreferenceDialog dialog = new PreferenceDialog(jreButton
@@ -711,7 +711,7 @@
// get names
size = installedJREs.size();
jreNames = new String[size+1];
- jreNames[0] = "Default JRE";
+ jreNames[0] = "Default JRE"; //$NON-NLS-1$
for (int i = 0; i < size; i++) {
IVMInstall vmInstall = installedJREs.get(i);
jreNames[i+1] = vmInstall.getName();
@@ -863,7 +863,8 @@
destText.setText(origDest);
- nameText.setText(findNewest(origConfig + "_copy")); // TODO increment
+ // we could localize the string _copy, but it would probably cause more trouble than
it's worth
+ nameText.setText(findNewest(origConfig + "_copy")); // TODO increment
//$NON-NLS-1$
return c;
}
@@ -880,9 +881,9 @@
}
if( !valid ) {
if( newDest == null || newConfig == null ) {
- setMessage("All fields must be completed.", IMessageProvider.ERROR);
+ setMessage(Messages.JBossRuntimeWizardFragment_AllFieldsRequired,
IMessageProvider.ERROR);
} else {
- setMessage("The output folder already exists: " +
p.append(newConfig).toString(), IMessageProvider.ERROR);
+ setMessage(Messages.JBossRuntimeWizardFragment_OutputFolderExists +
p.append(newConfig).toString(), IMessageProvider.ERROR);
}
} else {
setCleanMessage();
@@ -914,7 +915,7 @@
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText("Copy a Configuration");
+ newShell.setText(Messages.JBossRuntimeWizardFragment_CopyAConfigShellText);
}
public String getNewDest() {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -92,18 +92,18 @@
protected boolean isEAP() {
IRuntime rt = (IRuntime) getTaskModel().getObject(
TaskModel.TASK_RUNTIME);
- return
rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.");
+ return
rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.");
//$NON-NLS-1$
}
public ImageDescriptor getImageDescriptor() {
IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
String id = rt.getRuntimeType().getId();
- String imageKey = "";
- if( id.equals("org.jboss.ide.eclipse.as.runtime.32")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.40")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.42")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.50")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO;
+ String imageKey = ""; //$NON-NLS-1$
+ if( id.equals("org.jboss.ide.eclipse.as.runtime.32")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO; //$NON-NLS-1$
+ else if( id.equals("org.jboss.ide.eclipse.as.runtime.40")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO; //$NON-NLS-1$
+ else if( id.equals("org.jboss.ide.eclipse.as.runtime.42")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO; //$NON-NLS-1$
+ else if( id.equals("org.jboss.ide.eclipse.as.runtime.50")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO; //$NON-NLS-1$
+ else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43")) imageKey =
JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO; //$NON-NLS-1$
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
@@ -181,7 +181,7 @@
IJBossServerRuntime srt = getRuntime();
homeValLabel.setText(srt.getRuntime().getLocation().toOSString());
configValLabel.setText(srt.getJBossConfiguration());
- jreValLabel.setText(srt.getVM().getInstallLocation().getAbsolutePath() + "
(" + srt.getVM().getName() + ")");
+ jreValLabel.setText(srt.getVM().getInstallLocation().getAbsolutePath() + "
(" + srt.getVM().getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
configLocValLabel.setText(srt.getConfigLocation());
runtimeGroup.layout();
updateErrorMessage();
@@ -194,8 +194,8 @@
public void performFinish(IProgressMonitor monitor) throws CoreException {
IServerWorkingCopy serverWC = (IServerWorkingCopy)
getTaskModel().getObject(TaskModel.TASK_SERVER);
JBossServer jbs = (JBossServer)serverWC.loadAdapter(JBossServer.class, new
NullProgressMonitor());
- jbs.setUsername("admin");
- jbs.setPassword("admin");
+ jbs.setUsername("admin"); //$NON-NLS-1$
+ jbs.setPassword("admin"); //$NON-NLS-1$
jbs.setDeployLocationType(isAS5() ? IDeployableServer.DEPLOY_SERVER :
IDeployableServer.DEPLOY_METADATA);
serverWC.setRuntime((IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME));
serverWC.setServerConfiguration(null); // no inside jboss folder
@@ -218,7 +218,7 @@
protected boolean isAS5() {
return getRuntime().getRuntime().getRuntimeType().
- getVersion().equals("5.0");
+ getVersion().equals("5.0"); //$NON-NLS-1$
}
public boolean isComplete() {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -182,7 +182,7 @@
deployLoc = deployText.getText();
tempDeployLoc = tempDeployText.getText();
name = nameText.getText();
- handle.setMessage("", IStatus.OK);
+ handle.setMessage("", IStatus.OK); //$NON-NLS-1$
handle.update();
} else {
handle.setMessage(status.getMessage(), IStatus.WARNING);
@@ -191,17 +191,17 @@
protected IStatus checkErrors() {
if( findServer(nameText.getText()) != null ) {
- return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK,
"Name in use", null);
+ return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK,
Messages.StrippedServerWizardFragment_NameInUseStatusMessage, null);
}
File f = new File(deployText.getText());
if( !f.exists() || !f.isDirectory() ) {
- return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK,
"Deploy Folder does not exist", null);
+ return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK,
Messages.StrippedServerWizardFragment_DeployFolderDoesNotExistStatusMessage, null);
}
f = new File(tempDeployText.getText());
if( !f.exists() || !f.isDirectory() ) {
- return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK,
"Temporary Deploy Folder does not exist", null);
+ return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK,
Messages.StrippedServerWizardFragment_TemporaryDeployFolderDoesNotExistStatusMessage,
null);
}
- return new Status(IStatus.OK, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, "",
null);
+ return new Status(IStatus.OK, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, "",
null); //$NON-NLS-1$
}
public void enter() {
@@ -217,7 +217,7 @@
ServerWorkingCopy swcInternal;
if( swc instanceof ServerWorkingCopy ) {
swcInternal = (ServerWorkingCopy)swc;
- deployText.setText(swcInternal.getAttribute(DeployableServer.DEPLOY_DIRECTORY,
""));
+ deployText.setText(swcInternal.getAttribute(DeployableServer.DEPLOY_DIRECTORY,
"")); //$NON-NLS-1$
}
}
public void exit() {
@@ -264,9 +264,9 @@
String base = Messages.sswf_BaseName;
if( findServer(base) == null ) return base;
int i = 1;
- while( ServerCore.findServer(base + " (" + i + ")") != null )
+ while( ServerCore.findServer(base + " (" + i + ")") != null )
//$NON-NLS-1$ //$NON-NLS-2$
i++;
- return base + " (" + i + ")";
+ return base + " (" + i + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
private IServer findServer(String name) {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/J2EEModuleExportOperation.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/J2EEModuleExportOperation.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/J2EEModuleExportOperation.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -72,6 +73,7 @@
import org.eclipse.wst.server.core.model.IModuleFolder;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.ModuleDelegate;
+import org.jboss.ide.eclipse.as.ui.Messages;
public abstract class J2EEModuleExportOperation extends AbstractDataModelOperation {
@@ -135,7 +137,7 @@
export();
} catch (Exception e) {
monitor.worked(CLOSE_WORK);
- throw new ExecutionException("Error Exporting " + archiveString(), e);
+ throw new
ExecutionException(MessageFormat.format(Messages.J2EEModuleExportOperation_ErrorExportingArchive,
archiveString()), e);
}
final IDataModel dm = getDataModel();
@@ -314,7 +316,9 @@
/* Prepare the streams */
if (dest.exists() && dest.isDirectory()) {
- throw new IOException("The specified file: " + dest.getAbsolutePath() +
" exists and is a directory");
+ throw new IOException(MessageFormat.format(
+ Messages.J2EEModuleExportOperation_DestinationFileIsDirectoryError,
+ dest.getAbsolutePath()));
}
if (parent != null)
parent.mkdirs();
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -70,18 +70,18 @@
import org.jboss.ide.eclipse.as.ui.actions.ExploreAction;
public class ServerActionProvider extends CommonActionProvider {
- public static final String NEW_MENU_ID =
"org.jboss.tools.as.wst.server.ui.internal.cnf.newMenuId";
- public static final String SHOW_IN_MENU_ID =
"org.jboss.tools.as.wst.server.ui.internal.cnf.showInMenuId";
- public static final String TOP_SECTION_START_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.topSectionStart";
- public static final String TOP_SECTION_END_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.topSectionEnd";
- public static final String EDIT_SECTION_START_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnfeditSectionStart";
- public static final String EDIT_SECTION_END_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.editSectionEnd";
- public static final String CONTROL_SERVER_SECTION_START_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.controlServerSectionStart";
- public static final String CONTROL_SERVER_SECTION_END_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.controlServerSectionEnd";
- public static final String SERVER_ERATA_SECTION_START_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.serverErataSectionStart";
- public static final String SERVER_ERATA_SECTION_END_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.serverErataSectionEnd";
- public static final String CONTROL_MODULE_SECTION_START_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.controlModuleSectionStart";
- public static final String CONTROL_MODULE_SECTION_END_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.controlModuleSectionEnd";
+ public static final String NEW_MENU_ID =
"org.jboss.tools.as.wst.server.ui.internal.cnf.newMenuId"; //$NON-NLS-1$
+ public static final String SHOW_IN_MENU_ID =
"org.jboss.tools.as.wst.server.ui.internal.cnf.showInMenuId"; //$NON-NLS-1$
+ public static final String TOP_SECTION_START_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.topSectionStart"; //$NON-NLS-1$
+ public static final String TOP_SECTION_END_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.topSectionEnd"; //$NON-NLS-1$
+ public static final String EDIT_SECTION_START_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnfeditSectionStart"; //$NON-NLS-1$
+ public static final String EDIT_SECTION_END_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.editSectionEnd"; //$NON-NLS-1$
+ public static final String CONTROL_SERVER_SECTION_START_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.controlServerSectionStart";
//$NON-NLS-1$
+ public static final String CONTROL_SERVER_SECTION_END_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.controlServerSectionEnd";
//$NON-NLS-1$
+ public static final String SERVER_ERATA_SECTION_START_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.serverErataSectionStart";
//$NON-NLS-1$
+ public static final String SERVER_ERATA_SECTION_END_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.serverErataSectionEnd";
//$NON-NLS-1$
+ public static final String CONTROL_MODULE_SECTION_START_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.controlModuleSectionStart";
//$NON-NLS-1$
+ public static final String CONTROL_MODULE_SECTION_END_SEPARATOR =
"org.jboss.tools.as.wst.server.ui.internal.cnf.controlModuleSectionEnd";
//$NON-NLS-1$
private ICommonActionExtensionSite actionSite;
private Clipboard clipboard;
@@ -125,7 +125,7 @@
IServer server = (IServer) data;
ServerUIPlugin.editServer(server);
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Could not open server", e);
+ Trace.trace(Trace.SEVERE,
org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e);
}
}
});
@@ -164,15 +164,15 @@
// create the properties action
propertiesAction = new PropertiesAction(shell, provider);
- monitorPropertiesAction = new PropertiesAction(shell,
"org.eclipse.wst.server.ui.properties.monitor", provider);
+ monitorPropertiesAction = new PropertiesAction(shell,
"org.eclipse.wst.server.ui.properties.monitor", provider); //$NON-NLS-1$
}
public void fillActionBars(IActionBars actionBars) {
- actionBars.setGlobalActionHandler("org.eclipse.wst.server.debug",
actions[0]);
- actionBars.setGlobalActionHandler("org.eclipse.wst.server.run", actions[1]);
- actionBars.setGlobalActionHandler("org.eclipse.wst.server.stop",
actions[3]);
- actionBars.setGlobalActionHandler("org.eclipse.wst.server.publish",
actions[4]);
- actionBars.setGlobalActionHandler("org.eclipse.ui.navigator.Open",
openAction);
+ actionBars.setGlobalActionHandler("org.eclipse.wst.server.debug",
actions[0]); //$NON-NLS-1$
+ actionBars.setGlobalActionHandler("org.eclipse.wst.server.run", actions[1]);
//$NON-NLS-1$
+ actionBars.setGlobalActionHandler("org.eclipse.wst.server.stop", actions[3]);
//$NON-NLS-1$
+ actionBars.setGlobalActionHandler("org.eclipse.wst.server.publish",
actions[4]); //$NON-NLS-1$
+ actionBars.setGlobalActionHandler("org.eclipse.ui.navigator.Open",
openAction); //$NON-NLS-1$
actionBars.setGlobalActionHandler(ActionFactory.PROPERTIES.getId(), propertiesAction);
actionBars.updateActionBars();
actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copyAction);
@@ -256,7 +256,7 @@
}
menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
- menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS+"-end"));
+ menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS+"-end"));
//$NON-NLS-1$
}
protected void addTopSection(IMenuManager menu, IServer server, IModule[] module) {
@@ -275,12 +275,12 @@
final IBindingService bindingService = (IBindingService) workbench
.getAdapter(IBindingService.class);
final TriggerSequence[] activeBindings = bindingService
- .getActiveBindingsFor("org.eclipse.ui.navigate.showInQuickMenu");
+ .getActiveBindingsFor("org.eclipse.ui.navigate.showInQuickMenu");
//$NON-NLS-1$
if (activeBindings.length > 0) {
- text += "\t" + activeBindings[0].format();
+ text += "\t" + activeBindings[0].format(); //$NON-NLS-1$
}
- MenuManager showInMenu = new MenuManager(text,
"org.eclipse.ui.navigate.showInQuickMenu");
+ MenuManager showInMenu = new MenuManager(text,
"org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
showInMenu.add(showInConsoleAction);
showInMenu.add(showInDebugAction);
menu.add(showInMenu);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -35,10 +35,10 @@
import org.eclipse.wst.server.core.internal.Server;
import org.eclipse.wst.server.core.internal.UpdateServerJob;
import org.eclipse.wst.server.core.util.PublishAdapter;
-import org.eclipse.wst.server.ui.internal.Messages;
import org.eclipse.wst.server.ui.internal.Trace;
import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer;
import org.eclipse.wst.server.ui.internal.viewers.BaseContentProvider;
+import org.jboss.ide.eclipse.as.ui.Messages;
public class ServerContentProvider extends BaseContentProvider implements
ITreeContentProvider {
public static Object INITIALIZING = new Object();
@@ -246,7 +246,7 @@
}
protected void deferInitialization() {
- Job job = new Job(Messages.jobInitializingServersView) {
+ Job job = new
Job(org.eclipse.wst.server.ui.internal.Messages.jobInitializingServersView) {
public IStatus run(IProgressMonitor monitor) {
IServer[] servers = ServerCore.getServers();
int size = servers.length;
@@ -346,7 +346,7 @@
}
}
} catch (Exception e) {
- Trace.trace(Trace.FINEST, "Error in Servers view animation", e);
+ Trace.trace(Trace.FINEST,
Messages.ServerContentProvider_ErrorInServersViewAnimation, e);
}
display.timerExec(SLEEP, animator[0]);
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java 2009-05-25
04:43:26 UTC (rev 15473)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java 2009-05-25
04:46:05 UTC (rev 15474)
@@ -35,7 +35,7 @@
if (element instanceof ModuleServer) {
ModuleServer ms = (ModuleServer) element;
if (ms.module == null)
- return "";
+ return ""; //$NON-NLS-1$
int size = ms.module.length;
String name = ms.module[size - 1].getName();
return name;
@@ -69,7 +69,7 @@
protected String notNull(String s) {
if (s == null)
- return "";
+ return ""; //$NON-NLS-1$
return s;
}