[jbosstools-commits] JBoss Tools SVN: r39214 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-03-01 01:00:32 -0500 (Thu, 01 Mar 2012)
New Revision: 39214

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
Log:
JBIDE-11061 - typos for astools, and string externalization

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java	2012-03-01 02:16:54 UTC (rev 39213)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java	2012-03-01 06:00:32 UTC (rev 39214)
@@ -72,6 +72,9 @@
 	public static String PollerFailure;
 	public static String PollerAborted;
 	public static String ServerPollerThreadName;
+	public static String WebPollerServerFound;
+	public static String WebPollerServerNotFound;
+	
 	public static String ServerTypeDiscovererFail;
 	public static String TerminateTwiddleFailed;
 	public static String CannotSetUpImproperServer;

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties	2012-03-01 02:16:54 UTC (rev 39213)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties	2012-03-01 06:00:32 UTC (rev 39214)
@@ -20,6 +20,11 @@
 PollerFailure=Failure in Poll Thread
 PollerAborted=Poll Thread Aborted: {0}
 ServerPollerThreadName={0} - Server Poller
+
+WebPollerServerFound=Web Poller found a running server at url {0}
+WebPollerServerNotFound=Web Poller did not find a running server at url {0}
+
+
 runModeNotSupported=Selected VM does not support this mode
 loadXMLDocumentFailed=Could not load document: {0}
 saveXMLDocumentFailed=Could not save document: {0}

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java	2012-03-01 02:16:54 UTC (rev 39213)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java	2012-03-01 06:00:32 UTC (rev 39214)
@@ -22,8 +22,10 @@
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.wst.server.core.IServer;
 import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.Messages;
 import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
 import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
 import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
@@ -147,13 +149,14 @@
 	public IStatus getCurrentStateSynchronous(IServer server) {
 		String url = getURL(server);
 		boolean b = onePing(url);
+		Status s;
 		if( b ) {
-			Status s = new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID, 
-					"Web Poller find a running server at url " + url); //$NON-NLS-1$
-			return s;
+			s = new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID, 
+					NLS.bind(Messages.WebPollerServerFound, url));
+		} else {
+			s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID, 
+				NLS.bind(Messages.WebPollerServerNotFound, url));
 		}
-		Status s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID, 
-				"Web Poller did not find a running server at url " + url); //$NON-NLS-1$
 		return s;
 	}
 }

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties	2012-03-01 02:16:54 UTC (rev 39213)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties	2012-03-01 06:00:32 UTC (rev 39214)
@@ -239,7 +239,7 @@
 ServerAlreadyStartedDialog_Message=An application server may already be running on host {0}.
 ServerAlreadyStartedDialog_Title=Server already running on {0}
 ServerAlreadyStartedDialog_Desc=Launching an additional server when one is already running may \nmake some parts of the tools not function properly. \n\n{0}\n\n    Would you like to\: 
-ServerAlreadyStartedDialog_Connect=Set the server adapter to 'started', but do not launch
+ServerAlreadyStartedDialog_Connect=Set the server adapter to 'started', without launching a new server.
 ServerAlreadyStartedDialog_Launch=Launch a new instance anyway
 
 ServerJavaArgsSyncText=Always update arguments related to the runtime.