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

[Marshall Culpepper]

  User: mculpepper
  Date: 07/03/02 16:55:20

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build 
                        PackageBuildDelegate.java
  Log:
  API updates, first attempt at supporting model deletion after a project has been removed from the workspace
  
  Revision  Changes    Path
  1.5       +26 -11    jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build/PackageBuildDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageBuildDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build/PackageBuildDelegate.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- PackageBuildDelegate.java	28 Feb 2007 23:25:25 -0000	1.4
  +++ PackageBuildDelegate.java	2 Mar 2007 21:55:20 -0000	1.5
  @@ -223,15 +223,7 @@
   			}
   		});
   		
  -		IFile file = pkg.getPackageFile();
  -		if (file != null)
  -		{
  -			try {
  -				file.refreshLocal(IResource.DEPTH_ONE, monitor);
  -			} catch (CoreException e) {
  -				Trace.trace(getClass(), e);
  -			}
  -		}
  +		BuildFileOperations.refreshPackage(pkg);
   		
   		monitor.done();
   		events.fireFinishedBuildingPackage(pkg);
  @@ -252,7 +244,7 @@
   		for (Iterator iter = packages.iterator(); iter.hasNext(); )
   		{
   			IPackage pkg = (IPackage) iter.next();
  -			IFile packageFile = pkg.getPackageFile();
  +			IResource packageFile = pkg.getPackageResource();
   			
   			if (packageFile.exists())
   			{
  @@ -343,8 +335,14 @@
   			try {
   				delta.accept(new IResourceDeltaVisitor () { 
   					public boolean visit(IResourceDelta delta) throws CoreException {
  -						if (delta.getResource().getType() == IResource.FILE)
  +						if (delta.getResource().getType() == IResource.FILE)  {
   							processFileDelta(project, delta, packagesBeingChanged, monitor);
  +						} else if (delta.getResource().getType() == IResource.PROJECT) {
  +							if ((delta.getKind() & IResourceDelta.REMOVED) > 0)
  +							{
  +								processProjectRemoved ((IProject) delta.getResource());
  +							}
  +						}
   						return true;
   					}
   				});
  @@ -403,6 +401,11 @@
   			events.fireFinishedBuildingPackage(p);
   		}
   
  +		for (Iterator iter = packagesBeingChanged.iterator(); iter.hasNext(); )
  +		{
  +			IPackage pkg = (IPackage) iter.next();
  +			BuildFileOperations.refreshPackage(pkg);
  +		}
   	}
   	
   	private void processFileDelta (IProject project, IResourceDelta delta, ArrayList packagesBeingChanged, IProgressMonitor monitor)
  @@ -456,6 +459,18 @@
   		}
   	}
   	
  +	private void processProjectRemoved (IProject project)
  +	{
  +		// For now removing model objects should be good enough, need to come back later and add support for removing any package references
  +		
  +		List packages = PackagesModel.instance().getProjectPackages(project);
  +		for (Iterator iter = packages.iterator(); iter.hasNext(); )
  +		{
  +			IPackage pkg = (IPackage) iter.next();
  +			PackagesModel.instance().removePackage(pkg, false);
  +		}
  +	}
  +	
   	public void setProject(IProject project) {
   		this.project = project;
   	}