Author: sflanigan Date: 2009-07-08 01:54:49 -0400 (Wed, 08 Jul 2009) New Revision: 16493 Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings (fixed mis-formatted NON-NLS comments) Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java 2009-07-08 05:49:45 UTC (rev 16492) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/IBPELModuleFacetConstants.java 2009-07-08 05:54:49 UTC (rev 16493) @@ -21,8 +21,8 @@ public final static String BPEL20_MODULE_TYPE = "bpel.module"; //$NON-NLS-1$ // module type versions - public final static String BPEL11_MODULE_VERSION = "1.1"; // $NON-NLS-1$ - public final static String BPEL20_MODULE_VERSION = "2.0"; // $NON-NLS-1$ + public final static String BPEL11_MODULE_VERSION = "1.1"; //$NON-NLS-1$ + public final static String BPEL20_MODULE_VERSION = "2.0"; //$NON-NLS-1$ // facet template public final static String BPEL20_FACET_TEMPLATE = "template.bpel.core"; //$NON-NLS-1$ Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java 2009-07-08 05:49:45 UTC (rev 16492) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/src/org/eclipse/bpel/runtimes/ui/wizards/NewBPELProjectWizard.java 2009-07-08 05:54:49 UTC (rev 16493) @@ -102,7 +102,7 @@ */ @Override protected IWizardPage createFirstPage() { - return new NewBPELProjectWizardPage1(model, "newBPELProject"); // $NON-NLS-1$ + return new NewBPELProjectWizardPage1(model, "newBPELProject"); //$NON-NLS-1$ } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2009-07-08 05:49:45 UTC (rev 16492) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2009-07-08 05:54:49 UTC (rev 16493) @@ -12,14 +12,14 @@ public class BrowserPlugin extends BaseUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.vpe.xulrunner"; // $NON-NLS-1$ + public static final String PLUGIN_ID = "org.jboss.tools.vpe.xulrunner"; //$NON-NLS-1$ public static final boolean DEBUG_BROWSERSTART; // The shared instance private static BrowserPlugin plugin; static { - DEBUG_BROWSERSTART = "true".equals(Platform.getDebugOption(PLUGIN_ID + "/debug/browser_start")); // $NON-NLS-1$ // $NON-NLS-1$ + DEBUG_BROWSERSTART = "true".equals(Platform.getDebugOption(PLUGIN_ID + "/debug/browser_start")); //$NON-NLS-1$ //$NON-NLS-2$ } /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java 2009-07-08 05:49:45 UTC (rev 16492) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java 2009-07-08 05:54:49 UTC (rev 16493) @@ -10,18 +10,18 @@ private File xulRunnerPath; private File userDataPath; - private static final String PLUGINS_DIRECTORY = "plugins"; // $NON-NLS-1$ - private static final String HISTORY_FILE = "history.dat"; // $NON-NLS-1$ - private static final String COMPREG_FILE = "compreg.dat"; // $NON-NLS-1$ - private static final String XPTI_FILE = "xpti.dat"; // $NON-NLS-1$ + private static final String PLUGINS_DIRECTORY = "plugins"; //$NON-NLS-1$ + private static final String HISTORY_FILE = "history.dat"; //$NON-NLS-1$ + private static final String COMPREG_FILE = "compreg.dat"; //$NON-NLS-1$ + private static final String XPTI_FILE = "xpti.dat"; //$NON-NLS-1$ private static final String COMPONENTS_DIRECTORY = "components"; //$NON-NLS-1$ public AppFileLocProvider(File xulRunnerPath) { this.xulRunnerPath = xulRunnerPath; - this.userDataPath = Platform.getLocation().append(".metadata/.plugins") // $NON-NLS-1$ + this.userDataPath = Platform.getLocation().append(".metadata/.plugins") //$NON-NLS-1$ .append(BrowserPlugin.PLUGIN_ID) - .append("xulrunner").toFile(); // $NON-NLS-1$ + .append("xulrunner").toFile(); //$NON-NLS-1$ } public File getFile(String prop, boolean[] persistent) { @@ -29,17 +29,17 @@ File resultFile = null; - if ("ProfD".equals(prop)) { // $NON-NLS-1$ + if ("ProfD".equals(prop)) { //$NON-NLS-1$ resultFile = userDataPath; - } else if ("UHist".equals(prop)) { // $NON-NLS-1$ + } else if ("UHist".equals(prop)) { //$NON-NLS-1$ resultFile = new File(userDataPath, HISTORY_FILE); - } else if ("ComRegF".equals(prop)) { // $NON-NLS-1$ + } else if ("ComRegF".equals(prop)) { //$NON-NLS-1$ resultFile = new File(userDataPath, COMPREG_FILE); - } else if ("XptiRegF".equals(prop)) { // $NON-NLS-1$ + } else if ("XptiRegF".equals(prop)) { //$NON-NLS-1$ resultFile = new File(userDataPath, XPTI_FILE); - } else if ("GreD".equals(prop)) { // $NON-NLS-1$ + } else if ("GreD".equals(prop)) { //$NON-NLS-1$ resultFile = xulRunnerPath; - } else if ("GreComsD".equals(prop) || "ComsD".equals(prop)) { // $NON-NLS-1$ // $NON-NLS-1$ + } else if ("GreComsD".equals(prop) || "ComsD".equals(prop)) { //$NON-NLS-1$ //$NON-NLS-2$ resultFile = new File(xulRunnerPath, COMPONENTS_DIRECTORY); } @@ -52,7 +52,7 @@ public File[] getFiles(String prop) { File[] resultFiles = null; - if("APluginsDL".equals(prop)) { // $NON-NLS-1$ + if("APluginsDL".equals(prop)) { //$NON-NLS-1$ resultFiles = new File[] {new File(xulRunnerPath, PLUGINS_DIRECTORY)}; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2009-07-08 05:49:45 UTC (rev 16492) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2009-07-08 05:54:49 UTC (rev 16493) @@ -72,9 +72,9 @@ protected static final long NS_ERROR_FAILURE = 0x80004005L; static { - XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) // $NON-NLS-1$ - .append(".").append(Platform.getWS()) // $NON-NLS-1$ - .append(".").append(Platform.getOS()) // $NON-NLS-1$ + XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) //$NON-NLS-1$ + .append(".").append(Platform.getWS()) //$NON-NLS-1$ + .append(".").append(Platform.getOS()) //$NON-NLS-1$ .append(Platform.OS_MACOSX.equals(Platform.getOS()) ? "" : (new StringBuffer(".")).append(Platform.getOSArch()).toString()) //$NON-NLS-1$ //$NON-NLS-2$ .toString(); @@ -88,7 +88,7 @@ webBrowser = (nsIWebBrowser) browser.getWebBrowser(); if (webBrowser == null) { - throw new XulRunnerException("nsIWebBrowser is not available"); // $NON-NLS-1$ + throw new XulRunnerException("nsIWebBrowser is not available"); //$NON-NLS-1$ } setBoolRootPref(PREFERENCE_DISABLEOPENDURINGLOAD, true); @@ -117,7 +117,7 @@ File file = new File(xulRunnerPath); mozilla.initialize(file); mozilla.initEmbedding(file, file, new AppFileLocProvider(file)); - System.setProperty(XULRUNNER_INITIALIZED, "true"); // $NON-NLS-1$ + System.setProperty(XULRUNNER_INITIALIZED, "true"); //$NON-NLS-1$ } } @@ -234,7 +234,7 @@ URL url1 = FileLocator.resolve(url); xulRunnerFile = new File(FileLocator.toFileURL(url1).getFile()); } catch (IOException ioe) { - throw new XulRunnerException("Cannot get path to XULRunner from bundle " + getXulRunnerBundle(), ioe); // $NON-NLS-1$ + throw new XulRunnerException("Cannot get path to XULRunner from bundle " + getXulRunnerBundle(), ioe); //$NON-NLS-1$ } xulRunnerPath = xulRunnerFile.getAbsolutePath();