Author: sflanigan Date: 2009-05-27 02:24:07 -0400 (Wed, 27 May 2009) New Revision: 15544 Added: trunk/common/plugins/org.jboss.tools.common.el.core/.settings/org.eclipse.jdt.core.prefs trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Messages.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties trunk/common/plugins/org.jboss.tools.common/.settings/ trunk/common/plugins/org.jboss.tools.common/.settings/org.eclipse.jdt.core.prefs trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/Messages.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/messages.properties Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/Tokenizer.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/TokenizerFactory.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/Var.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELArgumentExpressionImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELArgumentImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELComplexExpressionImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELInstanceImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELInvocationExpressionImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMethodInvocationImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELModelImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMultiExpressionImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELOperatorImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELParametersImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELPropertyInvocationImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELValueExpressionImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/CallRule.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/ExpressionRule.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/OperationRule.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ArgEndTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ArgStartTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/CommaTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/DotTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/EndELTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ExprEndTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ExprStartTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/JavaNameTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/OperationTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamEndTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamStartTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamUtil.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/PrimitiveValueTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/StartELTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/StringTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/UnaryTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/WhiteSpaceTokenDescription.java trunk/common/plugins/org.jboss.tools.common.el.ui/.settings/org.eclipse.jdt.core.prefs trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Activator.java trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/MethodNotImplementedException.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BaseUIPlugin.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/DefaultProblemReporter.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/ProblemBuffer.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/ProblemReportingHelper.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/Submit.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/ResourcesUtils.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/DtdResolver.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/ErrorHandlerImpl.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SafeDocumentBuilderFactory.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolverImpl.java trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings Added: trunk/common/plugins/org.jboss.tools.common/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/common/plugins/org.jboss.tools.common/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/common/plugins/org.jboss.tools.common/.settings/org.eclipse.jdt.core.prefs 2009-05-27 06:24:07 UTC (rev 15544) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -24,7 +24,7 @@ public class CommonPlugin extends BasePlugin { - public static final String PLUGIN_ID = "org.jboss.tools.common"; + public static final String PLUGIN_ID = "org.jboss.tools.common"; //$NON-NLS-1$ protected static CommonPlugin instance; private static String environment; @@ -52,41 +52,41 @@ */ public static String getEnvironment() { if(environment == null) { - String osName = System.getProperty("os.name"); - String javaVersion = System.getProperty("java.version"); - String studioName = "unknown"; - String studioVersion = "unknown"; - String eclipseVersion = "unknown"; - String eclipseBuildId = "unknown"; + String osName = System.getProperty("os.name"); //$NON-NLS-1$ + String javaVersion = System.getProperty("java.version"); //$NON-NLS-1$ + String studioName = "unknown"; //$NON-NLS-1$ + String studioVersion = "unknown"; //$NON-NLS-1$ + String eclipseVersion = "unknown"; //$NON-NLS-1$ + String eclipseBuildId = "unknown"; //$NON-NLS-1$ - Bundle studio = Platform.getBundle("org.jboss.tools.common"); + Bundle studio = Platform.getBundle("org.jboss.tools.common"); //$NON-NLS-1$ if(studio!=null) { Dictionary studioDic = studio.getHeaders(); - studioName = (String)studioDic.get("Bundle-Name"); - studioVersion = (String)studioDic.get("Bundle-Version"); + studioName = (String)studioDic.get("Bundle-Name"); //$NON-NLS-1$ + studioVersion = (String)studioDic.get("Bundle-Version"); //$NON-NLS-1$ } - Bundle eclipse = Platform.getBundle("org.eclipse.platform"); + Bundle eclipse = Platform.getBundle("org.eclipse.platform"); //$NON-NLS-1$ if(eclipse!=null) { Dictionary eclipseDic = eclipse.getHeaders(); - eclipseVersion = (String)eclipseDic.get("Bundle-Version"); + eclipseVersion = (String)eclipseDic.get("Bundle-Version"); //$NON-NLS-1$ FileInputStream fis = null; try { - String path = FileLocator.resolve(eclipse.getEntry("/")).getPath(); + String path = FileLocator.resolve(eclipse.getEntry("/")).getPath(); //$NON-NLS-1$ if(path!=null) { - File aboutMappings = new File(path, "about.mappings"); + File aboutMappings = new File(path, "about.mappings"); //$NON-NLS-1$ if(aboutMappings.exists()) { Properties properties = new Properties(); fis = new FileInputStream(aboutMappings); properties.load(fis); - String buildId = properties.getProperty("0"); + String buildId = properties.getProperty("0"); //$NON-NLS-1$ if(buildId!=null && buildId.length()>0) { eclipseBuildId = buildId; } } } } catch (IOException e) { - getPluginLog().logError("Error in getting environment info: " + e.getMessage()); + getPluginLog().logError("Error in getting environment info: " + e.getMessage()); //$NON-NLS-1$ } finally { if(fis!=null) { try { @@ -97,10 +97,10 @@ } } } - StringBuffer result = new StringBuffer(studioName).append(" ").append(studioVersion). - append(", Eclipse ").append(eclipseVersion).append(" "). - append(eclipseBuildId).append(", Java ").append(javaVersion). - append(", ").append(osName); + StringBuffer result = new StringBuffer(studioName).append(" ").append(studioVersion). //$NON-NLS-1$ + append(", Eclipse ").append(eclipseVersion).append(" "). //$NON-NLS-1$ //$NON-NLS-2$ + append(eclipseBuildId).append(", Java ").append(javaVersion). //$NON-NLS-1$ + append(", ").append(osName); //$NON-NLS-1$ environment = result.toString(); } return environment; Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/Messages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/Messages.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/Messages.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -0,0 +1,20 @@ +package org.jboss.tools.common; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.common.messages"; //$NON-NLS-1$ + public static String BaseUIPlugin_ErrorDialogTitle; + public static String SAXValidator_IOExceptionMessage; + public static String SAXValidator_SAXExceptionMessage; + public static String SAXValidator_UnableToInstantiateMessage; + public static String XMLUtilities_IOExceptionMessage; + public static String XMLUtilities_SAXExceptionMessage; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/MethodNotImplementedException.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/MethodNotImplementedException.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/MethodNotImplementedException.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -17,7 +17,7 @@ public class MethodNotImplementedException extends RuntimeException { public MethodNotImplementedException() { - super("Method is not implemented yet"); + super("Method is not implemented yet"); //$NON-NLS-1$ } public MethodNotImplementedException(String message, Throwable cause) { Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BaseUIPlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BaseUIPlugin.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/BaseUIPlugin.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -15,6 +15,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.jboss.tools.common.Messages; /** * Provides an easy way to log status of events. @@ -65,6 +66,6 @@ logError(message, t); Shell shell = Display.getDefault().getActiveShell(); IStatus s = StatusFactory.getInstance(IStatus.ERROR, this.getBundle().getSymbolicName(), message, t); - ErrorDialog.openError(shell, "Hibernate Console", message, s); + ErrorDialog.openError(shell, Messages.BaseUIPlugin_ErrorDialogTitle, message, s); } } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/log/StatusFactory.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -16,8 +16,8 @@ public class StatusFactory { public final static int UNDEFINED_ERROR = 0; public final static String UNSPECIFIED_MESSAGE = null; - public final static String EMPTY_MESSAGE = ""; - public final static String EMPTY_PLUGIN = ""; + public final static String EMPTY_MESSAGE = ""; //$NON-NLS-1$ + public final static String EMPTY_PLUGIN = ""; //$NON-NLS-1$ public static IStatus getInstance(int severity, String pluginId, int code, String message, Throwable t) { Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/messages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/messages.properties (rev 0) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/messages.properties 2009-05-27 06:24:07 UTC (rev 15544) @@ -0,0 +1,6 @@ +BaseUIPlugin_ErrorDialogTitle=Hibernate Console +SAXValidator_IOExceptionMessage=Unidentified parser error +SAXValidator_SAXExceptionMessage=Unidentified parser error +SAXValidator_UnableToInstantiateMessage=error: Unable to instantiate parser ({0}) +XMLUtilities_IOExceptionMessage=Unexpected parser error +XMLUtilities_SAXExceptionMessage=Unexpected parser error Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/DefaultProblemReporter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/DefaultProblemReporter.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/DefaultProblemReporter.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -21,7 +21,7 @@ public void reportProblem(IStatus status) { if(status != null) { - Platform.getLog(Platform.getBundle("org.jboss.tools.common")).log(status); + Platform.getLog(Platform.getBundle("org.jboss.tools.common")).log(status); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/ProblemBuffer.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/ProblemBuffer.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/ProblemBuffer.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -35,7 +35,7 @@ */ public void writeToBuffer(IStatus status) { getEclipseLog(); - writer.logging(status, "org.jboss.tools.common"); + writer.logging(status, "org.jboss.tools.common"); //$NON-NLS-1$ } /** @@ -50,7 +50,7 @@ int i = 0; int c = 0; while(i < s.length()) { - i = s.indexOf("!ENTRY", i); + i = s.indexOf("!ENTRY", i); //$NON-NLS-1$ if(i >= 0) { ++c; ++i; @@ -67,12 +67,12 @@ */ public String getContent() { File f = getLogFile(); - return (!f.isFile()) ? "" : FileUtil.readFile(f); + return (!f.isFile()) ? "" : FileUtil.readFile(f); //$NON-NLS-1$ } public String getEclipseLogContent() { File f = Platform.getLogFileLocation().toFile(); - return (f.isFile()) ? FileUtil.readFile(f) : ""; + return (f.isFile()) ? FileUtil.readFile(f) : ""; //$NON-NLS-1$ } public void clean() { @@ -90,10 +90,10 @@ public void report(String text, String userEMail, String other, boolean cleanBuffer) { StringBuffer sb = new StringBuffer(); if(userEMail != null && userEMail.trim().length() > 0) { - sb.append("Customer e-mail=" + userEMail + "\n"); + sb.append("Customer e-mail=" + userEMail + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ } if(other != null && other.length() > 0) { - sb.append("Other=" + other + "\n"); + sb.append("Other=" + other + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ } if(text != null) { sb.append(text); @@ -114,9 +114,9 @@ } private File getLogFile() { - Bundle b = Platform.getBundle("org.jboss.tools.common"); + Bundle b = Platform.getBundle("org.jboss.tools.common"); //$NON-NLS-1$ String stateLocation = Platform.getStateLocation(b).toString().replace('\\', '/'); - String logLocation = stateLocation + "/.log"; + String logLocation = stateLocation + "/.log"; //$NON-NLS-1$ return new File(logLocation); } } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/ProblemReportingHelper.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/ProblemReportingHelper.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/ProblemReportingHelper.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -36,7 +36,7 @@ */ public static void reportProblem(String plugin, String message, Throwable throwable) { if(message==null) { - throw new IllegalArgumentException("Message parameter cannot be null"); + throw new IllegalArgumentException("Message parameter cannot be null"); //$NON-NLS-1$ } IStatus status = new Status(IStatus.ERROR, plugin, 0, message, throwable); reportProblem(status); @@ -48,8 +48,8 @@ */ public static void reportProblem(IStatus status) { if(status == null) { - reportProblem("org.jboss.tools.common", - new IllegalArgumentException("Parameter 'status' cannt be null")); + reportProblem("org.jboss.tools.common", //$NON-NLS-1$ + new IllegalArgumentException("Parameter 'status' cannot be null")); //$NON-NLS-1$ return; } IProblemReporter reporter = ProblemReporterFactory.getInstance().getProblemReporter(); Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/Submit.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/Submit.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/reporting/Submit.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -27,11 +27,11 @@ */ public class Submit { - public static String REPORT_DESRIPTION_PARAMETER_NAME = CommonPlugin.getMessage("%reportParameterName"); + public static String REPORT_DESRIPTION_PARAMETER_NAME = CommonPlugin.getMessage("%reportParameterName"); //$NON-NLS-1$ - private static String URL = CommonPlugin.getMessage("%reportingUrl"); - private static String JOB_NAME = CommonPlugin.getMessage("%reportingJobName"); - private static String ERROR_MESSAGE = CommonPlugin.getMessage("%errorReportingMessage"); + private static String URL = CommonPlugin.getMessage("%reportingUrl"); //$NON-NLS-1$ + private static String JOB_NAME = CommonPlugin.getMessage("%reportingJobName"); //$NON-NLS-1$ + private static String ERROR_MESSAGE = CommonPlugin.getMessage("%errorReportingMessage"); //$NON-NLS-1$ private static Submit INSTANCE = new Submit(); @@ -61,7 +61,7 @@ String exceptionMessage = e.getMessage(); String message = ERROR_MESSAGE; if(exceptionMessage!=null && exceptionMessage.trim().length()>0) { - message = message + ".\r\n" + e.getClass().getName() + ": " + exceptionMessage; + message = message + ".\r\n" + e.getClass().getName() + ": " + exceptionMessage; //$NON-NLS-1$ //$NON-NLS-2$ } Status status = new Status(IStatus.WARNING, CommonPlugin.PLUGIN_ID, IStatus.WARNING, message, e); return status; Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -191,7 +191,7 @@ * @return */ public boolean isCloseTag() { - return label != null && label.startsWith("/"); + return label != null && label.startsWith("/"); //$NON-NLS-1$ } /** @@ -199,11 +199,11 @@ */ public String toString() { StringBuffer buffer = new StringBuffer(); - buffer.append("label: "); + buffer.append("label: "); //$NON-NLS-1$ buffer.append(label); - buffer.append("\ncontextInfo: "); + buffer.append("\ncontextInfo: "); //$NON-NLS-1$ buffer.append(contextInfo); - buffer.append("\nreplacementString: "); + buffer.append("\nreplacementString: "); //$NON-NLS-1$ buffer.append(replacementString); return buffer.toString(); Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -56,13 +56,13 @@ } catch (CoreException e) { CommonPlugin.getPluginLog().logError(e); } - return encoding != null ? encoding : "8859_1"; + return encoding != null ? encoding : "8859_1"; //$NON-NLS-1$ } public static String readFile(File f) { - if(!f.isFile()) return ""; + if(!f.isFile()) return ""; //$NON-NLS-1$ ReadBytes bs = readBytes(f); - if(bs == null) return ""; + if(bs == null) return ""; //$NON-NLS-1$ String encoding = getEncoding(bs.bs); if(encoding == null) return new String(bs.bs, 0, bs.length); try { @@ -73,9 +73,9 @@ } public static String readFileWithEncodingCheck(File f, String defaultEncoding) { - if(!f.isFile()) return ""; + if(!f.isFile()) return ""; //$NON-NLS-1$ ReadBytes bs = readBytes(f); - if(bs == null) return ""; + if(bs == null) return ""; //$NON-NLS-1$ String encoding = getEncoding(bs.bs); if(encoding == null) encoding = validateEncoding(defaultEncoding, null); if(encoding == null) return new String(bs.bs, 0, bs.length); @@ -170,7 +170,7 @@ // FIXME Size of string buffer should be set to size of file by default // to avoid StringBuffer extension on each append public static String readStream(InputStream is) { - StringBuffer sb = new StringBuffer(""); + StringBuffer sb = new StringBuffer(""); //$NON-NLS-1$ try { byte[] b = new byte[4096]; while(true) { @@ -193,8 +193,8 @@ if(value == null) return false; String encoding = getEncoding(value); if(encoding == null) encoding = validateEncoding(defaultEncoding, null); - if(value.startsWith("<?xml")) { - String s = validateEncoding(encoding, "UTF-8"); + if(value.startsWith("<?xml")) { //$NON-NLS-1$ + String s = validateEncoding(encoding, "UTF-8"); //$NON-NLS-1$ if(encoding == null) { encoding = s; } else if(s == null || !s.equals(encoding)) { @@ -211,9 +211,9 @@ if(f.isFile() && !isSameFile(f)) f.delete(); if(!f.exists()) f.createNewFile(); } catch (IOException e) { - CommonPlugin.getPluginLog().logError("Problem writing to file " + f, e); + CommonPlugin.getPluginLog().logError("Problem writing to file " + f, e); //$NON-NLS-1$ } catch (SecurityException e) { - CommonPlugin.getPluginLog().logError("Problem writing to file " + f, e); + CommonPlugin.getPluginLog().logError("Problem writing to file " + f, e); //$NON-NLS-1$ } PrintWriter pw = new PrintWriter(new FileWriter(f)); pw.print(value); @@ -445,10 +445,10 @@ public static void add(File f, String name, JarOutputStream jos) throws IOException { String en = name; - if(f.isDirectory()) en += "/"; - JarEntry entry = (en.endsWith("/")) ? null : new JarEntry(en); + if(f.isDirectory()) en += "/"; //$NON-NLS-1$ + JarEntry entry = (en.endsWith("/")) ? null : new JarEntry(en); //$NON-NLS-1$ if(f.isDirectory()) { - if("/".equals(en)) en = ""; + if("/".equals(en)) en = ""; //$NON-NLS-1$ //$NON-NLS-2$ File[] fs = f.listFiles(); if(fs != null) for (int i = 0; i < fs.length; i++) add(fs[i], en + fs[i].getName(), jos); @@ -519,7 +519,7 @@ if(url == null) return null; String resultUrl = url.replace('\\', '/'); /// if(!url.startsWith("file:/")) return url; - if(!resultUrl.startsWith("file:")) return resultUrl; + if(!resultUrl.startsWith("file:")) return resultUrl; //$NON-NLS-1$ int iLast = resultUrl.lastIndexOf(':'), iFirst = resultUrl.indexOf(':'); return (iLast == iFirst) ? resultUrl.substring(5) : resultUrl.substring(iLast - 1); } @@ -533,19 +533,19 @@ int i = 0; while(i < r.length && i < p.length && r[i].equalsIgnoreCase(p[i])) ++i; StringBuffer sb = new StringBuffer(); - for (int k = i; k < r.length; k++) sb.append("/.."); - for (int k = i; k < p.length; k++) sb.append("/").append(p[k]); + for (int k = i; k < r.length; k++) sb.append("/.."); //$NON-NLS-1$ + for (int k = i; k < p.length; k++) sb.append("/").append(p[k]); //$NON-NLS-1$ return sb.toString(); } private static String[] tokenizePath(String path) { String tokenizedPath = path.replace('\\', '/'); - StringTokenizer st = new StringTokenizer(tokenizedPath, "/"); + StringTokenizer st = new StringTokenizer(tokenizedPath, "/"); //$NON-NLS-1$ ArrayList l = new ArrayList(); while(st.hasMoreTokens()) { String t = st.nextToken(); - if(t.length() == 0 || t.equals(".")) continue; - if(t.equals("..")) { + if(t.length() == 0 || t.equals(".")) continue; //$NON-NLS-1$ + if(t.equals("..")) { //$NON-NLS-1$ if(l.size() > 0) l.remove(l.size() - 1); continue; } @@ -557,20 +557,20 @@ public static String encode(String text, String encoding) { if(true) return text; try { - byte[] bs = text.getBytes(System.getProperty("file.encoding")); + byte[] bs = text.getBytes(System.getProperty("file.encoding")); //$NON-NLS-1$ ByteArrayInputStream is = new ByteArrayInputStream(bs); InputStreamReader r = new InputStreamReader(is, encoding); char[] cs = new char[bs.length]; int l = r.read(cs, 0, cs.length); return new String(cs, 0, l); } catch (IOException e) { - if("UTF-8".equals(encoding)) return text; - return encode(text, "UTF-8"); + if("UTF-8".equals(encoding)) return text; //$NON-NLS-1$ + return encode(text, "UTF-8"); //$NON-NLS-1$ } } public static String encodeDefault(String text) { - return encode(text, System.getProperties().getProperty("file.encoding")); + return encode(text, System.getProperties().getProperty("file.encoding")); //$NON-NLS-1$ } /* @@ -624,10 +624,10 @@ public static String getEncoding(String s) { if(s == null) return null; - if(s.startsWith("<?xml")) { - int i = s.indexOf("encoding="); + if(s.startsWith("<?xml")) { //$NON-NLS-1$ + int i = s.indexOf("encoding="); //$NON-NLS-1$ if(i < 0) return null; - i += "encoding=".length() + 1; + i += "encoding=".length() + 1; //$NON-NLS-1$ int j = s.indexOf('\"', i); if(j < 0) return null; return s.substring(i, j); @@ -643,7 +643,7 @@ if(validEncodings.contains(encoding)) return encoding; if(invalidEncodings.contains(encoding)) return defaultEncoding; try { - if(defaultEncoding != null && defaultEncoding.equals("UTF-16")) { + if(defaultEncoding != null && defaultEncoding.equals("UTF-16")) { //$NON-NLS-1$ new String(XML_16, 0, XML_16.length, encoding); } else { new String(XML_8, 0, XML_8.length, encoding); @@ -663,15 +663,15 @@ if(bs.length < 20) return null; if(startsWith(bs, XML_8)) { int i = getIndex(bs, (byte)'?', 5); - if(i < 0) return "UTF-8"; + if(i < 0) return "UTF-8"; //$NON-NLS-1$ String encoding = getEncoding(new String(bs, 0, i)); - return validateEncoding(encoding, "UTF-8"); + return validateEncoding(encoding, "UTF-8"); //$NON-NLS-1$ } else if(startsWith(bs, XML_16)) { int i = getIndex(bs, (byte)'?', XML_16.length); - if(i < 0) return "UTF-16"; + if(i < 0) return "UTF-16"; //$NON-NLS-1$ try { - String encoding = getEncoding(new String(bs, 0, i, "UTF-16")); - return validateEncoding(encoding, "UTF-16"); + String encoding = getEncoding(new String(bs, 0, i, "UTF-16")); //$NON-NLS-1$ + return validateEncoding(encoding, "UTF-16"); //$NON-NLS-1$ } catch (UnsupportedEncodingException e) { return null; } Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/ResourcesUtils.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/ResourcesUtils.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/ResourcesUtils.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -71,7 +71,7 @@ } public static IProject importExistingProject(IProject project, String location, String name, IProgressMonitor monitor, boolean refreshWorkspace) throws CoreException { - IPath path = new Path(location).append(".project"); + IPath path = new Path(location).append(".project"); //$NON-NLS-1$ IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(path); description.setName(name); project.create(description, monitor); Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/DtdResolver.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/DtdResolver.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/DtdResolver.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -45,19 +45,19 @@ location = XMLCorePlugin.getDefault().getDefaultXMLCatalog().resolveURI(systemId); } if(location == null) { - if(systemId != null && systemId.startsWith("file:") && systemId.endsWith(".xsd")) { + if(systemId != null && systemId.startsWith("file:") && systemId.endsWith(".xsd")) { //$NON-NLS-1$ //$NON-NLS-2$ int i = systemId.replace('\\', '/').lastIndexOf('/'); String systemId2 = systemId.substring(i + 1); location = XMLCorePlugin.getDefault().getDefaultXMLCatalog().resolveURI(systemId2); } } - if((location == null || location.startsWith("http:")) && systemId != null) { - Bundle b = Platform.getBundle("org.eclipse.jst.standard.schemas"); + if((location == null || location.startsWith("http:")) && systemId != null) { //$NON-NLS-1$ + Bundle b = Platform.getBundle("org.eclipse.jst.standard.schemas"); //$NON-NLS-1$ if(b != null) { - int q = systemId.lastIndexOf("/"); + int q = systemId.lastIndexOf("/"); //$NON-NLS-1$ String s = systemId.substring(q + 1); - URL u = b.getEntry("/dtdsAndSchemas/" + s); + URL u = b.getEntry("/dtdsAndSchemas/" + s); //$NON-NLS-1$ try { if(u != null) { u = FileLocator.resolve(u); @@ -73,9 +73,9 @@ if(location == null) { if(systemId != null && !unfound.contains(systemId)) { unfound.add(systemId); - CommonPlugin.getPluginLog().logError("Cannot find locally: " - + "Public ID " + publicId - + " System ID " + systemId); + CommonPlugin.getPluginLog().logError("Cannot find locally: " //$NON-NLS-1$ + + "Public ID " + publicId //$NON-NLS-1$ + + " System ID " + systemId); //$NON-NLS-1$ } } if(location!=null) { @@ -84,27 +84,27 @@ File file = new File(url.getFile()); if(file.isFile()) { return new FileInputStream(file); - } else if("jar".equals(url.getProtocol())) { + } else if("jar".equals(url.getProtocol())) { //$NON-NLS-1$ return url.openStream(); } } catch(FileNotFoundException e) { - CommonPlugin.getPluginLog().logError("Error in DtdResolver: " + e.getMessage()); + CommonPlugin.getPluginLog().logError("Error in DtdResolver: " + e.getMessage()); //$NON-NLS-1$ } } String resourceType = null; if(systemId!=null) { - if(systemId.toLowerCase().endsWith(".dtd")) { - resourceType = "DTD"; - } else if(systemId.toLowerCase().endsWith(".xsd")) { - resourceType = "XSD"; + if(systemId.toLowerCase().endsWith(".dtd")) { //$NON-NLS-1$ + resourceType = "DTD"; //$NON-NLS-1$ + } else if(systemId.toLowerCase().endsWith(".xsd")) { //$NON-NLS-1$ + resourceType = "XSD"; //$NON-NLS-1$ } } InputStream is = null; if(resourceType!=null) { // this deactivates DTD and XSD try { URL url = new URL(systemId); - if("http".equals(url.getProtocol())) { + if("http".equals(url.getProtocol())) { //$NON-NLS-1$ is = HttpUtil.getInputStreamFromUrlByGetMethod(systemId); } } catch (MalformedURLException e) { Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/ErrorHandlerImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/ErrorHandlerImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/ErrorHandlerImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -34,7 +34,7 @@ } private void add(SAXParseException e) { - errors.add("" + e.getMessage() + ":" + e.getLineNumber() + ":" + e.getColumnNumber()); + errors.add("" + e.getMessage() + ":" + e.getLineNumber() + ":" + e.getColumnNumber()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SAXValidator.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -14,6 +14,7 @@ import java.io.IOException; import java.io.Reader; import java.net.URL; +import java.text.MessageFormat; import java.util.HashSet; import java.util.Set; @@ -21,6 +22,7 @@ import org.apache.xerces.xni.XMLResourceIdentifier; import org.eclipse.core.runtime.Platform; import org.jboss.tools.common.CommonPlugin; +import org.jboss.tools.common.Messages; import org.jboss.tools.common.util.FileUtil; import org.osgi.framework.Bundle; import org.xml.sax.SAXException; @@ -36,16 +38,16 @@ */ public class SAXValidator { - protected static final String FATAL_ERROR_PROCESSING_FEATURE_ID = "http://apache.org/xml/features/continue-after-fatal-error"; - protected static final String ENTITY_RESOLVER_PROPERTY_ID = "http://apache.org/xml/properties/internal/entity-resolver"; - protected static final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces"; - protected static final String NAMESPACE_PREFIXES_FEATURE_ID = "http://xml.org/sax/features/namespace-prefixes"; - protected static final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation"; - protected static final String VALIDATION_SCHEMA_FEATURE_ID = "http://apache.org/xml/features/validation/schema"; - protected static final String VALIDATION_SCHEMA_CHECKING_FEATURE_ID = "http://apache.org/xml/features/validation/schema-full-checking"; - protected static final String VALIDATION_DYNAMIC_FEATURE_ID = "http://apache.org/xml/features/validation/dynamic"; + protected static final String FATAL_ERROR_PROCESSING_FEATURE_ID = "http://apache.org/xml/features/continue-after-fatal-error"; //$NON-NLS-1$ + protected static final String ENTITY_RESOLVER_PROPERTY_ID = "http://apache.org/xml/properties/internal/entity-resolver"; //$NON-NLS-1$ + protected static final String NAMESPACES_FEATURE_ID = "http://xml.org/sax/features/namespaces"; //$NON-NLS-1$ + protected static final String NAMESPACE_PREFIXES_FEATURE_ID = "http://xml.org/sax/features/namespace-prefixes"; //$NON-NLS-1$ + protected static final String VALIDATION_FEATURE_ID = "http://xml.org/sax/features/validation"; //$NON-NLS-1$ + protected static final String VALIDATION_SCHEMA_FEATURE_ID = "http://apache.org/xml/features/validation/schema"; //$NON-NLS-1$ + protected static final String VALIDATION_SCHEMA_CHECKING_FEATURE_ID = "http://apache.org/xml/features/validation/schema-full-checking"; //$NON-NLS-1$ + protected static final String VALIDATION_DYNAMIC_FEATURE_ID = "http://apache.org/xml/features/validation/dynamic"; //$NON-NLS-1$ - protected static final String DEFAULT_SAX_PARSER_CLASS_NAME = "org.apache.xerces.parsers.SAXParser"; + protected static final String DEFAULT_SAX_PARSER_CLASS_NAME = "org.apache.xerces.parsers.SAXParser"; //$NON-NLS-1$ /** * @@ -72,9 +74,9 @@ try { parserInstance.setProperty(ENTITY_RESOLVER_PROPERTY_ID, new XMLEntityResolverImpl()); } catch (SAXNotRecognizedException e1) { - CommonPlugin.getPluginLog().logError( e1.getMessage()+"", e1); + CommonPlugin.getPluginLog().logError( e1.getMessage()+"", e1); //$NON-NLS-1$ } catch (SAXNotSupportedException e1) { - CommonPlugin.getPluginLog().logError( e1.getMessage()+"", e1); + CommonPlugin.getPluginLog().logError( e1.getMessage()+"", e1); //$NON-NLS-1$ } parserInstance.setContentHandler(handler); @@ -93,7 +95,7 @@ parser.setFeature(name, value); } catch (SAXException e) { // TODO - Move to NLS bundle - CommonPlugin.getPluginLog().logError("warning: Parser does not support feature ("+name+")", e); + CommonPlugin.getPluginLog().logError("warning: Parser does not support feature ("+name+")", e); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -107,7 +109,7 @@ try { parser.setProperty(name, value); } catch (SAXException e) { - CommonPlugin.getPluginLog().logError("warning: Parser does not support feature ("+name+")", e); + CommonPlugin.getPluginLog().logError("warning: Parser does not support feature ("+name+")", e); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -123,20 +125,18 @@ try { XMLReader parser = createParser(); if(parser==null) { - // TODO - Move to NLS bundle - return new String[]{ "error: Unable to instantiate parser ("+DEFAULT_SAX_PARSER_CLASS_NAME+")"}; + return new String[]{ MessageFormat.format( + Messages.SAXValidator_UnableToInstantiateMessage, DEFAULT_SAX_PARSER_CLASS_NAME)}; } parser.setErrorHandler(h); parser.parse(is); } catch (SAXException e) { if(h.errors.isEmpty()) { - // TODO - Move to NLS bundle - return new String[]{"Unidentified parser error:0:0",e.getMessage()}; + return new String[]{Messages.SAXValidator_SAXExceptionMessage+":0:0",e.getMessage()}; //$NON-NLS-1$ } } catch (IOException e) { if(h.errors.isEmpty()) { - // TODO - Move to NLS bundle - return new String[]{"Unidentified parser error:0:0",e.getMessage()}; + return new String[]{Messages.SAXValidator_IOExceptionMessage+":0:0",e.getMessage()}; //$NON-NLS-1$ } } finally { // Thread.currentThread().setContextClassLoader(cc); @@ -162,34 +162,34 @@ Bundle b = Platform.getBundle(CommonPlugin.PLUGIN_ID); String location = Platform.getStateLocation(b).toString().replace('\\', '/'); - if(!location.endsWith("/")) { - location += "/"; + if(!location.endsWith("/")) { //$NON-NLS-1$ + location += "/"; //$NON-NLS-1$ } String urlString = null; URL url = null; try { - url = Platform.resolve(b.getEntry("/")); + url = Platform.resolve(b.getEntry("/")); //$NON-NLS-1$ urlString = url.toString(); - if(!urlString.endsWith("/")) { - urlString += "/"; + if(!urlString.endsWith("/")) { //$NON-NLS-1$ + urlString += "/"; //$NON-NLS-1$ } - urlString += "schemas"; + urlString += "schemas"; //$NON-NLS-1$ } catch (IOException e) { CommonPlugin.getPluginLog().logError(e); } - File f1 = new File(url.getFile() + "/schemas/catalog.xml"); - File f2 = new File(location + "schemas/catalog.xml"); + File f1 = new File(url.getFile() + "/schemas/catalog.xml"); //$NON-NLS-1$ + File f2 = new File(location + "schemas/catalog.xml"); //$NON-NLS-1$ if(f2.exists()) { - return "file:///" + location + "schemas/catalog.xml"; + return "file:///" + location + "schemas/catalog.xml"; //$NON-NLS-1$ //$NON-NLS-2$ } FileUtil.copyDir(f1.getParentFile(), f2.getParentFile(), true); String text = FileUtil.readFile(f2); - while(text.indexOf("%install%") >= 0) { - int i = text.indexOf("%install%"); + while(text.indexOf("%install%") >= 0) { //$NON-NLS-1$ + int i = text.indexOf("%install%"); //$NON-NLS-1$ text = text.substring(0, i) + urlString + text.substring(i + 9); } FileUtil.writeFile(f2, text); - return "file:///" + location + "schemas/catalog.xml"; + return "file:///" + location + "schemas/catalog.xml"; //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SafeDocumentBuilderFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SafeDocumentBuilderFactory.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/SafeDocumentBuilderFactory.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -24,8 +24,8 @@ public class SafeDocumentBuilderFactory extends Thread { public static final EntityResolver EMPTY_RESOLVER = new EntityResolver() { public InputSource resolveEntity(java.lang.String publicId, java.lang.String systemId) throws SAXException, java.io.IOException { - if((systemId != null) && systemId.toLowerCase().endsWith(".dtd")) { // this deactivates DTD - return new InputSource(new ByteArrayInputStream("<?xml version='1.0' encoding='UTF-8'?>".getBytes())); + if((systemId != null) && systemId.toLowerCase().endsWith(".dtd")) { // this deactivates DTD //$NON-NLS-1$ + return new InputSource(new ByteArrayInputStream("<?xml version='1.0' encoding='UTF-8'?>".getBytes())); //$NON-NLS-1$ } else { return null; } Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolver.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -94,8 +94,8 @@ } } - if(deactivate && (systemId != null) && (source == null) && (systemId.toLowerCase().endsWith(".dtd"))) { // this deactivates DTD - source = new InputSource(new ByteArrayInputStream("<?xml version='1.0' encoding='UTF-8'?>".getBytes())); + if(deactivate && (systemId != null) && (source == null) && (systemId.toLowerCase().endsWith(".dtd"))) { // this deactivates DTD //$NON-NLS-1$ + source = new InputSource(new ByteArrayInputStream("<?xml version='1.0' encoding='UTF-8'?>".getBytes())); //$NON-NLS-1$ } return source; Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolverImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolverImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLEntityResolverImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -49,7 +49,7 @@ result = new XMLInputSource(rid.getPublicId(), systemId, rid.getBaseSystemId(), is, null); } } catch (SAXException e) { - CommonPlugin.getPluginLog().logError( "Exception publicId=" + publicId + " systemId=" + systemId + " exception=" + e.getClass().getName() + ":" + e.getMessage()); + CommonPlugin.getPluginLog().logError( "Exception publicId=" + publicId + " systemId=" + systemId + " exception=" + e.getClass().getName() + ":" + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } return result; Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/xml/XMLUtilities.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -28,6 +28,7 @@ import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; import org.jboss.tools.common.CommonPlugin; +import org.jboss.tools.common.Messages; import org.w3c.dom.Comment; import org.w3c.dom.DOMException; import org.w3c.dom.DOMImplementation; @@ -240,11 +241,11 @@ builder.parse(is); } catch (IOException e) { if(h.errors.isEmpty()) { - return new String[]{"Unexpected parser error:0:0",e.toString()}; + return new String[]{Messages.XMLUtilities_IOExceptionMessage+":0:0",e.toString()}; //$NON-NLS-1$ } } catch (SAXException e) { if(h.errors.isEmpty()) { - return new String[]{"Unexpected parser error:0:0",e.toString()}; + return new String[]{Messages.XMLUtilities_SAXExceptionMessage+":0:0",e.toString()}; //$NON-NLS-1$ } } return h.errors.toArray(new String[0]); @@ -262,8 +263,8 @@ serialize(element, new BufferedWriter(fw)); fw.close(); } - static final String ENCODING = "encoding=\""; - static final String UTF8 = "UTF-8"; + static final String ENCODING = "encoding=\""; //$NON-NLS-1$ + static final String UTF8 = "UTF-8"; //$NON-NLS-1$ public static String getEncoding(String body) { int i = body.indexOf(ENCODING); @@ -280,7 +281,7 @@ } public static OutputFormat createOutputFormat(String encoding) { OutputFormat format = new OutputFormat(Method.XML, encoding == null || encoding.length() == 0?null:encoding, true); - format.setLineSeparator(System.getProperty("line.separator", LineSeparator.Web)); + format.setLineSeparator(System.getProperty("line.separator", LineSeparator.Web)); //$NON-NLS-1$ format.setIndent(1); return format; } @@ -373,17 +374,17 @@ public static final void setCDATA(Element element, String data) { element.appendChild(element.getOwnerDocument().createCDATASection( - data!=null?data:"")); + data!=null?data:"")); //$NON-NLS-1$ } public static final void setText(Element element, String data) { element.appendChild(element.getOwnerDocument().createTextNode( - data!=null?data:"")); + data!=null?data:"")); //$NON-NLS-1$ } public static final void setComment(Element element, String data) { Comment comm = element.getOwnerDocument().createComment( - data!=null?data:""); + data!=null?data:""); //$NON-NLS-1$ element.getParentNode().insertBefore(comm, element); } Added: trunk/common/plugins/org.jboss.tools.common.el.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/.settings/org.eclipse.jdt.core.prefs 2009-05-27 06:24:07 UTC (rev 15544) @@ -0,0 +1 @@ +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -20,7 +20,7 @@ public class Activator extends BaseUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.common.el"; + public static final String PLUGIN_ID = "org.jboss.tools.common.el"; //$NON-NLS-1$ // The shared instance private static Activator plugin; Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -19,7 +19,7 @@ public class ELReferenceList extends ResourceReferenceList { /** The PROPERT y_ NAME. */ - private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.ELReference"); + private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.ELReference"); //$NON-NLS-1$ //$NON-NLS-2$ /** The instance. */ static ELReferenceList instance = new ELReferenceList(); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -20,7 +20,7 @@ */ public class GlobalELReferenceList extends ResourceReferenceList { /** The PROPERT y_ NAME. */ - private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.GlobalELReference"); + private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.GlobalELReference"); //$NON-NLS-1$ //$NON-NLS-2$ /** The instance. */ private static GlobalELReferenceList instance = new GlobalELReferenceList(); Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Messages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Messages.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Messages.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -0,0 +1,32 @@ +package org.jboss.tools.common.el.core; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.common.el.core.messages"; //$NON-NLS-1$ + public static String CallRule_ExpectingCommaOrRParen; + public static String CallRule_ExpectingRBrace; + public static String CallRule_ExpectingRBracket; + public static String CallRule_ExpectingRParen; + public static String CallRule_UnexpectedLParen; + public static String ExpressionRule_CannotStartWithBinaryOp; + public static String ExpressionRule_CannotStartWithInstanceof; + public static String ExpressionRule_ExpectingExpression; + public static String ExpressionRule_ExpectingJavaName; + public static String JavaNameTokenDescription_Name; + public static String OperationRule_ExpectingRBrace; + public static String OperationRule_ExpectingRBracket; + public static String OperationRule_ExpectingRParen; + public static String OperationTokenDescription_Name; + public static String PrimitiveValueTokenDescription_ArgMustResolveToIntegerOrString; + public static String PrimitiveValueTokenDescription_Name; + public static String StringTokenDescription_Name; + public static String WhiteSpaceTokenDescription_Name; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties 2009-05-27 06:24:07 UTC (rev 15544) @@ -0,0 +1,18 @@ +CallRule_ExpectingCommaOrRParen=Expecting ',' or ')' +CallRule_ExpectingRBrace=Expecting '}' +CallRule_ExpectingRBracket=Expecting ']' +CallRule_ExpectingRParen=Expecting ')' +CallRule_UnexpectedLParen=Unexpected symbol '(' +ExpressionRule_CannotStartWithBinaryOp=Expression cannot start with binary operator. +ExpressionRule_CannotStartWithInstanceof=Expression cannot start with instanceof. +ExpressionRule_ExpectingExpression=Expecting expression +ExpressionRule_ExpectingJavaName=Expecting Java method or property name +JavaNameTokenDescription_Name=NAME +OperationRule_ExpectingRBrace=Expecting '}' +OperationRule_ExpectingRBracket=Expecting ']' +OperationRule_ExpectingRParen=Expecting ')' +OperationTokenDescription_Name=Operator +PrimitiveValueTokenDescription_ArgMustResolveToIntegerOrString=Argument must resolve to integer or string. +PrimitiveValueTokenDescription_Name=Primitive +StringTokenDescription_Name=String +WhiteSpaceTokenDescription_Name=Whitespace Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/Tokenizer.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/Tokenizer.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/Tokenizer.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -60,7 +60,7 @@ for (int i = 0; i < ds.length; i++) { int type = ds[i].getType(); if(tokenDescriptions.containsKey(type)) { - throw new IllegalArgumentException("Token type " + type + " is not unique."); + throw new IllegalArgumentException("Token type " + type + " is not unique."); //$NON-NLS-1$ //$NON-NLS-2$ } tokenDescriptions.put(type, ds[i]); } @@ -93,7 +93,7 @@ this.sourceString = sourceString; errors.clear(); index = initialOffset; - start = new LexicalToken(initialOffset, 0, "", -1000); + start = new LexicalToken(initialOffset, 0, "", -1000); //$NON-NLS-1$ last = start; state = BasicStates.STATE_EXPECTING_EL; Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/TokenizerFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/TokenizerFactory.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/TokenizerFactory.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -106,7 +106,7 @@ } public static void main(String[] args) { - String text = "ioioio#{a(1.2e1i) + b c + d}ioioio#{0}"; + String text = "ioioio#{a(1.2e1i) + b c + d}ioioio#{0}"; //$NON-NLS-1$ //"#{a[b()['l'].j]}"; //"#{g11.g12.y13} #{#{ #{a14.b15(x.t.u(uu.ii[9], j)).b16(m17(v18(i19[2]).u20).)+ a21(c.).b.}"; //"#{not a.b(x,y) + s.h((6 != -8) & (7 + -iy88.g[9].h(7 div 8).i.j)+(8) ? 4 : 7,'p', a.b.c.d[null])}"; @@ -117,28 +117,28 @@ while(ti != null) { int type = ti.getType(); - System.out.println(type + ":" + ti.getText() + ":"); + System.out.println(type + ":" + ti.getText() + ":"); //$NON-NLS-1$ //$NON-NLS-2$ ti = ti.getNextToken(); } List<SyntaxError> errors = t.getErrors(); for (SyntaxError e: errors) { - System.out.println("state=" + e.getState() + " position=" + e.getPosition() + " problem=" + e.getProblem()); + System.out.println("state=" + e.getState() + " position=" + e.getPosition() + " problem=" + e.getProblem()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } ELParser parser = ELParserUtil.getJbossFactory().createParser(); ELModel model = parser.parse(text, 0, 90); System.out.println(model); ELExpression expr = model.getInstances().get(0).getExpression(); - System.out.println("Expression=" + expr); + System.out.println("Expression=" + expr); //$NON-NLS-1$ List<ELInvocationExpression> is = expr.getInvocations(); - System.out.println("Invocations:"); + System.out.println("Invocations:"); //$NON-NLS-1$ for (ELInvocationExpression i : is) { System.out.println(i); } int off = 8; ELExpression expr1 = ELUtil.findExpression(model, off); - System.out.println("Expression at " + off + ": " + expr1); + System.out.println("Expression at " + off + ": " + expr1); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolverFactoryManager.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -64,22 +64,22 @@ } Set<ELResolver> resolverSet = new HashSet<ELResolver>(); IExtensionRegistry registry = Platform.getExtensionRegistry(); - IExtensionPoint extensionPoint = registry.getExtensionPoint("org.jboss.tools.common.el.core.elResolver"); //$NON-NLS-N$1 + IExtensionPoint extensionPoint = registry.getExtensionPoint("org.jboss.tools.common.el.core.elResolver"); //$NON-NLS-1$ IExtension[] extensions = extensionPoint.getExtensions(); for (int i=0; i<extensions.length; i++) { IExtension extension = extensions[i]; IConfigurationElement[] elements = extension.getConfigurationElements(); for(int j=0; j<elements.length; j++) { - IConfigurationElement[] natures = elements[i].getChildren("project-nature"); //$NON-NLS-N$1 + IConfigurationElement[] natures = elements[i].getChildren("project-nature"); //$NON-NLS-1$ for (int k = 0; k < natures.length; k++) { - String natureId = natures[k].getAttribute("id"); //$NON-NLS-N$1 + String natureId = natures[k].getAttribute("id"); //$NON-NLS-1$ try { if(project.hasNature(natureId)) { - Object resolver = natures[k].createExecutableExtension("resolver-class"); //$NON-NLS-N$1 + Object resolver = natures[k].createExecutableExtension("resolver-class"); //$NON-NLS-1$ if(resolver instanceof ELResolver) { resolverSet.add((ELResolver)resolver); } else { - Activator.getPluginLog().logError(resolver.getClass().getName() + " must be instance of org.jboss.tools.common.el.core.resolver.ELResolver"); + Activator.getPluginLog().logError(resolver.getClass().getName() + " must be instance of org.jboss.tools.common.el.core.resolver.ELResolver"); //$NON-NLS-1$ } } } catch (InvalidRegistryObjectException e) { @@ -88,17 +88,17 @@ Activator.getPluginLog().logError(e); } } - IConfigurationElement[] factories = elements[i].getChildren("factory"); //$NON-NLS-N$1 + IConfigurationElement[] factories = elements[i].getChildren("factory"); //$NON-NLS-1$ for (int k = 0; k < factories.length; k++) { try { - Object factory = factories[k].createExecutableExtension("class"); //$NON-NLS-N$1 + Object factory = factories[k].createExecutableExtension("class"); //$NON-NLS-1$ if(factory instanceof ELResolverFactory) { ELResolver resolver = ((ELResolverFactory)factory).createResolver(resource); if(resolver!=null) { resolverSet.add(resolver); } } else { - Activator.getPluginLog().logError(factory.getClass().getName() + " must be instance of org.jboss.tools.common.el.core.resolver.ELResolverFactory"); + Activator.getPluginLog().logError(factory.getClass().getName() + " must be instance of org.jboss.tools.common.el.core.resolver.ELResolverFactory"); //$NON-NLS-1$ } } catch (CoreException e) { Activator.getPluginLog().logError(e); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ElVarSearcher.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -35,8 +35,8 @@ */ public class ElVarSearcher { - private final static String VAR_ATTRIBUTE_NAME = "var"; - private final static String VALUE_ATTRIBUTE_NAME = "value"; + private final static String VAR_ATTRIBUTE_NAME = "var"; //$NON-NLS-1$ + private final static String VALUE_ATTRIBUTE_NAME = "value"; //$NON-NLS-1$ private IFile file; private ELCompletionEngine engine; @@ -219,7 +219,7 @@ declLength = varNameEnd - varNameStart; } var = var.trim(); - if(!"".equals(var)) { + if(!"".equals(var)) { //$NON-NLS-1$ String value = element.getAttribute(VALUE_ATTRIBUTE_NAME); if(value!=null) { value = value.trim(); @@ -247,9 +247,9 @@ ArrayList<Var> parentVars = new ArrayList<Var>(); for (Var var : vars) { ELExpression token = var.getElToken(); - if(token!=null && !token.getText().endsWith(".")) { + if(token!=null && !token.getText().endsWith(".")) { //$NON-NLS-1$ String varName = var.getName(); - if(el.equals(varName) || el.startsWith(varName.trim()+".")) { + if(el.equals(varName) || el.startsWith(varName.trim()+".")) { //$NON-NLS-1$ if(var.getElToken()!=null && initializeNestedVars) { Var parentVar = findVarForEl(var.getElToken().getText(), parentVars, true); if(parentVar!=null) { @@ -267,7 +267,7 @@ } if(resolvedToken!=null) { String oldText = var.getElToken().getText(); - String newValue = "#{" + resolvedToken.getText() + oldText.substring(parentVar.getName().length()) + "}"; + String newValue = "#{" + resolvedToken.getText() + oldText.substring(parentVar.getName().length()) + "}"; //$NON-NLS-1$ //$NON-NLS-2$ var.value = newValue; var.elToken = var.parseEl(newValue); } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -291,7 +291,7 @@ } public boolean isJavaLangObject() { - return "java.lang.Object".equals(getDeclaringTypeQualifiedName()); + return "java.lang.Object".equals(getDeclaringTypeQualifiedName()); //$NON-NLS-1$ } public MemberInfo getParentMember() { @@ -590,11 +590,11 @@ return false; } - return (((getName().startsWith("get") && !getName().equals("get")) || getName().startsWith("is")) && getNumberOfParameters() == 0); + return (((getName().startsWith("get") && !getName().equals("get")) || getName().startsWith("is")) && getNumberOfParameters() == 0); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public boolean isSetter() { - return ((getName().startsWith("set") && !getName().equals("set")) && getNumberOfParameters() == 1); + return ((getName().startsWith("set") && !getName().equals("set")) && getNumberOfParameters() == 1); //$NON-NLS-1$ //$NON-NLS-2$ } public List<String> getAsPresentedStrings() { @@ -764,12 +764,12 @@ } boolean isDataModelObject(IType type) throws JavaModelException { - return isInstanceofType(type, "javax.faces.model.DataModel"); + return isInstanceofType(type, "javax.faces.model.DataModel"); //$NON-NLS-1$ } public static boolean isResourceBundle(IType type) { try { - return isInstanceofType(type, "java.util.ResourceBundle"); + return isInstanceofType(type, "java.util.ResourceBundle"); //$NON-NLS-1$ } catch (JavaModelException e) { return false; } @@ -782,7 +782,7 @@ } IType type = mbr.getMemberType(); if(type!=null) { - return isInstanceofType(type, "java.util.Map") || isInstanceofType(type, "java.util.Collection"); + return isInstanceofType(type, "java.util.Map") || isInstanceofType(type, "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$ } return false; } catch (JavaModelException e) { @@ -844,10 +844,10 @@ void addInfoForDataModelVariable() { fMethods.add(new MethodInfo(fType, fType.getFullyQualifiedName(), - "getRowCount", Modifier.PUBLIC, + "getRowCount", Modifier.PUBLIC, //$NON-NLS-1$ new String[0], new String[0], - "int", + "int", //$NON-NLS-1$ fTypeInfo, fTypeInfo, false)); @@ -856,19 +856,19 @@ void addInfoForDataModelObject() { fMethods.add(new MethodInfo(fType, fType.getFullyQualifiedName(), - "size", Modifier.PUBLIC, + "size", Modifier.PUBLIC, //$NON-NLS-1$ new String[0], new String[0], - "int", + "int", //$NON-NLS-1$ fTypeInfo, fTypeInfo, false)); fMethods.add(new MethodInfo(fType, fType.getFullyQualifiedName(), - "isEmpty", Modifier.PUBLIC, + "isEmpty", Modifier.PUBLIC, //$NON-NLS-1$ new String[0], new String[0], - "boolean", + "boolean", //$NON-NLS-1$ fTypeInfo, fTypeInfo, false)); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/Var.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/Var.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/Var.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -47,7 +47,7 @@ } ELExpression parseEl(String el) { - if(el.length()>3 && el.startsWith("#{") && el.endsWith("}")) { + if(el.length()>3 && el.startsWith("#{") && el.endsWith("}")) { //$NON-NLS-1$ //$NON-NLS-2$ ELParser parser = factory.createParser(); ELModel model = parser.parse(el); if(model == null || model.getSyntaxErrors().size() > 0) return null; Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELArgumentExpressionImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELArgumentExpressionImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELArgumentExpressionImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -42,7 +42,7 @@ } public String toString() { - return super.toString() + ((argument != null) ? argument.toString() : ""); + return super.toString() + ((argument != null) ? argument.toString() : ""); //$NON-NLS-1$ } public ELObjectType getType() { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELArgumentImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELArgumentImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELArgumentImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -52,7 +52,7 @@ if(child instanceof ELExpressionImpl) { setArgument((ELExpressionImpl)child); } else { - throw new IllegalArgumentException("EL argument can have only EL expression as its child."); + throw new IllegalArgumentException("EL argument can have only EL expression as its child."); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELComplexExpressionImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELComplexExpressionImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELComplexExpressionImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -57,7 +57,7 @@ if(child instanceof ELExpressionImpl) { setExpression((ELExpressionImpl)child); } else { - throw new IllegalArgumentException("EL instance can have only EL expression as child."); + throw new IllegalArgumentException("EL instance can have only EL expression as child."); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELInstanceImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELInstanceImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELInstanceImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -62,7 +62,7 @@ if(child instanceof ELExpressionImpl) { setExpression((ELExpressionImpl)child); } else { - throw new IllegalArgumentException("EL instance can have only EL expression as child."); + throw new IllegalArgumentException("EL instance can have only EL expression as child."); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELInvocationExpressionImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELInvocationExpressionImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELInvocationExpressionImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -46,7 +46,7 @@ } public String toString() { - return left != null ? left.toString() : ""; + return left != null ? left.toString() : ""; //$NON-NLS-1$ } public void collectInvocations(List<ELInvocationExpression> list) { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMethodInvocationImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMethodInvocationImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMethodInvocationImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -46,7 +46,7 @@ } public String toString() { - return super.toString() + ((parameters != null) ? parameters.toString() : ""); + return super.toString() + ((parameters != null) ? parameters.toString() : ""); //$NON-NLS-1$ } public ELObjectType getType() { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELModelImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELModelImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELModelImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -51,7 +51,7 @@ if(child instanceof ELInstanceImpl) { addInstance((ELInstanceImpl)child); } else { - throw new IllegalArgumentException("EL root can have onle ELInstances as its children."); + throw new IllegalArgumentException("EL root can have only ELInstances as its children."); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMultiExpressionImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMultiExpressionImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMultiExpressionImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -44,13 +44,13 @@ } else if(child instanceof ELOperatorImpl) { addOperator((ELOperatorImpl)child); } else { - throw new IllegalArgumentException("EL instance can have only EL expression as child."); + throw new IllegalArgumentException("EL instance can have only EL expression as child."); //$NON-NLS-1$ } } public void addExpression(ELExpressionImpl expression) { if(expressions.size() > operators.size()) { - throw new IllegalArgumentException("Expecting operator"); + throw new IllegalArgumentException("Expecting operator"); //$NON-NLS-1$ } super.addChild(expression); expressions.add(expression); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELOperatorImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELOperatorImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELOperatorImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -25,7 +25,7 @@ } public String toString() { - return getFirstToken() != null ? getFirstToken().getText() : ""; + return getFirstToken() != null ? getFirstToken().getText() : ""; //$NON-NLS-1$ } public ELObjectType getType() { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELParametersImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELParametersImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELParametersImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -56,7 +56,7 @@ if(child instanceof ELExpressionImpl) { addParameter((ELExpressionImpl)child); } else { - throw new IllegalArgumentException("EL parameters can have only EL expressions as its children."); + throw new IllegalArgumentException("EL parameters can have only EL expressions as its children."); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELPropertyInvocationImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELPropertyInvocationImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELPropertyInvocationImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -56,12 +56,12 @@ } String p = ((ELPropertyInvocationImpl)left).getQualifiedName(); if(p == null) return null; - return p + "." + name.getText(); + return p + "." + name.getText(); //$NON-NLS-1$ } public String toString() { - return super.toString() + (dot != null ? dot.getText() : "") - + (name != null ? name.getText() : ""); + return super.toString() + (dot != null ? dot.getText() : "") //$NON-NLS-1$ + + (name != null ? name.getText() : ""); //$NON-NLS-1$ } public ELObjectType getType() { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELValueExpressionImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELValueExpressionImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELValueExpressionImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -24,7 +24,7 @@ } public String toString() { - return getFirstToken() != null ? getFirstToken().getText() : ""; + return getFirstToken() != null ? getFirstToken().getText() : ""; //$NON-NLS-1$ } public ELObjectType getType() { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -52,7 +52,7 @@ public ELModelImpl parse(LexicalToken start) { if(current != null) { - throw new RuntimeException("Cannot reuse parser while it is running."); + throw new RuntimeException("Cannot reuse parser while it is running."); //$NON-NLS-1$ } try { ELModelImpl model = new ELModelImpl(); @@ -91,7 +91,7 @@ //create fake invocation expression expression = new ELPropertyInvocationImpl(); int p = current != null ? current.getStart() : instance.getEndPosition(); - LexicalToken t = new LexicalToken(p, 0, "", JavaNameTokenDescription.JAVA_NAME); + LexicalToken t = new LexicalToken(p, 0, "", JavaNameTokenDescription.JAVA_NAME); //$NON-NLS-1$ expression.setFirstToken(t); expression.setLastToken(t); } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/CallRule.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/CallRule.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/CallRule.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.internal.core.parser.rule; +import org.jboss.tools.common.el.core.Messages; import org.jboss.tools.common.el.core.parser.IRule; import org.jboss.tools.common.el.core.parser.Tokenizer; import org.jboss.tools.common.el.internal.core.parser.token.ArgEndTokenDescription; @@ -98,18 +99,18 @@ public String getProblem(int state, Tokenizer tokenizer) { if(ParamUtil.isMethodParamContext(tokenizer.getContext())) { - return "Expecting ',' or ')'"; + return Messages.CallRule_ExpectingCommaOrRParen; } else if(ParamUtil.isComplexExpressionContext(tokenizer.getContext())) { - return "Expecting ')'"; + return Messages.CallRule_ExpectingRParen; } else if(ParamUtil.isArgContext(tokenizer.getContext())) { - return "Expecting ']'"; + return Messages.CallRule_ExpectingRBracket; } if(state == STATE_EXPECTING_CALL_AFTER_METHOD) { if(ParamStartTokenDescription.INSTANCE.isStart(tokenizer, tokenizer.getCurrentIndex())) { - return "Unexpected symbol '('"; + return Messages.CallRule_UnexpectedLParen; } } - return "Expecting '}'"; + return Messages.CallRule_ExpectingRBrace; } } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/ExpressionRule.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/ExpressionRule.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/ExpressionRule.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.internal.core.parser.rule; +import org.jboss.tools.common.el.core.Messages; import org.jboss.tools.common.el.core.parser.IRule; import org.jboss.tools.common.el.core.parser.Tokenizer; import org.jboss.tools.common.el.internal.core.parser.token.ArgEndTokenDescription; @@ -127,15 +128,15 @@ public String getProblem(int state, Tokenizer tokenizer) { if(state == STATE_EXPECTING_NAME) { - return "Expecting Java method or property name"; + return Messages.ExpressionRule_ExpectingJavaName; } else { if(OperationTokenDescription.INSTANCE.isStart(tokenizer, tokenizer.getCurrentIndex())) { - return "Expression cannot start with binary operator."; + return Messages.ExpressionRule_CannotStartWithBinaryOp; } if(JavaNameTokenDescription.INSTANCEOF_INSTANCE.isStart(tokenizer, tokenizer.getCurrentIndex())) { - return "Expression cannot start with instanceof."; + return Messages.ExpressionRule_CannotStartWithInstanceof; } - return "Expecting expression"; + return Messages.ExpressionRule_ExpectingExpression; } } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/OperationRule.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/OperationRule.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/OperationRule.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.internal.core.parser.rule; +import org.jboss.tools.common.el.core.Messages; import org.jboss.tools.common.el.core.parser.IRule; import org.jboss.tools.common.el.core.parser.Tokenizer; import org.jboss.tools.common.el.internal.core.parser.token.ArgEndTokenDescription; @@ -72,13 +73,13 @@ public String getProblem(int state, Tokenizer tokenizer) { if(ParamUtil.isMethodParamContext(tokenizer.getContext())) { - return "Expecting ')'"; + return Messages.OperationRule_ExpectingRParen; } else if(ParamUtil.isComplexExpressionContext(tokenizer.getContext())) { - return "Expecting ')'"; + return Messages.OperationRule_ExpectingRParen; } else if(ParamUtil.isArgContext(tokenizer.getContext())) { - return "Expecting ']'"; + return Messages.OperationRule_ExpectingRBracket; } - return "Expecting '}'"; + return Messages.OperationRule_ExpectingRBrace; } } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ArgEndTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ArgEndTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ArgEndTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -29,7 +29,7 @@ */ public class ArgEndTokenDescription extends ConstantTokenDescription { public static final int ARG_END = 11; - public static final String CLOSE = "]"; + public static final String CLOSE = "]"; //$NON-NLS-1$ public static ArgEndTokenDescription INSTANCE = new ArgEndTokenDescription(); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ArgStartTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ArgStartTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ArgStartTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -19,7 +19,7 @@ */ public class ArgStartTokenDescription extends ConstantTokenDescription { public static final int ARG_START = 10; - public static final String OPEN = "["; + public static final String OPEN = "["; //$NON-NLS-1$ public static ArgStartTokenDescription INSTANCE = new ArgStartTokenDescription(); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/CommaTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/CommaTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/CommaTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -23,7 +23,7 @@ public static CommaTokenDescription INSTANCE = new CommaTokenDescription(); public CommaTokenDescription () { - super(",", COMMA); + super(",", COMMA); //$NON-NLS-1$ } public boolean isStart(Tokenizer tokenizer, int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/DotTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/DotTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/DotTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -21,7 +21,7 @@ public static DotTokenDescription INSTANCE = new DotTokenDescription(); public DotTokenDescription () { - super(".", DOT); + super(".", DOT); //$NON-NLS-1$ } } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/EndELTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/EndELTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/EndELTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -24,7 +24,7 @@ public static EndELTokenDescription INSTANCE = new EndELTokenDescription(); public EndELTokenDescription () { - super("}", END_EL); + super("}", END_EL); //$NON-NLS-1$ } public boolean isStart(Tokenizer tokenizer, int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ExprEndTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ExprEndTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ExprEndTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -23,7 +23,7 @@ public static ExprEndTokenDescription INSTANCE = new ExprEndTokenDescription(); public ExprEndTokenDescription () { - super(")", EXPR_END); + super(")", EXPR_END); //$NON-NLS-1$ } public boolean isStart(Tokenizer tokenizer, int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ExprStartTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ExprStartTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ExprStartTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -23,7 +23,7 @@ public static ExprStartTokenDescription INSTANCE = new ExprStartTokenDescription(); public ExprStartTokenDescription () { - super("(", EXPR_START); + super("(", EXPR_START); //$NON-NLS-1$ } public boolean read(Tokenizer tokenizer, int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/JavaNameTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/JavaNameTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/JavaNameTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.internal.core.parser.token; +import org.jboss.tools.common.el.core.Messages; import org.jboss.tools.common.el.core.parser.ITokenDescription; import org.jboss.tools.common.el.core.parser.Tokenizer; @@ -26,7 +27,7 @@ public static ConstantTokenDescription INSTANCEOF_INSTANCE = InstanceofTokenDescription.INSTANCE; public String getName() { - return "NAME"; + return Messages.JavaNameTokenDescription_Name; } public int getType() { @@ -65,11 +66,11 @@ public static InstanceofTokenDescription INSTANCE = new InstanceofTokenDescription(); private static final String[] OPS_2 = { - "instanceof" + "instanceof" //$NON-NLS-1$ }; public InstanceofTokenDescription() { - super("!", INSTANCEOF); + super("!", INSTANCEOF); //$NON-NLS-1$ } public boolean isStart(Tokenizer tokenizer, int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/OperationTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/OperationTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/OperationTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.internal.core.parser.token; +import org.jboss.tools.common.el.core.Messages; import org.jboss.tools.common.el.core.parser.ITokenDescription; import org.jboss.tools.common.el.core.parser.Tokenizer; @@ -22,18 +23,18 @@ public static final int OPERATION = 12; static String[] OPS = { - "&&", "||", "==", "!=", "<=", ">=", - "+", "-", "*", "/", "&", "%", "|", "?" , ":", "^", "<", ">", + "&&", "||", "==", "!=", "<=", ">=", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + "+", "-", "*", "/", "&", "%", "|", "?" , ":", "^", "<", ">", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ }; private static final String[] OPS_2 = { - "div", "and", "or", "not", "mod", - "eq", "ne", "lt", "gt", "ge", "le", + "div", "and", "or", "not", "mod", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + "eq", "ne", "lt", "gt", "ge", "le", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ }; public static OperationTokenDescription INSTANCE = new OperationTokenDescription(); public String getName() { - return "Operator"; + return Messages.OperationTokenDescription_Name; } public int getType() { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamEndTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamEndTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamEndTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -23,7 +23,7 @@ public static ParamEndTokenDescription INSTANCE = new ParamEndTokenDescription(); public ParamEndTokenDescription () { - super(")", PARAM_END); + super(")", PARAM_END); //$NON-NLS-1$ } public boolean isStart(Tokenizer tokenizer, int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamStartTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamStartTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamStartTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -23,7 +23,7 @@ public static ParamStartTokenDescription INSTANCE = new ParamStartTokenDescription(); public ParamStartTokenDescription () { - super("(", PARAM_START); + super("(", PARAM_START); //$NON-NLS-1$ } public boolean read(Tokenizer tokenizer, int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamUtil.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/ParamUtil.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -19,7 +19,7 @@ * */ public class ParamUtil { - static String PARAM_HISTORY = "(_level"; + static String PARAM_HISTORY = "(_level"; //$NON-NLS-1$ static class ParamHistory extends ArrayList<String>{ private static final long serialVersionUID = 1L; @@ -40,17 +40,17 @@ public static boolean isMethodParamContext(Properties context) { ParamHistory i = (ParamHistory)(context.get(PARAM_HISTORY)); - return i != null && i.size() > 0 && "params".equals(i.get(i.size() - 1)); + return i != null && i.size() > 0 && "params".equals(i.get(i.size() - 1)); //$NON-NLS-1$ } public static boolean isArgContext(Properties context) { ParamHistory i = (ParamHistory)(context.get(PARAM_HISTORY)); - return i != null && i.size() > 0 && "arg".equals(i.get(i.size() - 1)); + return i != null && i.size() > 0 && "arg".equals(i.get(i.size() - 1)); //$NON-NLS-1$ } public static boolean isComplexExpressionContext(Properties context) { - ParamHistory i = (ParamHistory)(context.get("(_level")); - return i != null && i.size() > 0 && "expr".equals(i.get(i.size() - 1)); + ParamHistory i = (ParamHistory)(context.get("(_level")); //$NON-NLS-1$ + return i != null && i.size() > 0 && "expr".equals(i.get(i.size() - 1)); //$NON-NLS-1$ } public static void closeCurrentParamContext(Properties context) { @@ -61,18 +61,18 @@ } public static void openMethodParamContext(Properties context) { - ParamHistory i = (ParamHistory)(context.get("(_level")); - i.add("params"); + ParamHistory i = (ParamHistory)(context.get("(_level")); //$NON-NLS-1$ + i.add("params"); //$NON-NLS-1$ } public static void openComplexExpressionContext(Properties context) { - ParamHistory i = (ParamHistory)(context.get("(_level")); - i.add("expr"); + ParamHistory i = (ParamHistory)(context.get("(_level")); //$NON-NLS-1$ + i.add("expr"); //$NON-NLS-1$ } public static void openArgContext(Properties context) { - ParamHistory i = (ParamHistory)(context.get("(_level")); - i.add("arg"); + ParamHistory i = (ParamHistory)(context.get("(_level")); //$NON-NLS-1$ + i.add("arg"); //$NON-NLS-1$ } Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/PrimitiveValueTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/PrimitiveValueTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/PrimitiveValueTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.internal.core.parser.token; +import org.jboss.tools.common.el.core.Messages; import org.jboss.tools.common.el.core.parser.ITokenDescription; import org.jboss.tools.common.el.core.parser.SyntaxError; import org.jboss.tools.common.el.core.parser.Tokenizer; @@ -26,10 +27,10 @@ public static PrimitiveValueTokenDescription INSTANCE = new PrimitiveValueTokenDescription(); private static final String[] OPS_2 = { - "null", "true", "false", + "null", "true", "false", //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ }; public String getName() { - return "Primitive"; + return Messages.PrimitiveValueTokenDescription_Name; } public int getType() { @@ -79,12 +80,12 @@ return true; } - static String TYPE_CHAR = "lLfFdD"; + static String TYPE_CHAR = "lLfFdD"; //$NON-NLS-1$ private boolean readNumber(Tokenizer tokenizer, int offset) { int i = offset; int dotCount = 1; int dotOffset = -1; - if(tokenizer.startsWith("0x")) { + if(tokenizer.startsWith("0x")) { //$NON-NLS-1$ i += 2; dotCount = 0; } @@ -140,7 +141,7 @@ && tokenizer.getLastToken().getType() == ArgStartTokenDescription.ARG_START && dotCount < 1) { SyntaxError error = new SyntaxError(dotOffset, BasicStates.STATE_EXPECTING_ARG); - error.setProblem("Argument must resolve to integer or string."); + error.setProblem(Messages.PrimitiveValueTokenDescription_ArgMustResolveToIntegerOrString); tokenizer.addSyntaxError(error); } tokenizer.addToken(getType(), offset, i); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/StartELTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/StartELTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/StartELTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -23,8 +23,8 @@ public static StartELTokenDescription INSTANCE = new StartELTokenDescription(); public StartELTokenDescription () { - super("#{", START_EL); - addContent("${"); + super("#{", START_EL); //$NON-NLS-1$ + addContent("${"); //$NON-NLS-1$ } public boolean read(Tokenizer tokenizer, int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/StringTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/StringTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/StringTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.internal.core.parser.token; +import org.jboss.tools.common.el.core.Messages; import org.jboss.tools.common.el.core.parser.ITokenDescription; import org.jboss.tools.common.el.core.parser.Tokenizer; @@ -24,7 +25,7 @@ public static StringTokenDescription INSTANCE = new StringTokenDescription(); public String getName() { - return "String"; + return Messages.StringTokenDescription_Name; } public int getType() { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/UnaryTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/UnaryTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/UnaryTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -23,15 +23,15 @@ public static UnaryTokenDescription INSTANCE = new UnaryTokenDescription(); private static final String[] OPS_2 = { - "not", "empty" + "not", "empty" //$NON-NLS-1$//$NON-NLS-2$ }; public UnaryTokenDescription() { - super("!", UNARY); - addContent("--"); - addContent("++"); - addContent("+"); - addContent("-"); + super("!", UNARY); //$NON-NLS-1$ + addContent("--"); //$NON-NLS-1$ + addContent("++"); //$NON-NLS-1$ + addContent("+"); //$NON-NLS-1$ + addContent("-"); //$NON-NLS-1$ } public boolean isStart(Tokenizer tokenizer, int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/WhiteSpaceTokenDescription.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/WhiteSpaceTokenDescription.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/token/WhiteSpaceTokenDescription.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.internal.core.parser.token; +import org.jboss.tools.common.el.core.Messages; import org.jboss.tools.common.el.core.parser.ITokenDescription; import org.jboss.tools.common.el.core.parser.Tokenizer; @@ -24,7 +25,7 @@ public static WhiteSpaceTokenDescription INSTANCE = new WhiteSpaceTokenDescription(); public String getName() { - return "Whitespace"; + return Messages.WhiteSpaceTokenDescription_Name; } public int getType() { Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-27 06:24:07 UTC (rev 15544) @@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning org.eclipse.jdt.core.compiler.source=1.5 Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Activator.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Activator.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Activator.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -20,7 +20,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.common.el.ui"; + public static final String PLUGIN_ID = "org.jboss.tools.common.el.ui"; //$NON-NLS-1$ // The shared instance private static Activator plugin; Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2009-05-27 06:00:55 UTC (rev 15543) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2009-05-27 06:24:07 UTC (rev 15544) @@ -33,7 +33,7 @@ */ @Override protected String createGroupLabel() { - return ""; + return ""; //$NON-NLS-1$ } /** @@ -49,7 +49,7 @@ */ @Override protected String getEntity() { - return "VPEGlobalElReference"; + return "VPEGlobalElReference"; //$NON-NLS-1$ } /** @@ -62,7 +62,7 @@ @Override protected ResourceReference getDefaultResourceReference() { - ResourceReference rf = new ResourceReference("", ResourceReference.GLOBAL_SCOPE); + ResourceReference rf = new ResourceReference("", ResourceReference.GLOBAL_SCOPE); //$NON-NLS-1$ rf.setGlobal(true); return rf; }