Author: sflanigan
Date: 2009-05-25 00:42:59 -0400 (Mon, 25 May 2009)
New Revision: 15472
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB30SupportVerifier.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/xpl/ClasspathDecorationsManager.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.classpath.core;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -105,7 +106,9 @@
}
public String getDescription() {
- return "Libraries found in " + ((file==null)?"[No directory
specified]":file.getProjectRelativePath().toString());
+ return file == null ?
+ Messages.DirectoryLibraryContainerInitializer_libraries_found_no_dir :
+ MessageFormat.format(Messages.DirectoryLibraryContainerInitializer_libraries_found_in_dir,
file.getProjectRelativePath().toString());
}
public int getKind() {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB30SupportVerifier.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB30SupportVerifier.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB30SupportVerifier.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -30,8 +30,8 @@
if( ajbsr == null ) return true;
// one of ours. verify
- IPath path = new
Path("org.jboss.ide.eclipse.as.core.runtime.ProjectInitializer");
- path = path.append(rt.getId()).append("jst.ejb").append("3.0");
+ IPath path = new
Path("org.jboss.ide.eclipse.as.core.runtime.ProjectInitializer"); //$NON-NLS-1$
+ path = path.append(rt.getId()).append("jst.ejb").append("3.0");
//$NON-NLS-1$ //$NON-NLS-2$
WebtoolsProjectJBossClasspathContainer container =
new WebtoolsProjectJBossClasspathContainer(path);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -25,6 +25,7 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
/**
@@ -34,7 +35,7 @@
public class EJB3ClasspathContainer implements IClasspathContainer, ClasspathConstants {
public static final String CONTAINER_ID =
"org.jboss.ide.eclipse.as.classpath.core.ejb3.classpathContainer";
//$NON-NLS-1$
- public static final String DESCRIPTION = "JBoss EJB3 Libraries";
+ public static final String DESCRIPTION =
Messages.EJB3ClasspathContainer_ejb3_description;
public static final QualifiedName JBOSS_EJB3_CONFIGURATION = new QualifiedName(
"org.jboss.ide.eclipse.ejb3.wizards.core.classpath",
"jboss-ejb3-configuration"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -80,7 +81,7 @@
}
public String getDescription() {
- return "JBoss EJB 3.0 Libraries";
+ return Messages.EJB3ClasspathContainer_ejb30_description;
}
public JBossServer getJBossServer() {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -30,6 +30,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.classpath.core.xpl.ClasspathDecorations;
import org.jboss.ide.eclipse.as.classpath.core.xpl.ClasspathDecorationsManager;
@@ -148,7 +149,7 @@
return installURL.getFile().toString();
} catch (IOException ioe) {
// LOG THE ERROR (one day)
- IStatus status = new Status(IStatus.ERROR, ClasspathCorePlugin.PLUGIN_ID, "Error
loading classpath container", ioe);
+ IStatus status = new Status(IStatus.ERROR, ClasspathCorePlugin.PLUGIN_ID,
Messages.AbstractClasspathContainer_error_loading_container, ioe);
ClasspathCorePlugin.getDefault().getLog().log(status);
}
return null;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -13,6 +13,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
/**
*
@@ -38,7 +39,7 @@
public final static String SUFFIX = "j2ee-1.3";//$NON-NLS-1$
public final static String CLASSPATH_CONTAINER = CLASSPATH_CONTAINER_PREFIX
+ "." + J2EE13ClasspathContainer.SUFFIX;//$NON-NLS-1$
- public final static String DESCRIPTION = "J2EE 1.3 Libraries (JBoss Tools)";
+ public final static String DESCRIPTION =
Messages.J2EE13ClasspathContainerInitializer_description;
public J2EE13ClasspathContainer(IPath path, IJavaProject javaProject) {
super(path, DESCRIPTION, SUFFIX, javaProject);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -12,6 +12,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import
org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer.J2EE13ClasspathContainer;
/**
@@ -38,7 +39,7 @@
public final static String SUFFIX = "j2ee-1.4";//$NON-NLS-1$
public final static String CLASSPATH_CONTAINER = CLASSPATH_CONTAINER_PREFIX
+ "." + J2EE14ClasspathContainer.SUFFIX;//$NON-NLS-1$
- public final static String DESCRIPTION = "J2EE 1.4 Libraries (JBoss Tools)";
+ public final static String DESCRIPTION =
Messages.J2EE14ClasspathContainerInitializer_description;
public J2EE14ClasspathContainer(IPath path, IJavaProject javaProject) {
super(path, DESCRIPTION, SUFFIX, javaProject);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -13,6 +13,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import
org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer.J2EE13ClasspathContainer;
/**
@@ -39,7 +40,7 @@
public final static String SUFFIX = "javaee-5.0";//$NON-NLS-1$
public final static String CLASSPATH_CONTAINER = CLASSPATH_CONTAINER_PREFIX
+ "." + J2EE50ClasspathContainer.SUFFIX;//$NON-NLS-1$
- public final static String DESCRIPTION = "J2EE 5.0 Libraries (JBoss Tools)";
+ public final static String DESCRIPTION =
Messages.J2EE50ClasspathContainerInitializer_description;
public J2EE50ClasspathContainer(IPath path, IJavaProject javaProject) {
super(path, DESCRIPTION, SUFFIX, javaProject);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -12,6 +12,7 @@
package org.jboss.ide.eclipse.as.classpath.core.runtime;
import java.io.File;
+import java.text.MessageFormat;
import java.util.ArrayList;
import org.eclipse.core.resources.IProject;
@@ -26,6 +27,7 @@
import org.eclipse.wst.server.core.IRuntime;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
/**
@@ -51,7 +53,8 @@
IJBossServerRuntime jbsrt =
(IJBossServerRuntime)runtime.loadAdapter(IJBossServerRuntime.class, new
NullProgressMonitor());
if( jbsrt == null ) {
// log error
- IStatus status = new Status(IStatus.WARNING, ClasspathCorePlugin.PLUGIN_ID,
"Runtime " + runtime.getName() + "is not of the proper type");
+ IStatus status = new Status(IStatus.WARNING, ClasspathCorePlugin.PLUGIN_ID,
MessageFormat.format(Messages.ClientAllRuntimeClasspathProvider_wrong_runtime_type,
+ runtime.getName()));
ClasspathCorePlugin.getDefault().getLog().log(status);
return new IClasspathEntry[0];
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.as.classpath.core.runtime;
+import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -33,6 +34,7 @@
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import
org.jboss.ide.eclipse.as.classpath.core.runtime.WebtoolsProjectJBossClasspathContainerInitializer.WebtoolsProjectJBossClasspathContainer;
/**
@@ -108,7 +110,10 @@
if( rt == null )
throw new CoreException(
new Status( IStatus.ERROR, ClasspathCorePlugin.PLUGIN_ID,
- "Runtime " + path.segment(1) + " does not exist. This classpath
container cannot be initialized. "));
+ MessageFormat
+ .format(
+ Messages.ProjectRuntimeClasspathProvider_runtime_does_not_exist,
+ path.segment(1))));
}
public IClasspathEntry[] getClasspathEntries() {
@@ -116,7 +121,7 @@
}
public String getDescription() {
- return "All JBoss Libraries [" + (rt == null ? "null" :
rt.getName()) + "]";
+ return
MessageFormat.format(Messages.ProjectRuntimeClasspathProvider_all_jboss_libraries_description,
(rt == null ? "null" : rt.getName())); //$NON-NLS-1$
}
public int getKind() {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.as.classpath.core.runtime;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,6 +30,7 @@
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
/**
@@ -83,8 +85,9 @@
}
public String getDescription() {
- if( path.segmentCount() < 4 ) return "JBoss Runtimes";
- return "JBoss Runtimes (" + path.segment(2) + " : " +
path.segment(3) + ")";
+ if( path.segmentCount() < 4 ) return
Messages.WebtoolsProjectJBossClasspathContainerInitializer_jboss_runtimes;
+ String pathSegments = path.segment(2) + " : " + path.segment(3);
//$NON-NLS-1$
+ return
MessageFormat.format(Messages.WebtoolsProjectJBossClasspathContainerInitializer_jboss_runtimes_path,
pathSegments);
}
public int getKind() {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/xpl/ClasspathDecorationsManager.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/xpl/ClasspathDecorationsManager.java 2009-05-25
04:41:24 UTC (rev 15471)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/xpl/ClasspathDecorationsManager.java 2009-05-25
04:42:59 UTC (rev 15472)
@@ -25,6 +25,7 @@
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.osgi.service.prefs.BackingStoreException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -151,7 +152,7 @@
try {
ep.flush();
} catch (BackingStoreException e) {
- String msg = "Encountered an unexpected exception.";
+ String msg = Messages.ClasspathDecorationsManager_unexpected_exception;
ClasspathCorePlugin.log(msg, e);
}
}
@@ -173,7 +174,7 @@
InputSource source = new InputSource(reader);
root = docbuilder.parse(source).getDocumentElement();
} catch (Exception e) {
- String msg = "Encountered an unexpected exception.";
+ String msg = Messages.ClasspathDecorationsManager_unexpected_exception;
ClasspathCorePlugin.log(msg, e);
return map;
}