Author: adietish Date: 2011-06-28 03:38:09 -0400 (Tue, 28 Jun 2011) New Revision: 32388 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java Log: [JBIDE-9054] added generic jboss server conversion util method (there are tons of specific ones, need to clean them up at some point) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-28 07:27:04 UTC (rev 32387) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-28 07:38:09 UTC (rev 32388) @@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.debug.core.DebugEvent; @@ -38,6 +37,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class JBoss7ServerBehavior extends JBossServerBehavior { @@ -63,10 +63,6 @@ protected HashMap<String, Class> getDelegateMap() { return delegateClassMap; } - - private JBoss7Server getJBoss7Server() { - return (JBoss7Server)getServer().loadAdapter(JBoss7Server.class, new NullProgressMonitor()); - } public boolean shouldSuspendScanner() { return false; @@ -161,10 +157,13 @@ serverProcess.terminate(); } else { serverStopping(); + String host = getServer().getHost(); + JBoss7Server server = ServerConverter.checkedLoadAdapter(getServer(), JBoss7Server.class); + int mgmtPort = server.getManagementPort(); // TODO: for now only local, implement for remote afterwards - if (isServerRunning(getServer().getHost(), getJBoss7Server().getManagementPort())) { + if (isServerRunning(host, mgmtPort)) { // The service and Poller will make sure the server is down - getService().stop(getServer().getHost(), getJBoss7Server().getManagementPort()); + getService().stop(host, mgmtPort); return; } else { if( serverProcess != null && !serverProcess.isTerminated()) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-28 07:27:04 UTC (rev 32387) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-28 07:38:09 UTC (rev 32388) @@ -46,6 +46,21 @@ return getJBossServer(s); } + @SuppressWarnings("unchecked") + public static <SERVER> SERVER checkedLoadAdapter(IServer server, Class<SERVER> serverClass) throws CoreException { + if (server == null) { + return null; + } + SERVER adaptedServer = (SERVER) server.loadAdapter(serverClass, new NullProgressMonitor()); + if (adaptedServer == null) { + throw new CoreException( + new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + NLS.bind(Messages.CannotSetUpImproperServer, server.getName()))); + + } + return adaptedServer; + } + public static JBossServer getJBossServer(IServer server) { if (server == null) { return null;