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

[Marshall Culpepper]

  User: mculpepper
  Date: 07/03/02 16:56:14

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal 
                        PackagesModel.java
  Log:
  added support for removing a package from the model without saving to disk (useful in the scenario of a deleted project)
  
  Revision  Changes    Path
  1.25      +665 -663  jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackagesModel.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesModel.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackagesModel.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- PackagesModel.java	26 Feb 2007 19:13:05 -0000	1.24
  +++ PackagesModel.java	2 Mar 2007 21:56:14 -0000	1.25
  @@ -23,7 +23,6 @@
   
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
  -import java.io.File;
   import java.io.IOException;
   import java.io.OutputStreamWriter;
   import java.util.ArrayList;
  @@ -32,18 +31,14 @@
   import java.util.List;
   import java.util.Set;
   
  -import org.apache.tools.ant.DirectoryScanner;
  -import org.eclipse.core.resources.IContainer;
   import org.eclipse.core.resources.IFile;
   import org.eclipse.core.resources.IProject;
   import org.eclipse.core.resources.ResourcesPlugin;
   import org.eclipse.core.runtime.Assert;
   import org.eclipse.core.runtime.CoreException;
  -import org.eclipse.core.runtime.IPath;
   import org.eclipse.core.runtime.IProgressMonitor;
   import org.eclipse.core.runtime.NullProgressMonitor;
   import org.jboss.ide.eclipse.core.util.ProjectUtil;
  -import org.jboss.ide.eclipse.packages.core.ExtensionManager;
   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;
  @@ -59,7 +54,6 @@
   import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackage;
   import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackageNode;
   import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackages;
  -import org.jboss.ide.eclipse.packages.core.model.types.IPackageType;
   import org.jboss.ide.eclipse.packages.core.project.PackagesNature;
   
   public class PackagesModel {
  @@ -245,7 +239,13 @@
   		return new PackageFileSetImpl(project, new XbFileSet());
   	}
   	
  -	public void removePackage(IPackage pkg) {
  +	public void removePackage(IPackage pkg)
  +	{
  +		removePackage(pkg, true);
  +	}
  +	
  +	public void removePackage (IPackage pkg, boolean save)
  +	{
   		if (projectPackages.containsKey(pkg.getProject()))
   		{
   			if (getProjectPackages(pkg.getProject()).contains(pkg))
  @@ -259,7 +259,9 @@
   			packages.removeChild(packageImpl.getNodeDelegate());
   		}
   		
  +		if (save)
   		saveModel(pkg.getProject(), null);
  +		
   		fireNodeRemoved(pkg);
   	}