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

[Marshall Culpepper]

  User: mculpepper
  Date: 07/03/07 17:29:59

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers 
                        PackagesPublisher.java
  Log:
  PackagesBuildListener refactored to PackagesListener. when a package changes from exploded to compressed or vice-versa make sure to delete the old file/folder from the deploy dir first
  
  Revision  Changes    Path
  1.11      +4 -5      jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesPublisher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- PackagesPublisher.java	2 Mar 2007 21:59:28 -0000	1.10
  +++ PackagesPublisher.java	7 Mar 2007 22:29:59 -0000	1.11
  @@ -31,7 +31,7 @@
   import org.eclipse.wst.server.core.IServer;
   import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
   import org.jboss.ide.eclipse.as.core.model.EventLogModel;
  -import org.jboss.ide.eclipse.as.core.model.PackagesBuildListener;
  +import org.jboss.ide.eclipse.as.core.model.PackagesListener;
   import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogRoot;
   import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem;
   import org.jboss.ide.eclipse.as.core.module.PackageModuleFactory.PackagedModuleDelegate;
  @@ -108,8 +108,7 @@
   		for( int i = 0; i < module.length; i++ ) {
   			PackagedModuleDelegate delegate = (PackagedModuleDelegate)module[i].loadAdapter(PackagedModuleDelegate.class, new NullProgressMonitor());
   			IPackage pack = delegate.getPackage();
  -			IResource resource = pack.getPackageResource();
  -			IPath sourcePath = resource.getLocation();
  +			IPath sourcePath = pack.getPackageFilePath();
   			IPath destPath = new Path(server.getDeployDirectory()).append(sourcePath.lastSegment());
   			boolean success = FileUtil.safeDelete(destPath.toFile());
   			addRemoveEvent(event, pack, destPath, success ? SUCCESS : FAILURE);
  @@ -125,8 +124,8 @@
   			PackagedModuleDelegate delegate = (PackagedModuleDelegate)module[i].loadAdapter(PackagedModuleDelegate.class, new NullProgressMonitor());
   			IPackage pack = delegate.getPackage();
   			IPath sourcePath = ResourceUtil.makeAbsolute(pack.getPackageFilePath(), pack.isDestinationInWorkspace());
  -			IPath[] removed = PackagesBuildListener.getInstance().getRemovedFiles(pack);
  -			IPath[] updated = PackagesBuildListener.getInstance().getUpdatedFiles(pack);
  +			IPath[] removed = PackagesListener.getInstance().getRemovedFiles(pack);
  +			IPath[] updated = PackagesListener.getInstance().getUpdatedFiles(pack);
   			
   			IPath destPathRoot = new Path(server.getDeployDirectory()).append(sourcePath.lastSegment());
   			IPath suffix, destPath;