Author: adietish Date: 2011-07-08 03:59:57 -0400 (Fri, 08 Jul 2011) New Revision: 32743 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ThreadUtils.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java Log: [JBIDE-9215] moved RSEHostShellModel#dealy to ThreadUtils#sleepFor Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ThreadUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ThreadUtils.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ThreadUtils.java 2011-07-08 07:59:57 UTC (rev 32743) @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.core.util; + +/** + * @Rob Stryker + * @author André Dietisheim + */ +public class ThreadUtils { + + /** + * Sleeps the current thread for the given amount of milliseconds. InterruptedException are swallowed. + * + * @param delay + */ + public static void sleepFor(int delay /* in ms */) { + int x = 0; + while( x < delay) { + x+=200; + try { + Thread.sleep(200); + } catch(InterruptedException ie) { + } + } + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ThreadUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java 2011-07-08 07:26:35 UTC (rev 32742) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEHostShellModel.java 2011-07-08 07:59:57 UTC (rev 32743) @@ -33,6 +33,7 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; +import org.jboss.ide.eclipse.as.core.util.ThreadUtils; import org.jboss.ide.eclipse.as.rse.core.xpl.ConnectAllSubsystemsUtil; public class RSEHostShellModel { @@ -152,7 +153,7 @@ int delay, boolean exit) throws CoreException { executeRemoteCommand(initialWorkingDirectory, command, environment, monitor); - delay(delay); + ThreadUtils.sleepFor(delay); if( exit ) { singleUseShell.exit(); singleUseShell = null; @@ -161,6 +162,10 @@ } + /** + * @deprecated moved to {@link ThreadUtils#sleepFor(int)} + */ + @Deprecated public static void delay(int delay /* in ms */) { int x = 0; while( x < delay) { @@ -171,7 +176,7 @@ } } } - + public static IShellService findShellService(DelegatingServerBehavior behaviour) throws CoreException { return findShellService(behaviour.getServer()); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2011-07-08 07:26:35 UTC (rev 32742) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2011-07-08 07:59:57 UTC (rev 32743) @@ -41,6 +41,7 @@ import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.ServerUtil; +import org.jboss.ide.eclipse.as.core.util.ThreadUtils; import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel; public class RSEJBossStartLaunchDelegate extends AbstractRSELaunchDelegate { @@ -61,7 +62,7 @@ private void launchPingThread(DeployableServerBehavior beh) { // TODO do it properly here - RSEHostShellModel.delay(30000); + ThreadUtils.sleepFor(30000); beh.setServerStarted(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-08 07:26:35 UTC (rev 32742) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-08 07:59:57 UTC (rev 32743) @@ -41,6 +41,7 @@ import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.ServerUtil; +import org.jboss.ide.eclipse.as.core.util.ThreadUtils; import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel; /** @@ -65,7 +66,7 @@ private void launchPingThread(DeployableServerBehavior beh) { // TODO do it properly here - RSEHostShellModel.delay(30000); + ThreadUtils.sleepFor(30000); beh.setServerStarted(); }