Author: adietish Date: 2011-07-07 08:55:25 -0400 (Thu, 07 Jul 2011) New Revision: 32702 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 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/server/internal/AbstractJBossBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java Log: [JBIDE-9215] extracted JBossBehaviorDelegate interface to its own class and renamed it to IJBossBehaviorDelegate 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-07 12:36:46 UTC (rev 32701) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2011-07-07 12:55:25 UTC (rev 32702) @@ -18,7 +18,6 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.JBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; @@ -61,7 +60,7 @@ } public boolean isComplete() throws PollingException { -// JBossBehaviourDelegate del = server.getDelegate(); +// IJBossBehaviourDelegate del = server.getDelegate(); // if( del instanceof IProcessProvider ) { // IProcess p = ((IProcessProvider)del).getProcess(); // boolean b = p == null || p.isTerminated(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-07 12:36:46 UTC (rev 32701) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-07 12:55:25 UTC (rev 32702) @@ -16,12 +16,11 @@ import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IJBoss6Server; -import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.JBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; -public abstract class AbstractJBossBehaviourDelegate implements JBossBehaviourDelegate { +public abstract class AbstractJBossBehaviourDelegate implements IJBossBehaviourDelegate { private DelegatingServerBehavior actualBehavior; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-07 12:36:46 UTC (rev 32701) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-07 12:55:25 UTC (rev 32702) @@ -43,21 +43,6 @@ */ public class DelegatingServerBehavior extends DeployableServerBehavior { - /** - * TODO: move to its own file (so that we can hide implementations and export interfaces) & rename to IJBossBehaviourDelegate - */ - public static interface JBossBehaviourDelegate { - public String getBehaviourTypeId(); - public void setActualBehaviour(DelegatingServerBehavior actualBehaviour); - public void stop(boolean force); - public void publishStart(final IProgressMonitor monitor) throws CoreException; - public void publishFinish(final IProgressMonitor monitor) throws CoreException; - public void setServerStarting(); - public void setServerStopping(); - public IStatus canChangeState(String launchMode); - public String getDefaultStopArguments() throws CoreException; - } - private static HashMap<String, Class> delegateClassMap; static { delegateClassMap = new HashMap<String, Class>(); @@ -71,9 +56,9 @@ super(); } - private JBossBehaviourDelegate delegate; + private IJBossBehaviourDelegate delegate; private String lastModeId; - public JBossBehaviourDelegate getDelegate() { + public IJBossBehaviourDelegate getDelegate() { IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(getServer()); String id = type == null ? LocalPublishMethod.LOCAL_PUBLISH_METHOD : type.getId(); if( id.equals(lastModeId) && delegate != null && delegate.getBehaviourTypeId().equals(id)) @@ -84,7 +69,7 @@ c = getDelegateMap().get(LocalPublishMethod.LOCAL_PUBLISH_METHOD); try { - JBossBehaviourDelegate o = (JBossBehaviourDelegate)c.newInstance(); + IJBossBehaviourDelegate o = (IJBossBehaviourDelegate)c.newInstance(); o.setActualBehaviour(this); lastModeId = id; delegate = o; Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-07-07 12:55:25 UTC (rev 32702) @@ -0,0 +1,37 @@ +/******************************************************************************* + * 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.server.internal; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; + +public interface IJBossBehaviourDelegate { + + public String getBehaviourTypeId(); + + public void setActualBehaviour(DelegatingServerBehavior actualBehaviour); + + public void stop(boolean force); + + public void publishStart(final IProgressMonitor monitor) throws CoreException; + + public void publishFinish(final IProgressMonitor monitor) throws CoreException; + + public void setServerStarting(); + + public void setServerStopping(); + + public IStatus canChangeState(String launchMode); + + public String getDefaultStopArguments() throws CoreException; +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java 2011-07-07 12:36:46 UTC (rev 32701) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalStopLaunchConfigurator.java 2011-07-07 12:55:25 UTC (rev 32702) @@ -18,8 +18,8 @@ import org.eclipse.jdt.launching.IRuntimeClasspathEntry; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.JBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils; @@ -48,7 +48,7 @@ @Override protected String getDefaultProgramArguments(JBossServer server, IJBossServerRuntime runtime) throws CoreException { - JBossBehaviourDelegate delegate = ServerUtil.checkedGetBehaviorDelegate(server.getServer()); + IJBossBehaviourDelegate delegate = ServerUtil.checkedGetBehaviorDelegate(server.getServer()); return delegate.getDefaultStopArguments(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-07-07 12:36:46 UTC (rev 32701) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-07-07 12:55:25 UTC (rev 32702) @@ -26,9 +26,9 @@ import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.JBossBehaviourDelegate; public class ServerUtil { public static IPath getServerStateLocation(IServer server) { @@ -57,8 +57,8 @@ return serverBehavior; } - public static JBossBehaviourDelegate checkedGetBehaviorDelegate(IServer server) throws CoreException { - JBossBehaviourDelegate delegate = checkedGetServerAdapter(server, DelegatingServerBehavior.class).getDelegate(); + public static IJBossBehaviourDelegate checkedGetBehaviorDelegate(IServer server) throws CoreException { + IJBossBehaviourDelegate delegate = checkedGetServerAdapter(server, DelegatingServerBehavior.class).getDelegate(); if (delegate == null) { throw new CoreException( new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, 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-07 12:36:46 UTC (rev 32701) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-07-07 12:55:25 UTC (rev 32702) @@ -34,8 +34,8 @@ import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.JBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration; import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration.IStartLaunchSetupParticipant; @@ -211,7 +211,7 @@ // Pull args from single utility method // stop += StopLaunchConfiguration.getDefaultArgs(jbs); - JBossBehaviourDelegate delegate = ServerUtil.checkedGetBehaviorDelegate(server); + IJBossBehaviourDelegate delegate = ServerUtil.checkedGetBehaviorDelegate(server); stop += delegate.getDefaultStopArguments(); return stop; }