[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:53:59

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal  
                        PackageReferenceImpl.java PackageImpl.java
  Log:
  IPackage.getPackageFile() has been changed to IPackage.getPackageResource(), since an IPackage can either be exploded (IFolder) or compressed (IFile)
  
  Revision  Changes    Path
  1.6       +4 -3      jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageReferenceImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageReferenceImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageReferenceImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- PackageReferenceImpl.java	28 Feb 2007 23:21:11 -0000	1.5
  +++ PackageReferenceImpl.java	2 Mar 2007 21:53:59 -0000	1.6
  @@ -5,6 +5,7 @@
   import org.eclipse.core.resources.IContainer;
   import org.eclipse.core.resources.IFile;
   import org.eclipse.core.resources.IProject;
  +import org.eclipse.core.resources.IResource;
   import org.eclipse.core.runtime.IPath;
   import org.eclipse.core.runtime.Path;
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
  @@ -45,7 +46,7 @@
   		if (pkg.isDestinationInWorkspace())
   		{
   			refPath += "/workspace";
  -			IFile pkgFile = pkg.getPackageFile();
  +			IResource pkgFile = pkg.getPackageResource();
   			
   			refPath += pkgFile.getFullPath().toString();
   		}
  @@ -153,8 +154,8 @@
   		return pkg.getName();
   	}
   
  -	public IFile getPackageFile() {
  -		return pkg.getPackageFile();
  +	public IResource getPackageResource() {
  +		return pkg.getPackageResource();
   	}
   
   	public IPath getPackageFilePath() {
  
  
  
  1.20      +11 -3     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.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- PackageImpl.java	1 Mar 2007 23:47:08 -0000	1.19
  +++ PackageImpl.java	2 Mar 2007 21:53:59 -0000	1.20
  @@ -28,6 +28,7 @@
   import org.eclipse.core.resources.IContainer;
   import org.eclipse.core.resources.IFile;
   import org.eclipse.core.resources.IProject;
  +import org.eclipse.core.resources.IResource;
   import org.eclipse.core.resources.ResourcesPlugin;
   import org.eclipse.core.runtime.CoreException;
   import org.eclipse.core.runtime.IPath;
  @@ -48,7 +49,7 @@
    * A Package.
    * 
    * @author <a href="marshall at jboss.org">Marshall Culpepper</a>
  - * @version $Revision: 1.19 $
  + * @version $Revision: 1.20 $
    */
   public class PackageImpl extends PackageNodeImpl implements IPackage {
   
  @@ -123,9 +124,16 @@
   		return ExtensionManager.getPackageType(packageDelegate.getPackageType());
   	}
   	
  -	public IFile getPackageFile() {
  +	public IResource getPackageResource() {
   		if (isDestinationInWorkspace()) {
  +			// use getFile/getFolder to for resource handles (never return null unless we're out of workspace)
  +			if (isExploded())
  +			{
  +				return getDestinationContainer().getFolder(new Path(getName()));
  +			} else {
   			return getDestinationContainer().getFile(new Path(getName()));
  +			}
  +//			return getDestinationContainer().findMember(getName());
   		} else return null;
   	}