Author: adietish Date: 2011-06-20 11:15:30 -0400 (Mon, 20 Jun 2011) New Revision: 32216 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/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 method from ServerUtils to RuntimeUtils (deprecated old method) 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-20 14:23:07 UTC (rev 32215) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java 2011-06-20 15:15:30 UTC (rev 32216) @@ -11,7 +11,7 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IRuntimeType; import org.eclipse.wst.server.core.IRuntimeWorkingCopy; -import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerAttributes; import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; @@ -20,11 +20,16 @@ public class RuntimeUtils { - public static IJBossServerRuntime getJBossServerRuntime(IServer server) throws CoreException { + public static IJBossServerRuntime checkedGetJBossServerRuntime(IServerAttributes server) { IRuntime rt = server.getRuntime(); IJBossServerRuntime jbrt = null; if (rt != null) jbrt = (IJBossServerRuntime) rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor()); + return jbrt; + } + + public static IJBossServerRuntime getJBossServerRuntime(IServerAttributes server) throws CoreException { + IJBossServerRuntime jbrt = checkedGetJBossServerRuntime(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-20 14:23:07 UTC (rev 32215) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-20 15:15:30 UTC (rev 32216) @@ -14,7 +14,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerAttributes; import org.eclipse.wst.server.core.IServerWorkingCopy; @@ -131,13 +130,14 @@ servers.toArray(ret); return ret; } - public static IJBossServerRuntime getJBossRuntime(IServer server) { - return getJBossRuntime((IServerAttributes)server); + + @Deprecated + public static IJBossServerRuntime getJBossRuntime(IServer server) throws CoreException { + return RuntimeUtils.getJBossServerRuntime(server); } - + + @Deprecated public static IJBossServerRuntime getJBossRuntime(IServerAttributes server) { - if( server == null ) return null; - IRuntime rt = server.getRuntime(); - return (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, null); + return RuntimeUtils.checkedGetJBossServerRuntime(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-20 14:23:07 UTC (rev 32215) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-06-20 15:15:30 UTC (rev 32216) @@ -27,7 +27,7 @@ import org.jboss.ide.eclipse.as.core.util.IConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.core.util.RuntimeUtils; /* @@ -50,7 +50,7 @@ } public static String getRSEConfigName(IServerAttributes server) { - IJBossServerRuntime runtime = ServerConverter.getJBossRuntime(server); + IJBossServerRuntime runtime = RuntimeUtils.checkedGetJBossServerRuntime(server); return server.getAttribute(RSEUtils.RSE_SERVER_CONFIG, runtime.getJBossConfiguration()); }