[jbosstools-commits] JBoss Tools SVN: r24206 - trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Aug 17 04:13:59 EDT 2010
Author: rob.stryker at jboss.com
Date: 2010-08-17 04:13:59 -0400 (Tue, 17 Aug 2010)
New Revision: 24206
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java
Log:
JBIDE-6841 - compile error due to merge
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java 2010-08-17 07:46:55 UTC (rev 24205)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java 2010-08-17 08:13:59 UTC (rev 24206)
@@ -32,6 +32,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.IStreamListener;
+import org.eclipse.debug.core.model.IProcess;
import org.eclipse.debug.core.model.IStreamMonitor;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.JavaRuntime;
@@ -49,22 +50,23 @@
import org.eclipse.wst.server.core.IRuntimeType;
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServer.IOperationListener;
import org.eclipse.wst.server.core.IServerListener;
import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerEvent;
import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.IServer.IOperationListener;
import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy;
import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior.JBossBehaviourDelegate;
+import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
-import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.test.util.TestProjectProvider;
@SuppressWarnings("restriction")
public abstract class AbstractJBossWSCommandTest extends TestCase {
@@ -412,9 +414,13 @@
JBossServerBehavior behavior = (JBossServerBehavior) currentServer
.loadAdapter(JBossServerBehavior.class, null);
if (behavior != null) {
- if (behavior.getProcess() != null) {
- return behavior.getProcess().getStreamsProxy()
- .getOutputStreamMonitor();
+ JBossBehaviourDelegate del = behavior.getDelegate();
+ if( del instanceof LocalJBossBehaviorDelegate ) {
+ IProcess p = ((LocalJBossBehaviorDelegate)del).getProcess();
+ if (p != null) {
+ return p.getStreamsProxy()
+ .getOutputStreamMonitor();
+ }
}
}
return null;
More information about the jbosstools-commits
mailing list