Author: adietish Date: 2011-07-13 06:08:59 -0400 (Wed, 13 Jul 2011) New Revision: 32882 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java Log: [JBIDE-9215] deprecated LocalJBossServerRuntime#isEAP(IRuntime) (static) by LocalJBossServerRuntime#isEAP() and RuntimeUtils#isEAP(IRuntime) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2011-07-13 08:49:20 UTC (rev 32881) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2011-07-13 10:08:59 UTC (rev 32882) @@ -72,4 +72,5 @@ public String getDefaultRunVMArgs(); public HashMap<String, String> getDefaultRunEnvVars(); public boolean isUsingDefaultJRE(); + public boolean isEAP(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-07-13 08:49:20 UTC (rev 32881) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-07-13 10:08:59 UTC (rev 32882) @@ -52,6 +52,7 @@ import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader; 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.RuntimeUtils; public class LocalJBossServerRuntime extends AbstractLocalJBossServerRuntime implements IJBossServerRuntime { @@ -65,7 +66,7 @@ protected String getNextRuntimeName() { String rtVersion = getRuntime().getRuntimeType().getVersion(); String prefix = Messages.jboss; - if( isEAP(getRuntime())) { + if( isEAP()) { prefix = Messages.jboss + " EAP "; //$NON-NLS-1$ if( rtVersion.equals(IJBossToolingConstants.V5_0)) { rtVersion = "5.x"; //$NON-NLS-1$ @@ -77,10 +78,21 @@ return getNextRuntimeName(base); } + /** + * @deprecated replaced by {@link #isEAP()} and {@link RuntimeUtils#isEAP(IRuntime)} + */ + @Deprecated public static boolean isEAP(IRuntime rt) { - return rt.getRuntimeType().getId().startsWith(IJBossToolingConstants.EAP_RUNTIME_PREFIX); + return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap."); //$NON-NLS-1$ } + public boolean isEAP() { + return getRuntime() != null + && getRuntime().getRuntimeType() != null + && getRuntime().getRuntimeType().getId() != null + && getRuntime().getRuntimeType().getId().startsWith(IJBossToolingConstants.EAP_RUNTIME_PREFIX); + } + @Override public IStatus validate() { IStatus s = super.validate(); 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-07-13 08:49:20 UTC (rev 32881) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java 2011-07-13 10:08:59 UTC (rev 32882) @@ -13,13 +13,14 @@ import org.eclipse.wst.server.core.IRuntimeWorkingCopy; import org.eclipse.wst.server.core.IServerAttributes; import org.eclipse.wst.server.core.ServerUtil; +import org.eclipse.wst.server.core.TaskModel; import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; public class RuntimeUtils { - + public static IJBossServerRuntime getJBossServerRuntime(IServerAttributes server) { IRuntime rt = null; if (server != null) { @@ -39,6 +40,27 @@ return jbrt; } + public static IJBossServerRuntime getJBossServerRuntime(IRuntime runtime) { + return (IJBossServerRuntime) runtime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor()); + } + + public static boolean isEAP(IRuntime runtime) { + IJBossServerRuntime jbossRuntime = getJBossServerRuntime(runtime); + if (jbossRuntime == null) { + return false; + } + return jbossRuntime.isEAP(); + + } + + public static IJBossServerRuntime checkedGetJBossServerRuntime(IRuntime runtime) throws CoreException { + IJBossServerRuntime jbossRuntime = getJBossServerRuntime(runtime); + if (jbossRuntime == null) + throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + NLS.bind(Messages.ServerRuntimeNotFound, runtime.getName()))); + return jbossRuntime; + } + public static IRuntime createRuntime(String runtimeId, String homeDir, String config, IVMInstall install) throws CoreException { IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null,runtimeId);