[jbosstools-commits] JBoss Tools SVN: r32251 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.

Author: adietish Date: 2011-06-21 08:26:01 -0400 (Tue, 21 Jun 2011) New Revision: 32251 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java Log: [JBIDE-9215] extracted checked get for jboss server to ServerConverter Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-21 12:11:17 UTC (rev 32250) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-21 12:26:01 UTC (rev 32251) @@ -69,12 +69,7 @@ public void setupLaunchConfiguration( ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException { - JBossServer jbs = ServerConverter.findJBossServer(server.getId()); - if (jbs == null) { - throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, - NLS.bind(Messages.CannotSetUpImproperServer, server.getName()))); - } - + JBossServer jbs = ServerConverter.checkedGetJBossServer(server); if (!workingCopy.getAttributes().containsKey(DEFAULTS_SET)) { forceDefaultsSet(workingCopy, jbs); } @@ -104,9 +99,9 @@ throws CoreException { String serverHome = ServerUtil.getServerHome(jbs); IJBossServerRuntime runtime = RuntimeUtils.getJBossServerRuntime(jbs.getServer()); - + updateVMPath(runtime, wc); - wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, + wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + IJBossRuntimeResourceConstants.BIN); updateArguments(wc, jbs, runtime); updateVMArgs(wc, runtime); @@ -210,7 +205,6 @@ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, NLS.bind(Messages.ServerRuntimeNotFound, jbs.getServer().getName()))); - updateVMPath(jbrt, wc); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getDefaultArgs(jbs)); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, jbrt.getDefaultRunVMArgs()); @@ -234,7 +228,7 @@ return jbrt; } - + private List<String> getClasspath(JBossServer jbs) throws CoreException { IJBossServerRuntime jbrt = RuntimeUtils.getJBossServerRuntime(jbs.getServer()); ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>(); @@ -289,7 +283,7 @@ } catch (CoreException ce) { // ignore } - + try { return super.computeUnresolvedClasspath(config); } catch (CoreException ce) { @@ -314,15 +308,16 @@ JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); if (!jbsBehavior.canStart(mode).isOK()) throw new CoreException(jbsBehavior.canStart(mode)); - String ignore = jbsBehavior.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null); + String ignore = jbsBehavior.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, + (String) null); Boolean ignoreB = ignore == null ? new Boolean(false) : new Boolean(ignore); - if( ignoreB.booleanValue()) { + if (ignoreB.booleanValue()) { jbsBehavior.setServerStarting(); jbsBehavior.setServerStarted(); return false; } boolean started = WebPortPoller.onePing(jbsBehavior.getServer()); - if( started ) { + if (started) { jbsBehavior.setServerStarting(); jbsBehavior.setServerStarted(); return false; 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-21 12:11:17 UTC (rev 32250) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-21 12:26:01 UTC (rev 32251) @@ -7,17 +7,22 @@ * * Contributors: * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.ide.eclipse.as.core.util; import java.util.ArrayList; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerAttributes; import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.ServerCore; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; @@ -25,7 +30,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerBehavior; /** - * + * * @author rob.stryker(a)jboss.com * @author adietish(a)redhat.com */ @@ -42,49 +47,63 @@ } public static JBossServer getJBossServer(IServer server) { - JBossServer jbServer = (JBossServer)server.getAdapter(JBossServer.class); + JBossServer jbServer = (JBossServer) server.getAdapter(JBossServer.class); if (jbServer == null) { jbServer = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor()); } return jbServer; } + + public static JBossServer checkedGetJBossServer(IServer server) throws CoreException { + JBossServer jBossServer = getJBossServer(server); + if (jBossServer == null) { + throw new CoreException( + new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + NLS.bind(Messages.CannotSetUpImproperServer, server.getName()))); + } + return jBossServer; + } + public static JBossServer getJBossServer(IServerWorkingCopy server) { - JBossServer jbServer = (JBossServer)server.getAdapter(JBossServer.class); + JBossServer jbServer = (JBossServer) server.getAdapter(JBossServer.class); if (jbServer == null) { jbServer = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor()); } return jbServer; } - + public static IDeployableServer getDeployableServer(IServer server) { - IDeployableServer dep = (IDeployableServer)server.getAdapter(IDeployableServer.class); + IDeployableServer dep = (IDeployableServer) server.getAdapter(IDeployableServer.class); if (dep == null) { dep = (IDeployableServer) server.loadAdapter(IDeployableServer.class, new NullProgressMonitor()); } return dep; } - + public static DeployableServerBehavior getDeployableServerBehavior(IServer server) { - if( server == null ) return null; - return (DeployableServerBehavior)server.loadAdapter( + if (server == null) + return null; + return (DeployableServerBehavior) server.loadAdapter( DeployableServerBehavior.class, new NullProgressMonitor()); } public static JBoss7ServerBehavior getJBoss7ServerBehavior(IServer server) { - if( server == null ) return null; - return (JBoss7ServerBehavior)server.loadAdapter( + if (server == null) + return null; + return (JBoss7ServerBehavior) server.loadAdapter( JBoss7ServerBehavior.class, new NullProgressMonitor()); } /** * Return all JBossServer instances from the ServerCore + * * @return */ public static JBossServer[] getAllJBossServers() { ArrayList<JBossServer> servers = new ArrayList<JBossServer>(); IServer[] iservers = ServerCore.getServers(); - for( int i = 0; i < iservers.length; i++ ) { - if( getJBossServer(iservers[i]) != null ) { + for (int i = 0; i < iservers.length; i++) { + if (getJBossServer(iservers[i]) != null) { servers.add(getJBossServer(iservers[i])); } } @@ -92,12 +111,12 @@ servers.toArray(ret); return ret; } - + public static IServer[] getJBossServersAsIServers() { ArrayList<IServer> servers = new ArrayList<IServer>(); IServer[] iservers = ServerCore.getServers(); - for( int i = 0; i < iservers.length; i++ ) { - if( getJBossServer(iservers[i]) != null ) { + for (int i = 0; i < iservers.length; i++) { + if (getJBossServer(iservers[i]) != null) { servers.add(iservers[i]); } } @@ -109,8 +128,8 @@ public static IDeployableServer[] getAllDeployableServers() { ArrayList<IDeployableServer> servers = new ArrayList<IDeployableServer>(); IServer[] iservers = ServerCore.getServers(); - for( int i = 0; i < iservers.length; i++ ) { - if( getDeployableServer(iservers[i]) != null ) { + for (int i = 0; i < iservers.length; i++) { + if (getDeployableServer(iservers[i]) != null) { servers.add(getDeployableServer(iservers[i])); } } @@ -118,11 +137,12 @@ servers.toArray(ret); return ret; } + public static IServer[] getDeployableServersAsIServers() { ArrayList<IServer> servers = new ArrayList<IServer>(); IServer[] iservers = ServerCore.getServers(); - for( int i = 0; i < iservers.length; i++ ) { - if( getDeployableServer(iservers[i]) != null ) { + for (int i = 0; i < iservers.length; i++) { + if (getDeployableServer(iservers[i]) != null) { servers.add(iservers[i]); } } @@ -130,12 +150,12 @@ servers.toArray(ret); return ret; } - + @Deprecated public static IJBossServerRuntime getJBossRuntime(IServer server) throws CoreException { return RuntimeUtils.getJBossServerRuntime(server); } - + @Deprecated public static IJBossServerRuntime getJBossRuntime(IServerAttributes server) { return RuntimeUtils.checkedGetJBossServerRuntime(server);