[jbosstools-commits] JBoss Tools SVN: r31371 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 2 other directories.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2011-05-19 07:37:22 -0400 (Thu, 19 May 2011)
New Revision: 31371

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/server/internal/LocalJBossBehaviorDelegate.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
Log:
JBIDE-8960

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	2011-05-19 10:39:49 UTC (rev 31370)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties	2011-05-19 11:37:22 UTC (rev 31371)
@@ -17,7 +17,7 @@
 PollingShuttingDown=Server shutting down
 PollerFailure=Failure in Poll Thread
 PollerAborted=Poll Thread Aborted: {0}
-ServerPollerThreadName=Server Poller
+ServerPollerThreadName={0} - Server Poller
 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/server/internal/LocalJBossBehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java	2011-05-19 10:39:49 UTC (rev 31370)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java	2011-05-19 11:37:22 UTC (rev 31371)
@@ -166,7 +166,7 @@
 			pollThread.cancel();
 		}
 		IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer());
-		this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, poller, getActualBehavior());
+		this.pollThread = new PollThread(expectedState, poller, getActualBehavior());
 		pollThread.start();
 	}
 	

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java	2011-05-19 10:39:49 UTC (rev 31370)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java	2011-05-19 11:37:22 UTC (rev 31371)
@@ -54,8 +54,8 @@
 	private JBossServerBehavior behavior;
 	private String pollerId;
 
-	public PollThread(String name, boolean expectedState, IServerStatePoller poller, JBossServerBehavior behavior) {
-		super(name);
+	public PollThread(boolean expectedState, IServerStatePoller poller, JBossServerBehavior behavior) {
+		super(getThreadName(behavior));
 		this.expectedState = expectedState;
 		this.abort = false;
 		this.abortMessage = null;
@@ -63,6 +63,10 @@
 		this.poller = poller;
 	}
 
+	private static String getThreadName(JBossServerBehavior behavior) {
+		return NLS.bind(Messages.ServerPollerThreadName, behavior.getServer().getName());
+	}
+	
 	public void cancel() {
 		cancel(null);
 	}

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java	2011-05-19 10:39:49 UTC (rev 31370)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java	2011-05-19 11:37:22 UTC (rev 31371)
@@ -88,7 +88,7 @@
 			pollThread.cancel();
 		}
 		IServerStatePoller poller = PollThreadUtils.getPoller(JBoss7ManagerServicePoller.POLLER_ID, expectedState, getServer());
-		this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, poller, this);
+		this.pollThread = new PollThread(expectedState, poller, this);
 		pollThread.start();
 	}
 

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java	2011-05-19 10:39:49 UTC (rev 31370)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java	2011-05-19 11:37:22 UTC (rev 31371)
@@ -12,7 +12,6 @@
  ******************************************************************************/ 
 package org.jboss.ide.eclipse.as.rse.core;
 
-import org.jboss.ide.eclipse.as.core.Messages;
 import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
 import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossBehaviourDelegate;
 import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
@@ -47,7 +46,7 @@
 			pollThread.cancel();
 		}
 		IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer());
-		this.pollThread = new PollThread(Messages.ServerPollerThreadName, expectedState, poller, getActualBehavior());
+		this.pollThread = new PollThread( expectedState, poller, getActualBehavior());
 		pollThread.start();
 	}