Author: adietish Date: 2011-06-20 10:22:39 -0400 (Mon, 20 Jun 2011) New Revision: 32214 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 Log: [JBIDE-9200] split large methods into smaller ones 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-20 13:50:58 UTC (rev 32213) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2011-06-20 14:22:39 UTC (rev 32214) @@ -149,7 +149,7 @@ } @Deprecated - public static void addCPEntry(ArrayList<IRuntimeClasspathEntry> list, JBossServer jbs, String relative) { + public static void addCPEntry(ArrayList<IRuntimeClasspathEntry> list, JBossServer jbs, String relative) throws CoreException { String serverHome = org.jboss.ide.eclipse.as.core.util.ServerUtil.getServerHome(jbs); LaunchConfigUtils.addCPEntry(serverHome, relative, list); } @@ -181,7 +181,7 @@ } @Deprecated - public static String getServerHome(JBossServer jbs) { + public static String getServerHome(JBossServer jbs) throws CoreException { return ServerUtil.getServerHome(jbs); } 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-20 13:50:58 UTC (rev 32213) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-20 14:22:39 UTC (rev 32214) @@ -103,15 +103,8 @@ protected void updateMandatedFields(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()))); - ensureJBossRuntimeIsSet(jbs); - - /* Args and vm args */ - IJBossServerRuntime runtime = (IJBossServerRuntime) - jbs.getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null); - + IJBossServerRuntime runtime = RuntimeUtils.getJBossServerRuntime(jbs.getServer()); + updateVMPath(runtime, wc); wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + IJBossRuntimeResourceConstants.BIN); @@ -156,17 +149,6 @@ IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true); } - private void ensureJBossRuntimeIsSet(JBossServer jbs) throws CoreException { - IRuntime rt = jbs.getServer().getRuntime(); - IJBossServerRuntime jbrt = null; - if (rt != null) - jbrt = (IJBossServerRuntime) rt.getAdapter(IJBossServerRuntime.class); - - if (jbrt == null) - throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, - NLS.bind(Messages.ServerRuntimeNotFound, jbs.getServer().getName()))); - } - private String updateRuntimeArgument(String args, IJBossServerRuntime runtime) { String config = runtime.getJBossConfiguration(); args = ArgsUtil.setArg(args,