Author: adietish Date: 2011-06-21 08:58:51 -0400 (Tue, 21 Jun 2011) New Revision: 32254 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/TwiddleLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java Log: [JBIDE-9200] moving util methods to consistent pattern: checkedGetXX throws Exception, getXXX returns null 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:36:32 UTC (rev 32253) +++ 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:58:51 UTC (rev 32254) @@ -150,7 +150,7 @@ @Deprecated 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); + String serverHome = org.jboss.ide.eclipse.as.core.util.ServerUtil.checkedGetServerHome(jbs); LaunchConfigUtils.addCPEntry(serverHome, relative, list); } @@ -182,7 +182,7 @@ @Deprecated public static String getServerHome(JBossServer jbs) throws CoreException { - return ServerUtil.getServerHome(jbs); + return ServerUtil.checkedGetServerHome(jbs); } public IVMInstall getVMInstall(ILaunchConfiguration configuration) throws CoreException { 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:36:32 UTC (rev 32253) +++ 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:58:51 UTC (rev 32254) @@ -63,7 +63,7 @@ NLS.bind(Messages.ServerNotFound, server.getName()))); } IJBossServerRuntime jbrt = RuntimeUtils.checkedGetJBossServerRuntime(server); - String serverHome = ServerUtil.getServerHome(jbs); + String serverHome = ServerUtil.checkedGetServerHome(jbs); ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType launchConfigType = launchManager.getLaunchConfigurationType(TWIDDLE_LAUNCH_TYPE); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-21 12:36:32 UTC (rev 32253) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-06-21 12:58:51 UTC (rev 32254) @@ -163,7 +163,7 @@ return NLS.bind(Messages.serverCountName, base, i); } - public static String getServerHome(JBossServer jbs) throws CoreException { + public static String checkedGetServerHome(JBossServer jbs) throws CoreException { String serverHome = jbs.getServer().getRuntime().getLocation().toOSString(); if (serverHome == null) throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, @@ -172,7 +172,7 @@ } public static IPath getServerHomePath(JBossServer jbs) throws CoreException { - return new Path(getServerHome(jbs)); + return new Path(checkedGetServerHome(jbs)); } }