[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers ...

[Robert Stryker]

  User: rawb    
  Date: 07/01/04 14:05:04

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers 
                        ModuleViewProvider.java
  Log:
  Actions were republishing full servers rather than just the module that had changed. I blame it on wtp API, but then I made no effort to get around it until just now. 
  
  Revision  Changes    Path
  1.4       +12 -7     jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ModuleViewProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ModuleViewProvider.java	22 Dec 2006 23:26:35 -0000	1.3
  +++ ModuleViewProvider.java	4 Jan 2007 19:05:04 -0000	1.4
  @@ -24,6 +24,7 @@
   
   import java.util.Properties;
   
  +import org.eclipse.core.runtime.NullProgressMonitor;
   import org.eclipse.jface.action.Action;
   import org.eclipse.jface.action.IMenuManager;
   import org.eclipse.jface.dialogs.MessageDialog;
  @@ -39,13 +40,13 @@
   import org.eclipse.wst.server.core.IServerWorkingCopy;
   import org.eclipse.wst.server.core.ServerCore;
   import org.eclipse.wst.server.core.ServerEvent;
  -import org.eclipse.wst.server.core.internal.PublishServerJob;
  -import org.eclipse.wst.server.core.internal.Server;
  +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.JBossServerCore;
   import org.jboss.ide.eclipse.as.core.model.ModuleModel;
   import org.jboss.ide.eclipse.as.core.server.JBossServer;
  +import org.jboss.ide.eclipse.as.core.server.stripped.DeployableServerBehavior;
   import org.jboss.ide.eclipse.as.ui.Messages;
   import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider;
   import org.jboss.ide.eclipse.as.ui.views.server.extensions.SimplePropertiesViewExtension;
  @@ -79,9 +80,9 @@
   						wc.modifyModules(null, selection.module , null);
   						wc.save(true, null);
   						// Re-publish in case the configuration change has not been published yet.
  -						PublishServerJob publishJob = new PublishServerJob(selection.server, IServer.PUBLISH_INCREMENTAL, false);
  -						publishJob.schedule();
  -
  +						DeployableServerBehavior behavior = (DeployableServerBehavior)
  +							contentProvider.getServer().loadAdapter(DeployableServerBehavior.class, new NullProgressMonitor());
  +						behavior.publishOneModule(IServer.PUBLISH_FULL, selection.module, ServerBehaviourDelegate.REMOVED, new NullProgressMonitor());
   					} catch (Exception e) {
   						// ignore
   					}
  @@ -95,8 +96,9 @@
   			public void run() {
   				for( int i = 0; i < selection.module.length; i++ ) 
   					ModuleModel.getDefault().markModuleChanged(selection.module[i]);
  -				PublishServerJob job = new PublishServerJob(selection.server, IServer.PUBLISH_FULL, false);
  -				job.schedule();
  +				DeployableServerBehavior behavior = (DeployableServerBehavior)
  +					contentProvider.getServer().loadAdapter(DeployableServerBehavior.class, new NullProgressMonitor());
  +				behavior.publishOneModule(IServer.PUBLISH_FULL, selection.module, ServerBehaviourDelegate.CHANGED, new NullProgressMonitor());
   			}
   		};
   		publishModuleAction.setText(Messages.PublishModuleText);
  @@ -185,6 +187,9 @@
   			input = (IServer)newInput;
   		}
   		
  +		public IServer getServer() {
  +			return input;
  +		}
   	}
   	
   	class ModuleLabelProvider extends LabelProvider {