rendered paste body### Eclipse Workspace Patch 1.0
#P org.jboss.ide.eclipse.as.core
Index: jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
===================================================================
--- jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java (revision 31365)
+++ jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java (working copy)
@@ -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();
}
Index: jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java (revision 31365)
+++ jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java (working copy)
@@ -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();
}
Index: jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
--- jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties (revision 31365)
+++ jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties (working copy)
@@ -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}
Index: jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
===================================================================
--- jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java (revision 31365)
+++ jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java (working copy)
@@ -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);
}
#P org.jboss.ide.eclipse.as.rse.core
Index: src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
===================================================================
--- src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java (revision 31365)
+++ src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java (working copy)
@@ -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();
}