Author: sflanigan Date: 2009-07-01 03:07:14 -0400 (Wed, 01 Jul 2009) New Revision: 16309 Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeListConverter.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeManager.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/StatusUtils.java Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java 2009-07-01 06:38:06 UTC (rev 16308) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java 2009-07-01 07:07:14 UTC (rev 16309) @@ -34,7 +34,7 @@ */ public class JBossWSRuntimeClassPathInitializer extends AbstractClasspathContainerInitializer { - public final static String JBOSS_WS_RUNTIME_CLASSPATH_CONTAINER_ID = "org.jboss.ws.runtime.classpath"; + public final static String JBOSS_WS_RUNTIME_CLASSPATH_CONTAINER_ID = "org.jboss.ws.runtime.classpath"; //$NON-NLS-1$ public JBossWSRuntimeClassPathInitializer() { } Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeListConverter.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeListConverter.java 2009-07-01 06:38:06 UTC (rev 16308) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeListConverter.java 2009-07-01 07:07:14 UTC (rev 16309) @@ -18,17 +18,17 @@ /* * Constants definitions */ - private static final String REGEXP_ESCAPE = "\\"; - private static final String COMMA = ","; - private static final String LIBRARY_SEPARATOR = ";"; - private static final String EMPTY_STRING = ""; - private static final String FIELD_SEPARATOR = "|"; - private static final String DEFAULT = "default"; - private static final String HOME_DIR = "homeDir"; - private static final String VERSION = "version"; - private static final String NAME = "name"; - private static final String USER_CONFIG_CLASSPATH = "userConfig"; - private static final String LIBRARY = "libraries"; + private static final String REGEXP_ESCAPE = "\\"; //$NON-NLS-1$ + private static final String COMMA = ","; //$NON-NLS-1$ + private static final String LIBRARY_SEPARATOR = ";"; //$NON-NLS-1$ + private static final String EMPTY_STRING = ""; //$NON-NLS-1$ + private static final String FIELD_SEPARATOR = "|"; //$NON-NLS-1$ + private static final String DEFAULT = "default"; //$NON-NLS-1$ + private static final String HOME_DIR = "homeDir"; //$NON-NLS-1$ + private static final String VERSION = "version"; //$NON-NLS-1$ + private static final String NAME = "name"; //$NON-NLS-1$ + private static final String USER_CONFIG_CLASSPATH = "userConfig"; //$NON-NLS-1$ + private static final String LIBRARY = "libraries"; //$NON-NLS-1$ /** * Load String to JBossWSRuntime map from String @@ -92,9 +92,9 @@ } private String convertListToString(List<String> libraries){ - String strLib = ""; + String strLib = ""; //$NON-NLS-1$ for(String library: libraries){ - if("".equals(strLib)){ + if("".equals(strLib)){ //$NON-NLS-1$ strLib = library; }else{ strLib = strLib + LIBRARY_SEPARATOR + library; Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeManager.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeManager.java 2009-07-01 06:38:06 UTC (rev 16308) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeManager.java 2009-07-01 07:07:14 UTC (rev 16309) @@ -164,7 +164,7 @@ List<File> jars = new ArrayList<File>(); if(folder.isDirectory()){ for(File file: folder.listFiles()){ - if(file.isFile() && (file.getName().endsWith(".jar") || file.getName().endsWith(".zip"))){ + if(file.isFile() && (file.getName().endsWith(".jar") || file.getName().endsWith(".zip"))){ //$NON-NLS-1$ //$NON-NLS-2$ jars.add(file); }else if (folder.isDirectory()){ jars.addAll(getJarsOfFolder(file)); @@ -296,7 +296,7 @@ private void onRuntimeNameChanged(String oldName, String newName) { IProjectFacet facet = ProjectFacetsManager - .getProjectFacet("jbossws.core"); + .getProjectFacet("jbossws.core"); //$NON-NLS-1$ Set<IFacetedProject> facetedProjects = null; try { facetedProjects = ProjectFacetsManager.getFacetedProjects(facet); @@ -324,7 +324,7 @@ public static boolean isRuntimeUsed(String name) { IProjectFacet facet = ProjectFacetsManager - .getProjectFacet("jbossws.core"); + .getProjectFacet("jbossws.core"); //$NON-NLS-1$ Set<IFacetedProject> facetedProjects = null; try { facetedProjects = ProjectFacetsManager.getFacetedProjects(facet); Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java 2009-07-01 06:38:06 UTC (rev 16308) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java 2009-07-01 07:07:14 UTC (rev 16309) @@ -69,7 +69,7 @@ public IStatus removeClassPath(IProject project, String segment) { IStatus status = Status.OK_STATUS; - if(segment == null || "".equals(segment)){ + if(segment == null || "".equals(segment)){ //$NON-NLS-1$ return status; } Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java 2009-07-01 06:38:06 UTC (rev 16308) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java 2009-07-01 07:07:14 UTC (rev 16309) @@ -19,15 +19,15 @@ // Seam Preferences names constants - String JBOSS_WS_FACET_ID = "jbossws.core"; - String JBOSS_WS_DEPLOY = "jboss.ws.deploy"; - String QUALIFIEDNAME_IDENTIFIER = "jboss.tools.jbossws"; - String JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED = "jboss.ws.is.server.supplied"; - String JBOSS_WS_RUNTIME_ID = "jboss.ws.runtime_id"; + String JBOSS_WS_FACET_ID = "jbossws.core"; //$NON-NLS-1$ + String JBOSS_WS_DEPLOY = "jboss.ws.deploy"; //$NON-NLS-1$ + String QUALIFIEDNAME_IDENTIFIER = "jboss.tools.jbossws"; //$NON-NLS-1$ + String JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED = "jboss.ws.is.server.supplied"; //$NON-NLS-1$ + String JBOSS_WS_RUNTIME_ID = "jboss.ws.runtime_id"; //$NON-NLS-1$ - String PERSISTENT_PROPERTY_IS_SERVER_SUPPLIED_RUNTIME = "is.server.supplied.runtime"; - String JBOSS_WS_RUNTIME_HOME = "jboss.ws.runtime.home"; - String DEFAULT_VALUE_IS_SERVER_SUPPLIED = "true"; + String PERSISTENT_PROPERTY_IS_SERVER_SUPPLIED_RUNTIME = "is.server.supplied.runtime"; //$NON-NLS-1$ + String JBOSS_WS_RUNTIME_HOME = "jboss.ws.runtime.home"; //$NON-NLS-1$ + String DEFAULT_VALUE_IS_SERVER_SUPPLIED = "true"; //$NON-NLS-1$ static QualifiedName PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME = new QualifiedName(QUALIFIEDNAME_IDENTIFIER, Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java 2009-07-01 06:38:06 UTC (rev 16308) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JBossWSFacetInstallDataModelProvider.java 2009-07-01 07:07:14 UTC (rev 16309) @@ -50,7 +50,7 @@ if(propertyName.equals(JBOSS_WS_DEPLOY)){ return false; }else if(propertyName.equals(JBOSS_WS_RUNTIME_ID)){ - return ""; + return ""; //$NON-NLS-1$ }else if(propertyName.equals(FACET_ID)){ return IJBossWSFacetDataModelProperties.JBOSS_WS_FACET_ID; } @@ -67,8 +67,8 @@ boolean serverSupplied = getBooleanProperty(JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED); String runtimeName = getStringProperty(JBOSS_WS_RUNTIME_ID); if (!serverSupplied - && (runtimeName == null || runtimeName.equals(""))) { - return StatusUtils.errorStatus(""); + && (runtimeName == null || runtimeName.equals(""))) { //$NON-NLS-1$ + return StatusUtils.errorStatus(""); //$NON-NLS-1$ } return super.validate(name); } Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties 2009-07-01 06:38:06 UTC (rev 16308) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCore.properties 2009-07-01 07:07:14 UTC (rev 16309) @@ -6,5 +6,7 @@ WS_Location=jbosswsruntimelocation JBossWS_Runtime_Lib=JBossWS_Runtime JBossWS_Runtime=JBoss WS Runtime +JBossWSCoreUtils_ErrorResourceNotFile=The following path is not a file: {0}. +JBossWSCoreUtils_ErrorResourceNotFolder=Resource {0} is not a folder. Error_Add_Facet_JBossWS=Exception while install JBossWS facet Error_Remove_Facet_JBossWS=Exception while uninstall JBossWS facet Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java 2009-07-01 06:38:06 UTC (rev 16308) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JBossWSCoreMessages.java 2009-07-01 07:07:14 UTC (rev 16309) @@ -16,7 +16,7 @@ /** * @author Grid Qian */ -public class JBossWSCoreMessages { +public class JBossWSCoreMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.ws.core.messages.JBossWSCore"; //$NON-NLS-1$ @@ -32,6 +32,8 @@ public static String WS_Location; public static String JBossWS_Runtime_Lib; public static String JBossWS_Runtime; + public static String JBossWSCoreUtils_ErrorResourceNotFile; + public static String JBossWSCoreUtils_ErrorResourceNotFolder; public static String Error_Add_Facet_JBossWS; public static String Error_Remove_Facet_JBossWS; Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java 2009-07-01 06:38:06 UTC (rev 16308) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JBossWSCoreUtils.java 2009-07-01 07:07:14 UTC (rev 16309) @@ -62,7 +62,7 @@ // Fix for the windows build not working private static String replaceEscapecharactors(String vulnarableString) { - if (vulnarableString.indexOf("/") != -1) { + if (vulnarableString.indexOf("/") != -1) { //$NON-NLS-1$ vulnarableString = vulnarableString.replace('/', File.separator .charAt(0)); } @@ -82,7 +82,7 @@ // Windows check (because from inside wtp in return I received a hard // coded path) if (File.separatorChar == '\\') { - return "\\"; + return "\\"; //$NON-NLS-1$ } else { return File.separator; } @@ -92,7 +92,7 @@ // Windows check (because from inside wtp in return I received a hard // coded path) if (File.separatorChar == '\\') { - return "\\" + File.separator; + return "\\" + File.separator; //$NON-NLS-1$ } else { return File.separator; } @@ -170,7 +170,7 @@ return (IFolder) child; } else { throw new CoreException(new Status(IStatus.ERROR, - "ResourceUtils", 0, NLS.bind("ERROR",// EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FOLDER, + "ResourceUtils", 0, NLS.bind(JBossWSCoreMessages.JBossWSCoreUtils_ErrorResourceNotFolder, //$NON-NLS-1$ // EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FOLDER new Object[] { parent.getFullPath().append( folderName).toString() }), null)); } @@ -200,7 +200,7 @@ } else { throw new CoreException(new Status(IStatus.ERROR, - "ResourceUtils", 0, NLS.bind("ERROR", + "ResourceUtils", 0, NLS.bind(JBossWSCoreMessages.JBossWSCoreUtils_ErrorResourceNotFile, //$NON-NLS-1$ // EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FILE new Object[] { parent.getFullPath().append( fileName) }), null)); } Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/StatusUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/StatusUtils.java 2009-07-01 06:38:06 UTC (rev 16308) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/StatusUtils.java 2009-07-01 07:07:14 UTC (rev 16309) @@ -19,43 +19,43 @@ { public static IStatus errorStatus( String errorMessage ) { - return new Status( IStatus.ERROR, "id", 0, errorMessage, null ); + return new Status( IStatus.ERROR, "id", 0, errorMessage, null ); //$NON-NLS-1$ } public static IStatus errorStatus( Throwable exc ) { String message = exc.getMessage(); - return new Status( IStatus.ERROR, "id", 0, message == null ? "" : message, exc ); + return new Status( IStatus.ERROR, "id", 0, message == null ? "" : message, exc ); //$NON-NLS-1$ //$NON-NLS-2$ } public static IStatus errorStatus( String message, Throwable exc ) { - return new Status( IStatus.ERROR, "id", 0, message, exc ); + return new Status( IStatus.ERROR, "id", 0, message, exc ); //$NON-NLS-1$ } public static MultiStatus multiStatus( String message, IStatus[] children, Throwable exc ) { - return new MultiStatus( "id", 0, children, message, exc ); + return new MultiStatus( "id", 0, children, message, exc ); //$NON-NLS-1$ } public static MultiStatus multiStatus( String message, IStatus[] children ) { - return new MultiStatus( "id", 0, children, message, null ); + return new MultiStatus( "id", 0, children, message, null ); //$NON-NLS-1$ } public static IStatus warningStatus( String warningMessage ) { - return new Status( IStatus.WARNING, "id", 0, warningMessage, null ); + return new Status( IStatus.WARNING, "id", 0, warningMessage, null ); //$NON-NLS-1$ } public static IStatus warningStatus( String warningMessage, Throwable exc ) { - return new Status( IStatus.WARNING, "id", 0, warningMessage, exc ); + return new Status( IStatus.WARNING, "id", 0, warningMessage, exc ); //$NON-NLS-1$ } public static IStatus infoStatus( String infoMessage ) { - return new Status( IStatus.INFO, "id", 0, infoMessage, null ); + return new Status( IStatus.INFO, "id", 0, infoMessage, null ); //$NON-NLS-1$ } } \ No newline at end of file