[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal ...
Marshall Culpepper
mculpepper at jboss.com
Wed Feb 14 14:10:18 EST 2007
User: mculpepper
Date: 07/02/14 14:10:18
Modified: core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal
PackageReferenceImpl.java PackageFileSetImpl.java
PackageImpl.java PackageBuildDelegate.java
Log:
changed getXXFolder to getXXPath (path is agnostic and doesnt' care if the root is filesystem based or not)
Revision Changes Path
1.3 +4 -4 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PackageReferenceImpl.java 14 Feb 2007 17:52:06 -0000 1.2
+++ PackageReferenceImpl.java 14 Feb 2007 19:10:18 -0000 1.3
@@ -130,8 +130,8 @@
return pkg.getDestinationContainer();
}
- public IPath getDestinationFolder() {
- return pkg.getDestinationFolder();
+ public IPath getDestinationPath() {
+ return pkg.getDestinationPath();
}
public IPackageFileSet[] getFileSets() {
@@ -218,8 +218,8 @@
pkg.setDestinationContainer(container);
}
- public void setDestinationFolder(IPath path) {
- pkg.setDestinationFolder(path);
+ public void setDestinationPath(IPath path) {
+ pkg.setDestinationPath(path);
}
public void setExploded(boolean exploded) {
1.5 +9 -10 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PackageFileSetImpl.java 9 Feb 2007 19:07:04 -0000 1.4
+++ PackageFileSetImpl.java 14 Feb 2007 19:10:18 -0000 1.5
@@ -24,6 +24,7 @@
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;
@@ -37,7 +38,7 @@
* A PackageFileSetImpl.
*
* @author <a href="marshall at jboss.org">Marshall Culpepper</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class PackageFileSetImpl extends PackageNodeImpl implements
IPackageFileSet {
@@ -80,7 +81,7 @@
if (isSingleFile())
return new IPath[] { getFilePath() };
else
- return PackagesCore.findMatchingPaths(scanner, getSourceFolder(), getIncludesPattern(), getExcludesPattern());
+ return PackagesCore.findMatchingPaths(scanner, getSourcePath(), getIncludesPattern(), getExcludesPattern());
}
public String getDestinationFilename() {
@@ -121,10 +122,7 @@
return getSourceProject().getFolder(filesetDelegate.getDir());
}
- public IPath getSourceFolder() {
- if (isInWorkspace())
- return null;
-
+ public IPath getSourcePath() {
String path = filesetDelegate.getDir();
if (path == null) return null;
@@ -167,7 +165,7 @@
for (int i = 0; i < paths.length; i++)
{
- if (getSourceFolder().append(paths[i]).equals(path))
+ if (getSourcePath().append(paths[i]).equals(path))
{
return true;
}
@@ -203,7 +201,7 @@
getSourceContainer(), getIncludesPattern(), getExcludesPattern(), scan);
} else {
return PackagesModel.createDirectoryScanner(
- getSourceFolder(), getIncludesPattern(), getExcludesPattern(), scan);
+ getSourcePath(), getIncludesPattern(), getExcludesPattern(), scan);
}
}
}
@@ -264,11 +262,12 @@
filesetDelegate.setInWorkspace(true);
}
- public void setSourceFolder (IPath path) {
+ public void setSourcePath (IPath path) {
Assert.isNotNull(path);
+ IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
filesetDelegate.setDir(path.toString());
- filesetDelegate.setInWorkspace(false);
+ filesetDelegate.setInWorkspace(folder != null);
}
public void setSourceProject(IProject project) {
1.10 +8 -7 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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- PackageImpl.java 14 Feb 2007 18:52:14 -0000 1.9
+++ PackageImpl.java 14 Feb 2007 19:10:18 -0000 1.10
@@ -26,6 +26,7 @@
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;
@@ -44,7 +45,7 @@
* A Package.
*
* @author <a href="marshall at jboss.org">Marshall Culpepper</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class PackageImpl extends PackageNodeImpl implements IPackage {
@@ -77,9 +78,7 @@
return ResourcesPlugin.getWorkspace().getRoot().getContainerForLocation(new Path(packageDelegate.getToDir()));
}
- public IPath getDestinationFolder () {
- if (isDestinationInWorkspace()) return null;
-
+ public IPath getDestinationPath () {
String path = packageDelegate.getToDir();
if (path == null) return null;
@@ -123,7 +122,7 @@
public IPath getPackageFilePath() {
if (!isDestinationInWorkspace()) {
- return getDestinationFolder().append(new Path(getName()));
+ return getDestinationPath().append(new Path(getName()));
} else return null;
}
@@ -178,8 +177,10 @@
addChild(pkg);
}
- public void setDestinationFolder(IPath path) {
- packageDelegate.setInWorkspace(false);
+ public void setDestinationPath(IPath path) {
+ IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
+
+ packageDelegate.setInWorkspace(folder != null);
packageDelegate.setToDir(path.toString());
}
1.10 +2 -2 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageBuildDelegate.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageBuildDelegate.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageBuildDelegate.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- PackageBuildDelegate.java 9 Feb 2007 21:53:20 -0000 1.9
+++ PackageBuildDelegate.java 14 Feb 2007 19:10:18 -0000 1.10
@@ -570,7 +570,7 @@
IPath subPath = topLevelPackage.getDestinationContainer().getProjectRelativePath();
root = new File(projectPath.append(subPath).toFile());
} else {
- root = new File(topLevelPackage.getDestinationFolder().toFile());
+ root = new File(topLevelPackage.getDestinationPath().toFile());
}
for (Iterator iter = parents.iterator(); iter.hasNext(); )
@@ -651,7 +651,7 @@
private IPath getPathDestinationPath (IPath path, IPackageFileSet fileset)
{
- IPath copyTo = path.removeFirstSegments(fileset.getSourceFolder().segmentCount()).removeLastSegments(1);
+ IPath copyTo = path.removeFirstSegments(fileset.getSourcePath().segmentCount()).removeLastSegments(1);
copyTo = copyTo.append(path.lastSegment());
copyTo = copyTo.setDevice(null);
More information about the jboss-cvs-commits
mailing list