[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/23 13:36:06

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal  
                        PackageFileSetImpl.java PackageImpl.java
  Log:
  refactored isFile/isFolderInWorkspace into ResourceUtil of the main core plugin and changed to isResourceInWorkspace
  
  Revision  Changes    Path
  1.7       +4 -3      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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- PackageFileSetImpl.java	17 Feb 2007 00:02:44 -0000	1.6
  +++ PackageFileSetImpl.java	23 Feb 2007 18:36:06 -0000	1.7
  @@ -29,6 +29,7 @@
   import org.eclipse.core.runtime.Assert;
   import org.eclipse.core.runtime.IPath;
   import org.eclipse.core.runtime.Path;
  +import org.jboss.ide.eclipse.core.util.ResourceUtil;
   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;
  @@ -38,7 +39,7 @@
    * A PackageFileSetImpl.
    * 
    * @author <a href="marshall at jboss.org">Marshall Culpepper</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class PackageFileSetImpl extends PackageNodeImpl implements
   		IPackageFileSet {
  @@ -232,7 +233,7 @@
   	public void setSingleFile(IPath path, String destinationFilename) {
   		Assert.isNotNull(path);
   		
  -		if (PackagesCorePlugin.isFileInWorkspace(path))
  +		if (ResourceUtil.isResourceInWorkspace(path))
   		{
   			setSingleFile(ResourcesPlugin.getWorkspace().getRoot().getFile(path), destinationFilename);
   		}
  @@ -269,7 +270,7 @@
   		Assert.isNotNull(path);
   		
   		filesetDelegate.setDir(path.toString());
  -		filesetDelegate.setInWorkspace(PackagesCorePlugin.isFolderInWorkspace(path));
  +		filesetDelegate.setInWorkspace(ResourceUtil.isResourceInWorkspace(path));
   	}
   	
   	public void setSourceProject(IProject project) {
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- PackageImpl.java	23 Feb 2007 17:30:06 -0000	1.14
  +++ PackageImpl.java	23 Feb 2007 18:36:06 -0000	1.15
  @@ -27,13 +27,12 @@
   
   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.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.core.util.ResourceUtil;
   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;
  @@ -47,7 +46,7 @@
    * A Package.
    * 
    * @author <a href="marshall at jboss.org">Marshall Culpepper</a>
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   public class PackageImpl extends PackageNodeImpl implements IPackage {
   
  @@ -194,7 +193,7 @@
   	}
   
   	public void setDestinationPath(IPath path) {
  -		packageDelegate.setInWorkspace(PackagesCorePlugin.isFolderInWorkspace(path));
  +		packageDelegate.setInWorkspace(ResourceUtil.isResourceInWorkspace(path));
   		packageDelegate.setToDir(path.toString());
   	}