Author: adietish Date: 2011-07-15 11:20:55 -0400 (Fri, 15 Jul 2011) New Revision: 32946 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 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/server/IServerStatePoller.java 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/JBoss7ManagerServicePoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java Log: [JBIDE-9054] deprecated IServerStatePoller#beginPolling(), added variant without PollThread (which is not needed and is a bad design with reciproque references Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-07-15 15:12:38 UTC (rev 32945) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-07-15 15:20:55 UTC (rev 32946) @@ -33,8 +33,12 @@ private ServerStatePollerType type; private IServer server; - public void beginPolling(IServer server, boolean expectedState, - PollThread pt) { + + @Deprecated + public void beginPolling(IServer server, boolean expectedState, PollThread pollThread) { + } + + public void beginPolling(IServer server, boolean expectedState) { this.server = server; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 2011-07-15 15:12:38 UTC (rev 32945) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/TimeoutPoller.java 2011-07-15 15:20:55 UTC (rev 32946) @@ -32,8 +32,11 @@ private IServer server; private ServerStatePollerType type; + @Deprecated + public void beginPolling(IServer server, boolean expectedState, PollThread pollThread) { + } - public void beginPolling(IServer server, boolean expectedState, PollThread pt) { + public void beginPolling(IServer server, boolean expectedState) { this.expectedState = expectedState; this.server = server; this.endTime = new Date().getTime() + getTimeout(); 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 2011-07-15 15:12:38 UTC (rev 32945) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-07-15 15:20:55 UTC (rev 32946) @@ -9,15 +9,13 @@ import java.util.Properties; import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.PollingException; -import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.RequiresInfoException; -import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2; +import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; import org.jboss.ide.eclipse.as.core.util.ServerConverter; -public class WebPortPoller implements IServerStatePoller2 { +public class WebPortPoller implements IServerStatePoller { public static final String WEB_POLLER_ID = "org.jboss.ide.eclipse.as.core.runtime.server.WebPoller"; //$NON-NLS-1$ private IServer server; @@ -26,8 +24,11 @@ private boolean state; private boolean expectedState; - public void beginPolling(IServer server, boolean expectedState, - PollThread pt) { + @Deprecated + public void beginPolling(IServer server, boolean expectedState, PollThread pollTread) throws Exception { + } + + public void beginPolling(IServer server, boolean expectedState) { this.server = server; this.canceled = done = false; this.expectedState = expectedState; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-07-15 15:12:38 UTC (rev 32945) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-07-15 15:20:55 UTC (rev 32946) @@ -55,7 +55,9 @@ /* * expected to launch own thread */ + @Deprecated public void beginPolling(IServer server, boolean expectedState, PollThread pt) throws Exception; + public void beginPolling(IServer server, boolean expectedState) throws Exception; public IServer getServer(); public boolean isComplete() throws PollingException, RequiresInfoException; public boolean getState() throws PollingException, RequiresInfoException; 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-07-15 15:12:38 UTC (rev 32945) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-15 15:20:55 UTC (rev 32946) @@ -64,6 +64,7 @@ return LocalPublishMethod.LOCAL_PUBLISH_METHOD; } + @Override public void stop(boolean force) { int state = getServer().getServerState(); if (force 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-07-15 15:12:38 UTC (rev 32945) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-07-15 15:20:55 UTC (rev 32946) @@ -99,7 +99,7 @@ long startTime = new Date().getTime(); boolean done = false; try { - poller.beginPolling(getServer(), expectedState, this); + poller.beginPolling(getServer(), expectedState); // begin the loop; ask the poller every so often while (!stateStartedOrStopped && !abort && !done Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-15 15:12:38 UTC (rev 32945) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-15 15:20:55 UTC (rev 32946) @@ -34,7 +34,11 @@ private boolean expectedState; private IJBoss7ManagerService service; + @Deprecated public void beginPolling(IServer server, boolean expectedState, PollThread pollTread) throws Exception { + } + + public void beginPolling(IServer server, boolean expectedState) throws Exception { this.service = JBoss7ManagerUtil.getService(server); this.server = server; this.expectedState = expectedState; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-07-15 15:12:38 UTC (rev 32945) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-07-15 15:20:55 UTC (rev 32946) @@ -69,6 +69,13 @@ private JMXPollerRunnable runnable; private JMXSafeRunner runner; + public void beginPolling(IServer server, boolean expectedState) throws Exception { + ceFound = nnfeFound = startingFound = canceled = done = false; + this.server = server; + launchJMXPoller(); + } + + @Deprecated public void beginPolling(IServer server, boolean expectedState, PollThread pt) { ceFound = nnfeFound = startingFound = canceled = done = false;