Author: rob.stryker(a)jboss.com Date: 2007-09-24 17:59:38 -0400 (Mon, 24 Sep 2007) New Revision: 3777 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java Log: Change allowing children to be seen in view UI enhancement actions changed to accomodate Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2007-09-24 19:38:28 UTC (rev 3776) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2007-09-24 21:59:38 UTC (rev 3777) @@ -1,6 +1,7 @@ package org.jboss.ide.eclipse.as.core.server.internal; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.eclipse.core.runtime.CoreException; @@ -145,14 +146,21 @@ // Basically stolen from RunOnServerActionDelegate public IStatus publishOneModule(int kind, IModule[] module, int deltaKind, IProgressMonitor monitor) { + return publishOneModule(module, kind, deltaKind, true, monitor); + } + + /* + * hack for eclipse bug 169570 + */ + public IStatus publishOneModule(IModule[] module, int kind, int deltaKind, boolean recurse, IProgressMonitor monitor) { + // add it to the server first - addAndRemoveModules(module, deltaKind); + if( module.length == 1 ) + addAndRemoveModules(module, deltaKind); ArrayList moduleList = new ArrayList(); ArrayList deltaKindList = new ArrayList(); - moduleList.add(module); - deltaKindList.add(new Integer(deltaKind)); - + fillPublishOneModuleLists(module, moduleList, deltaKindList, deltaKind, recurse); try { ((Server)getServer()).getServerPublishInfo().startCaching(); @@ -189,6 +197,20 @@ return Status.CANCEL_STATUS; } + protected void fillPublishOneModuleLists(IModule[] module, ArrayList moduleList, ArrayList deltaKindList, int deltaKind, boolean recurse) { + if( recurse ) { + ArrayList tmp = new ArrayList(); + IModule[] children = getServer().getChildModules(module, new NullProgressMonitor()); + for( int i = 0; i < children.length; i++ ) { + tmp.addAll(Arrays.asList(module)); + tmp.add(children[i]); + fillPublishOneModuleLists((IModule[]) tmp.toArray(new IModule[tmp.size()]), moduleList, deltaKindList, deltaKind, recurse); + } + } + moduleList.add(module); + deltaKindList.add(new Integer(deltaKind)); + } + protected void addAndRemoveModules(IModule[] module, int deltaKind) { if( getServer() == null ) return; boolean contains = ServerUtil.containsModule(getServer(), module[0], new NullProgressMonitor());