Author: adietish Date: 2011-06-21 08:35:30 -0400 (Tue, 21 Jun 2011) New Revision: 32252 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 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/StopLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java 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.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java Log: [JBIDE-9200] moved static methods to util classes and changed static method to be instance methods where they should not offer functionality to the instance, only (no accessibility from outside the object is needed) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2011-06-21 12:26:01 UTC (rev 32251) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2011-06-21 12:35:30 UTC (rev 32252) @@ -145,7 +145,7 @@ @Deprecated public static IJBossServerRuntime findJBossServerRuntime(IServer server) throws CoreException { - return RuntimeUtils.getJBossServerRuntime(server); + return RuntimeUtils.checkedGetJBossServerRuntime(server); } @Deprecated 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:26:01 UTC (rev 32251) +++ 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:35:30 UTC (rev 32252) @@ -98,7 +98,7 @@ protected void updateMandatedFields(ILaunchConfigurationWorkingCopy wc, JBossServer jbs) throws CoreException { String serverHome = ServerUtil.getServerHome(jbs); - IJBossServerRuntime runtime = RuntimeUtils.getJBossServerRuntime(jbs.getServer()); + IJBossServerRuntime runtime = RuntimeUtils.checkedGetJBossServerRuntime(jbs.getServer()); updateVMPath(runtime, wc); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, @@ -196,11 +196,7 @@ protected void forceDefaultsSet(ILaunchConfigurationWorkingCopy wc, JBossServer jbs) throws CoreException { String serverHome = ServerUtil.getServerHome(jbs); - if (serverHome == null) - throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, - NLS.bind(Messages.CannotLocateServerHome, jbs.getServer().getName()))); - - IJBossServerRuntime jbrt = getJBossServerRuntime(jbs); + IJBossServerRuntime jbrt = RuntimeUtils.checkedGetJBossServerRuntime(jbs.getServer()); if (jbrt == null) throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, NLS.bind(Messages.ServerRuntimeNotFound, jbs.getServer().getName()))); @@ -219,18 +215,8 @@ wc.setAttribute(DEFAULTS_SET, true); } - private IJBossServerRuntime getJBossServerRuntime(JBossServer jbs) throws CoreException { - IRuntime rt = jbs.getServer().getRuntime(); - IJBossServerRuntime jbrt = null; - if (rt != null) { - jbrt = (IJBossServerRuntime) rt.getAdapter(IJBossServerRuntime.class); - } - - return jbrt; - } - private List<String> getClasspath(JBossServer jbs) throws CoreException { - IJBossServerRuntime jbrt = RuntimeUtils.getJBossServerRuntime(jbs.getServer()); + IJBossServerRuntime jbrt = RuntimeUtils.checkedGetJBossServerRuntime(jbs.getServer()); ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>(); classpath.add(LaunchConfigUtils.getRunJarRuntimeCPEntry(jbs.getServer())); LaunchConfigUtils.addJREEntry(jbrt.getVM(), classpath); @@ -244,7 +230,7 @@ } protected String getDefaultArgs(JBossServer jbs) throws CoreException { - IJBossServerRuntime rt = RuntimeUtils.getJBossServerRuntime(jbs.getServer()); + IJBossServerRuntime rt = RuntimeUtils.checkedGetJBossServerRuntime(jbs.getServer()); if (rt != null) { return rt.getDefaultRunArgs() + IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT + Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-06-21 12:26:01 UTC (rev 32251) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2011-06-21 12:35:30 UTC (rev 32252) @@ -80,7 +80,7 @@ public static ILaunchConfigurationWorkingCopy createLaunchConfiguration(IServer server) throws CoreException { JBossServer jbs = ServerConverter.findJBossServer(server.getId()); - IJBossServerRuntime jbrt = RuntimeUtils.getJBossServerRuntime(server); + IJBossServerRuntime jbrt = RuntimeUtils.checkedGetJBossServerRuntime(server); IPath serverHome = ServerUtil.getServerHomePath(jbs); ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2011-06-21 12:26:01 UTC (rev 32251) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2011-06-21 12:35:30 UTC (rev 32252) @@ -62,7 +62,7 @@ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, NLS.bind(Messages.ServerNotFound, server.getName()))); } - IJBossServerRuntime jbrt = RuntimeUtils.getJBossServerRuntime(server); + IJBossServerRuntime jbrt = RuntimeUtils.checkedGetJBossServerRuntime(server); String serverHome = ServerUtil.getServerHome(jbs); ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java 2011-06-21 12:26:01 UTC (rev 32251) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java 2011-06-21 12:35:30 UTC (rev 32252) @@ -40,7 +40,7 @@ public void apply(IServer server) throws CoreException { if (!areDefaultsSet()) { IRuntime runtime = server.getRuntime(); - IJBossServerRuntime jbossRuntime = RuntimeUtils.getJBossServerRuntime(server); + IJBossServerRuntime jbossRuntime = RuntimeUtils.checkedGetJBossServerRuntime(server); setVmContainer(jbossRuntime) .setClassPath(server, jbossRuntime) .setDefaultArguments(jbossRuntime) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java 2011-06-21 12:26:01 UTC (rev 32251) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java 2011-06-21 12:35:30 UTC (rev 32252) @@ -20,7 +20,7 @@ public class RuntimeUtils { - public static IJBossServerRuntime checkedGetJBossServerRuntime(IServerAttributes server) { + public static IJBossServerRuntime getJBossServerRuntime(IServerAttributes server) { IRuntime rt = server.getRuntime(); IJBossServerRuntime jbrt = null; if (rt != null) @@ -28,8 +28,8 @@ return jbrt; } - public static IJBossServerRuntime getJBossServerRuntime(IServerAttributes server) throws CoreException { - IJBossServerRuntime jbrt = checkedGetJBossServerRuntime(server); + public static IJBossServerRuntime checkedGetJBossServerRuntime(IServerAttributes server) throws CoreException { + IJBossServerRuntime jbrt = getJBossServerRuntime(server); if (jbrt == null) throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, NLS.bind(Messages.ServerRuntimeNotFound, server.getName()))); 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:26:01 UTC (rev 32251) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-21 12:35:30 UTC (rev 32252) @@ -153,11 +153,11 @@ @Deprecated public static IJBossServerRuntime getJBossRuntime(IServer server) throws CoreException { - return RuntimeUtils.getJBossServerRuntime(server); + return RuntimeUtils.checkedGetJBossServerRuntime(server); } @Deprecated public static IJBossServerRuntime getJBossRuntime(IServerAttributes server) { - return RuntimeUtils.checkedGetJBossServerRuntime(server); + return RuntimeUtils.getJBossServerRuntime(server); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-06-21 12:26:01 UTC (rev 32251) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-06-21 12:35:30 UTC (rev 32252) @@ -50,7 +50,7 @@ } public static String getRSEConfigName(IServerAttributes server) { - IJBossServerRuntime runtime = RuntimeUtils.checkedGetJBossServerRuntime(server); + IJBossServerRuntime runtime = RuntimeUtils.getJBossServerRuntime(server); return server.getAttribute(RSEUtils.RSE_SERVER_CONFIG, runtime.getJBossConfiguration()); }