[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/02/16 19:02:44

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal   
                        PackageFileSetImpl.java PackageImpl.java
                        PackagesModel.java
  Log:
  fixed a bug prohibiting a package being created with an external location (testing an IPath's "context" is working properly now). also fixed a small builder bug for packages outside of the workspace
  
  Revision  Changes    Path
  1.6       +11 -9     jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageFileSetImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageFileSetImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageFileSetImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- PackageFileSetImpl.java	14 Feb 2007 19:10:18 -0000	1.5
  +++ PackageFileSetImpl.java	17 Feb 2007 00:02:44 -0000	1.6
  @@ -24,12 +24,12 @@
   import org.apache.tools.ant.DirectoryScanner;
   import org.eclipse.core.resources.IContainer;
   import org.eclipse.core.resources.IFile;
  -import org.eclipse.core.resources.IFolder;
   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.Path;
  +import org.jboss.ide.eclipse.packages.core.PackagesCorePlugin;
   import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
   import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbFileSet;
  @@ -38,7 +38,7 @@
    * A PackageFileSetImpl.
    * 
    * @author <a href="marshall at jboss.org">Marshall Culpepper</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class PackageFileSetImpl extends PackageNodeImpl implements
   		IPackageFileSet {
  @@ -232,11 +232,14 @@
   	public void setSingleFile(IPath path, String destinationFilename) {
   		Assert.isNotNull(path);
   		
  +		if (PackagesCorePlugin.isFileInWorkspace(path))
  +		{
  +			setSingleFile(ResourcesPlugin.getWorkspace().getRoot().getFile(path), destinationFilename);
  +		}
  +		else {
   		filesetDelegate.setFile(path.toString());
   		filesetDelegate.setInWorkspace(false);
   		
  -		if (destinationFilename != null)
  -		{
   			if (destinationFilename != null) {
   				filesetDelegate.setToFile(destinationFilename);
   			}	
  @@ -264,10 +267,9 @@
   	
   	public void setSourcePath (IPath path) {
   		Assert.isNotNull(path);
  -		IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
   		
   		filesetDelegate.setDir(path.toString());
  -		filesetDelegate.setInWorkspace(folder != null);
  +		filesetDelegate.setInWorkspace(PackagesCorePlugin.isFolderInWorkspace(path));
   	}
   	
   	public void setSourceProject(IProject project) {
  
  
  
  1.12      +3 -4      jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- PackageImpl.java	15 Feb 2007 22:45:03 -0000	1.11
  +++ PackageImpl.java	17 Feb 2007 00:02:44 -0000	1.12
  @@ -33,6 +33,7 @@
   import org.eclipse.core.runtime.CoreException;
   import org.eclipse.core.runtime.IPath;
   import org.eclipse.core.runtime.Path;
  +import org.jboss.ide.eclipse.packages.core.PackagesCorePlugin;
   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;
  @@ -46,7 +47,7 @@
    * A Package.
    * 
    * @author <a href="marshall at jboss.org">Marshall Culpepper</a>
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public class PackageImpl extends PackageNodeImpl implements IPackage {
   
  @@ -189,9 +190,7 @@
   	}
   
   	public void setDestinationPath(IPath path) {
  -		IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
  -		
  -		packageDelegate.setInWorkspace(folder != null);
  +		packageDelegate.setInWorkspace(PackagesCorePlugin.isFolderInWorkspace(path));
   		packageDelegate.setToDir(path.toString());
   	}
   	
  
  
  
  1.18      +0 -10     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.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- PackagesModel.java	15 Feb 2007 22:49:53 -0000	1.17
  +++ PackagesModel.java	17 Feb 2007 00:02:44 -0000	1.18
  @@ -388,16 +388,6 @@
   		return scanner;
   	}
   	
  -//	protected void loadPackageTypes ()
  -//	{
  -//		IPackageType[] packageTypes = ExtensionManager.findPackageTypes();
  -//		
  -//		for (int i = 0; i < packageTypes.length; i++)
  -//		{
  -//			this.packageTypes.put(packageTypes[i].getId(), packageTypes[i]);
  -//		}
  -//	}
  -	
   	protected void clearModel (IProject project)
   	{
   		List packages = getProjectPackages(project);