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

[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  
                        IPackageFileSet.java PackagesCore.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.5       +5 -5      jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/IPackageFileSet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: IPackageFileSet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/IPackageFileSet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- IPackageFileSet.java	14 Feb 2007 19:10:18 -0000	1.4
  +++ IPackageFileSet.java	17 Feb 2007 00:02:44 -0000	1.5
  @@ -32,7 +32,7 @@
    * </p>
    * 
    * @author <a href="marshall at jboss.org">Marshall Culpepper</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public interface IPackageFileSet extends IPackageNode {
   
  @@ -129,16 +129,16 @@
   	public void setSingleFile(IFile file, String destinationFilename);
   	
   	/**
  -	 * Set this fileset to be a single file in the filesystem
  +	 * Set this fileset to be a single file represented by the passed-in IPath.
   	 * Equivalent to:
   	 * <code>setSingleFile(path, null);</code>
  -	 * @param path An absolute path to a file on the filesystem 
  +	 * @param path Either an absolute path to a file on the filesystem, or a workspace-relative path. 
   	 */
   	public void setSingleFile(IPath path);
   	
   	/**
  -	 * Set this fileset to be a single file in the filesystem, using the specified destination filename
  -	 * @param path An absolute path to a file on the filesystem
  +	 * Set this fileset to be a single file, using the specified destination filename
  +	 * @param path Either an absolute path to a file on the filesystem, or a workspace-relative path.
   	 * @param destinationFilename The filename that the file will be called in the package
   	 */
   	public void setSingleFile(IPath path, String destinationFilename);
  
  
  
  1.14      +5 -2      jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/PackagesCore.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesCore.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/PackagesCore.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- PackagesCore.java	15 Feb 2007 22:45:50 -0000	1.13
  +++ PackagesCore.java	17 Feb 2007 00:02:44 -0000	1.14
  @@ -315,11 +315,14 @@
   		for (Iterator iter = packages.iterator(); iter.hasNext(); )
   		{
   			IPackage pkg = (IPackage) iter.next();
  +			if (pkg.isDestinationInWorkspace())
  +			{
   			if (pkg.getPackageFile().equals(file))
   			{
   				return pkg;
   			}
   		}
  +		}
   		
   		return null;
   	}