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

[Robert Stryker]

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

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model 
                        PackagesBuildListener.java
  Log:
  Integrating with packaging
  
  Revision  Changes    Path
  1.8       +6 -7      jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/PackagesBuildListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesBuildListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/PackagesBuildListener.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- PackagesBuildListener.java	23 Feb 2007 21:57:33 -0000	1.7
  +++ PackagesBuildListener.java	26 Feb 2007 21:20:59 -0000	1.8
  @@ -26,6 +26,7 @@
   
   import org.eclipse.core.runtime.IPath;
   import org.eclipse.core.runtime.NullProgressMonitor;
  +
   import org.eclipse.wst.server.core.IModule;
   import org.eclipse.wst.server.core.IServer;
   import org.eclipse.wst.server.core.ServerCore;
  @@ -38,6 +39,7 @@
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
   import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
  +import org.jboss.ide.eclipse.core.util.ResourceUtil;
   
   /**
    *
  @@ -45,7 +47,6 @@
    * This class is teh suck. I dont even know whether to keep it
    */
   public class PackagesBuildListener extends AbstractPackagesBuildListener {
  -//public class PackagesBuildListener {
   
   	public static PackagesBuildListener instance;
   	public static final String DEPLOY_SERVERS = "org.jboss.ide.eclipse.as.core.model.PackagesBuildListener.DeployServers";
  @@ -76,24 +77,22 @@
   
   	public void fileRemoved(IPackage topLevelPackage, IPackageFileSet fileset, IPath filePath) {
   		// make absolute
  -		IPath filePath2 = makeAbsolute(filePath); // change
  +		IPath filePath2 = makeAbsolute(filePath, topLevelPackage); // change
   		ArrayList removes = (ArrayList)removals.get(topLevelPackage);
   		if( !removes.contains(filePath2)) removes.add(filePath2);
   	}
   	public void fileUpdated(IPackage topLevelPackage, IPackageFileSet fileset, IPath filePath) {
   		// make absolute
  -		IPath filePath2 = makeAbsolute(filePath); // change
  +		IPath filePath2 = makeAbsolute(filePath, topLevelPackage); // change
   		ArrayList changes = (ArrayList)changesOrAdditions.get(topLevelPackage);
   		if( !changes.contains(filePath2)) changes.add(filePath2);
   	}
   
  -	public IPath makeAbsolute(IPath local) {
  +	public IPath makeAbsolute(IPath local, IPackage topLevelPackage) {
   		IPath file = PackagesCore.getBaseFile(local);
  -		
  -		return file;
  +		return ResourceUtil.makeAbsolute(file, topLevelPackage.isDestinationInWorkspace());
   	}
   	public void finishedBuildingPackage(IPackage pkg) {
  -		System.out.println("finished building package");
   		if( pkg.isTopLevel() && new Boolean(pkg.getProperty(AUTO_DEPLOY)).booleanValue()) {
   			publish(pkg);
   			// then clean up what's been changed