Author: rob.stryker(a)jboss.com Date: 2008-11-06 16:42:40 -0500 (Thu, 06 Nov 2008) New Revision: 11598 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java Log: Moving some common / reusable code into a utility class. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-11-06 20:51:30 UTC (rev 11597) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-11-06 21:42:40 UTC (rev 11598) @@ -42,6 +42,7 @@ import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.util.ModuleUtil; public class DeployableServer extends ServerDelegate implements IDeployableServer { @@ -71,28 +72,8 @@ } public IModule[] getChildModules(IModule[] module) { - int last = module.length-1; - if (module[last] != null && module[last].getModuleType() != null) { - IModuleType moduleType = module[last].getModuleType(); - if("jst.ear".equals(moduleType.getId())) { //$NON-NLS-1$ - IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[0] - .loadAdapter(IEnterpriseApplication.class, null); - if (enterpriseApplication != null) { - IModule[] earModules = enterpriseApplication.getModules(); - if ( earModules != null) { - return earModules; - } - } - } - else if ("jst.web".equals(moduleType.getId())) { //$NON-NLS-1$ - IWebModule webModule = (IWebModule) module[last].loadAdapter(IWebModule.class, null); - if (webModule != null) { - IModule[] modules = webModule.getModules(); - return modules; - } - } - } - return new IModule[0]; + IModule[] children = ModuleUtil.getChildModules(module); + return children; } public IModule[] getRootModules(IModule module) throws CoreException { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java 2008-11-06 20:51:30 UTC (rev 11597) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java 2008-11-06 21:42:40 UTC (rev 11598) @@ -4,8 +4,12 @@ import java.util.Arrays; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jst.server.core.IEnterpriseApplication; +import org.eclipse.jst.server.core.IWebModule; import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IModuleType; import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.model.ModuleDelegate; public class ModuleUtil { public static ArrayList<IModule[]> getShallowChildren(IServer server, IModule[] root) { @@ -32,4 +36,30 @@ } return deep; } + + public static IModule[] getChildModules(IModule[] module) { + int last = module.length-1; + if (module[last] != null && module[last].getModuleType() != null) { + IModuleType moduleType = module[last].getModuleType(); + if("jst.ear".equals(moduleType.getId())) { //$NON-NLS-1$ + IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[0] + .loadAdapter(IEnterpriseApplication.class, null); + if (enterpriseApplication != null) { + IModule[] earModules = enterpriseApplication.getModules(); + if ( earModules != null) { + return earModules; + } + } + } + else if ("jst.web".equals(moduleType.getId())) { //$NON-NLS-1$ + IWebModule webModule = (IWebModule) module[last].loadAdapter(IWebModule.class, null); + if (webModule != null) { + IModule[] modules = webModule.getModules(); + return modules; + } + } + } + return new IModule[0]; + } + }