[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/types ...

[Marshall Culpepper]

  User: mculpepper
  Date: 06/12/20 14:56:40

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/types 
                        JARPackageType.java
  Log:
  got rid of the working copies idea, and eliminated the model bridge as it was making things too complicated. package nodes now keep references to their parents and children, (just like delegates). there shouldn't be any need for synch as addChild/removeChild take care of all the details there. the way to create a package node that isn't attached to the model yet is:
  
  pkg = PackagesCore.createDetachedPackage(project, true);
  pkg.setXXX..
  PackagesCore.attach(pkg, monitor);
  
  Revision  Changes    Path
  1.4       +8 -14     jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/types/JARPackageType.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JARPackageType.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/types/JARPackageType.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- JARPackageType.java	21 Nov 2006 17:40:31 -0000	1.3
  +++ JARPackageType.java	20 Dec 2006 19:56:40 -0000	1.4
  @@ -2,7 +2,6 @@
   
   import org.eclipse.core.resources.IContainer;
   import org.eclipse.core.resources.IProject;
  -import org.eclipse.core.resources.ResourcesPlugin;
   import org.eclipse.core.runtime.Assert;
   import org.eclipse.core.runtime.IPath;
   import org.eclipse.core.runtime.IProgressMonitor;
  @@ -13,8 +12,6 @@
   import org.jboss.ide.eclipse.packages.core.Trace;
   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.IPackageFileSetWorkingCopy;
  -import org.jboss.ide.eclipse.packages.core.model.IPackageWorkingCopy;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
   
   /**
  @@ -48,20 +45,17 @@
   		outputPath = outputPath.removeFirstSegments(1);
   		IContainer outputContainer = project.getFolder(outputPath);
   		
  -		IPackage jar = PackagesCore.createPackage(project, true);
  -		IPackageWorkingCopy jarWC = jar.createPackageWorkingCopy();
  +		IPackage jar = PackagesCore.createDetachedPackage(project, true);
   		
  -		jarWC.setDestinationContainer(project);
  -		jarWC.setExploded(false);
  -		jarWC.setName(project.getName() + ".jar");
  -		jarWC.setPackageType(this);
  -		jar = jarWC.savePackage();
  +		jar.setDestinationContainer(project);
  +		jar.setExploded(false);
  +		jar.setName(project.getName() + ".jar");
  +		jar.setPackageType(this);
   		
   		IPackageFileSet classes = PackagesCore.createPackageFileSet(project);
  -		IPackageFileSetWorkingCopy classesWC = classes.createFileSetWorkingCopy();
  -		classesWC.setIncludesPattern("**/*");
  -		classesWC.setSourceContainer(outputContainer);
  -		classes = classesWC.saveFileSet();
  +		classes.setIncludesPattern("**/*");
  +		classes.setSourceContainer(outputContainer);
  +		
   		jar.addChild(classes);
   		
   		monitor.worked(1);