[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: 06/11/17 12:44:20

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal 
                        PackagesModel.java
  Log:
  package project nature will be succesfully added before workbench restart now
  
  Revision  Changes    Path
  1.5       +22 -2     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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- PackagesModel.java	16 Nov 2006 20:56:58 -0000	1.4
  +++ PackagesModel.java	17 Nov 2006 17:44:20 -0000	1.5
  @@ -41,6 +41,7 @@
   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.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.IPackageFolder;
  @@ -87,12 +88,14 @@
   	public void registerProject(IProject project, IProgressMonitor monitor)
   	{
   		monitor.beginTask("Loading configuration...", XMLBinding.NUM_UNMARSHAL_MONITOR_STEPS + 2);
  +		
   		IFile packagesFile = project.getFile(PROJECT_PACKAGES_FILE);
   		if (packagesFile.exists())
   		{
   			try {
  -				if (!project.hasNature(PackagesNature.NATURE_ID))
  +				if (!project.hasNature(PackagesNature.NATURE_ID)) {
   					ProjectUtil.addProjectNature(project, PackagesNature.NATURE_ID);
  +				}
   				
   				XbPackages packages = XMLBinding.unmarshal(packagesFile.getContents(), monitor);
   				monitor.worked(1);
  @@ -101,7 +104,7 @@
   				createPackageNodeImpl(project, packages);
   				monitor.worked(1);
   			} catch (CoreException e) {
  -				e.printStackTrace();
  +				Trace.trace(PackagesModel.class, e);
   			}
   		}
   	}
  @@ -265,6 +268,16 @@
   		saveModel(node.getProject());
   	}
   	
  +	protected void clearModel (IProject project)
  +	{
  +		List packages = getProjectPackages(project);
  +		for (Iterator iter = packages.iterator(); iter.hasNext(); )
  +		{
  +			PackageImpl pkg = (PackageImpl) iter.next();
  +			unregisterPackageNode(pkg, pkg.getNodeDelegate());
  +		}
  +	}
  +	
   	protected void saveModel (IProject project)
   	{
   		try {
  @@ -284,6 +297,11 @@
   			
   			bytesIn.close();
   			bytesOut.close();
  +			
  +			if (!project.hasNature(PackagesNature.NATURE_ID)) {
  +				ProjectUtil.addProjectNature(project, PackagesNature.NATURE_ID);
  +			}
  +			
   		} catch (IOException e) {
   			// TODO Auto-generated catch block
   			e.printStackTrace();
  @@ -291,6 +309,8 @@
   			// TODO Auto-generated catch block
   			e.printStackTrace();
   		}
  +		
  +		
   	}
   	
   	protected PackageNodeImpl createPackageNodeImpl (IProject project, XbPackageNode node)