Author: adietish Date: 2011-06-28 10:59:03 -0400 (Tue, 28 Jun 2011) New Revision: 32409 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/RSEUtils.java Log: [JBIDE-9054] created RSEUtils#checkedGetServerHome and refactored code in RSELaunchDelegate accordingly 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-06-28 14:57:26 UTC (rev 32408) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-06-28 14:59:03 UTC (rev 32409) @@ -175,7 +175,7 @@ public static String getDefaultStopCommand(IServer server, boolean errorOnFail) throws CoreException { String rseHome = null; - rseHome = getServerHome(server, errorOnFail); + rseHome = RSEUtils.getRSEHomeDir(server, errorOnFail); JBossServer jbs = ServerConverter.getJBossServer(server); String stop = new Path(rseHome) @@ -188,16 +188,6 @@ return stop; } - private static String getServerHome(IServer server, boolean errorOnFail) throws CoreException { - String rseHome = null; - if (errorOnFail) { - rseHome = RSEUtils.checkedGetRSEHomeDir(server); - } else { - rseHome = RSEUtils.getRSEHomeDir(server); - } - return rseHome == null ? "" : rseHome; - } - public static IServer findServer(ILaunchConfiguration config) throws CoreException { String serverId = config.getAttribute("server-id", (String)null); JBossServer jbs = ServerConverter.findJBossServer(serverId); 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-28 14:57:26 UTC (rev 32408) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-06-28 14:59:03 UTC (rev 32409) @@ -44,6 +44,16 @@ return server.getAttribute(RSEUtils.RSE_SERVER_HOST, RSE_SERVER_DEFAULT_HOST); } + public static String getRSEHomeDir(IServer server, boolean errorOnFail) throws CoreException { + String rseHome = null; + if (errorOnFail) { + rseHome = RSEUtils.checkedGetRSEHomeDir(server); + } else { + rseHome = RSEUtils.getRSEHomeDir(server); + } + return rseHome == null ? "" : rseHome; + } + public static String getRSEHomeDir(IServerAttributes server) { return server.getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, server.getRuntime().getLocation().toString()); }