Author: rob.stryker(a)jboss.com Date: 2007-09-24 18:00:03 -0400 (Mon, 24 Sep 2007) New Revision: 3778 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.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.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java 2007-09-24 21:59:38 UTC (rev 3777) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java 2007-09-24 22:00:03 UTC (rev 3778) @@ -24,7 +24,11 @@ import java.util.Properties; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.dialogs.MessageDialog; @@ -41,10 +45,10 @@ import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.core.ServerEvent; import org.eclipse.wst.server.core.ServerUtil; +import org.eclipse.wst.server.core.internal.PublishServerJob; import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; import org.eclipse.wst.server.ui.ServerUICore; import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer; -import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; @@ -77,8 +81,10 @@ IServerWorkingCopy server = selection.server.createWorkingCopy(); if( ServerConverter.getDeployableServer(selection.server) != null ) { + ServerUtil.modifyModules(server, new IModule[0], selection.module, new NullProgressMonitor()); + IServer server2 = server.save(true, null); ServerConverter.getDeployableServerBehavior(selection.server) - .publishOneModule(IServer.PUBLISH_FULL, selection.module, ServerBehaviourDelegate.REMOVED, new NullProgressMonitor()); + .publishOneModule(IServer.PUBLISH_INCREMENTAL, selection.module, ServerBehaviourDelegate.REMOVED, new NullProgressMonitor()); } else { ServerUtil.modifyModules(server, new IModule[0], selection.module, new NullProgressMonitor()); IServer server2 = server.save(true, null); @@ -116,14 +122,20 @@ incrementalPublishModuleAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.PUBLISH_IMAGE)); } - protected void actionPublish(int type) { - try { + protected void actionPublish(final int type) { + try { if( ServerConverter.getDeployableServer(selection.server) != null ) { - ServerConverter.getDeployableServerBehavior(selection.server) - .publishOneModule(type, selection.module, - ServerBehaviourDelegate.CHANGED, new NullProgressMonitor()); + new Job("Publish One Module To Server") { + protected IStatus run(IProgressMonitor monitor) { + ServerConverter.getDeployableServerBehavior(selection.server) + .publishOneModule(type, selection.module, + ServerBehaviourDelegate.CHANGED, new NullProgressMonitor()); + return Status.OK_STATUS; + } + }.schedule(); } else { - selection.server.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonitor()); + // can't do anything special here, sadly + new PublishServerJob(selection.server, type, true).schedule(); } } catch( Exception e ) { // ignore @@ -134,7 +146,8 @@ public void fillContextMenu(Shell shell, IMenuManager menu, Object selection) { if( selection instanceof ModuleServer) { this.selection = (ModuleServer)selection; - menu.add(deleteModuleAction); + if( this.selection.module.length == 1 ) + menu.add(deleteModuleAction); menu.add(fullPublishModuleAction); menu.add(incrementalPublishModuleAction); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java 2007-09-24 21:59:38 UTC (rev 3777) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java 2007-09-24 22:00:03 UTC (rev 3778) @@ -58,12 +58,14 @@ String type = item.getSpecificType(); if( type.equals(PublisherEventLogger.MULTIPLE_MODULE_TOP_EVENT) || type.equals(PublisherEventLogger.SINGLE_MODULE_TOP_EVENT)) { - int deltaKind = ((Integer)item.getProperty(PublisherEventLogger.DELTA_KIND)).intValue(); - Image unpubIcon = JBossServerUISharedImages.getImage(JBossServerUISharedImages.UNPUBLISH_IMAGE); - Image pubIcon = JBossServerUISharedImages.getImage(JBossServerUISharedImages.PUBLISH_IMAGE); - if( deltaKind == ServerBehaviourDelegate.REMOVED ) - return unpubIcon; - return pubIcon; + try { + int deltaKind = ((Integer)item.getProperty(PublisherEventLogger.DELTA_KIND)).intValue(); + Image unpubIcon = JBossServerUISharedImages.getImage(JBossServerUISharedImages.UNPUBLISH_IMAGE); + Image pubIcon = JBossServerUISharedImages.getImage(JBossServerUISharedImages.PUBLISH_IMAGE); + if( deltaKind == ServerBehaviourDelegate.REMOVED ) + return unpubIcon; + return pubIcon; + } catch( NullPointerException npe ) { return null; } } if( type.equals(PublisherEventLogger.FILE_COPPIED_EVENT)) return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);