[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped ...

[Robert Stryker]

  User: rawb    
  Date: 07/02/26 16:20:58

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped 
                        DeployableServerBehavior.java
  Log:
  Integrating with packaging
  
  Revision  Changes    Path
  1.5       +12 -13    jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DeployableServerBehavior.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- DeployableServerBehavior.java	23 Feb 2007 21:57:33 -0000	1.4
  +++ DeployableServerBehavior.java	26 Feb 2007 21:20:58 -0000	1.5
  @@ -201,19 +201,18 @@
   	}
   	
   	protected void addAndRemoveModules(IModule[] module, int deltaKind) {
  -		if( deltaKind != ServerBehaviourDelegate.ADDED && deltaKind != ServerBehaviourDelegate.REMOVED) return;
  -
  -		if (getServer() != null && !ServerUtil.containsModule(getServer(), module[0], new NullProgressMonitor())) {
  -			IServerWorkingCopy wc = getServer().createWorkingCopy();
  +		if( getServer() == null ) return;
  +		boolean contains = ServerUtil.containsModule(getServer(), module[0], new NullProgressMonitor());
   			try {
  -				if( deltaKind == ServerBehaviourDelegate.ADDED )
  +			if( !contains && (deltaKind == ServerBehaviourDelegate.ADDED) || (deltaKind == ServerBehaviourDelegate.CHANGED)) {
  +				IServerWorkingCopy wc = getServer().createWorkingCopy();
   					ServerUtil.modifyModules(wc, module, new IModule[0], new NullProgressMonitor());
  -				else if( deltaKind == ServerBehaviourDelegate.REMOVED) 
  +				wc.save(false, new NullProgressMonitor());
  +			} else if( contains && deltaKind == ServerBehaviourDelegate.REMOVED) {
  +				IServerWorkingCopy wc = getServer().createWorkingCopy();
   					ServerUtil.modifyModules(wc, new IModule[0], module, new NullProgressMonitor());
  -					
   				wc.save(false, new NullProgressMonitor());
  -			} catch (CoreException ce) {
  -			}
   		}
  +		} catch( Exception e ) {} // swallowed
   	}
   }