[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
Mon Feb 26 14:12:03 EST 2007
User: mculpepper
Date: 07/02/26 14:12:03
Modified: core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal
PackageFileSetImpl.java
Log:
some bugfixes in getDestinationFilename and getSourcePath
Revision Changes Path
1.10 +298 -291 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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- PackageFileSetImpl.java 23 Feb 2007 21:22:01 -0000 1.9
+++ PackageFileSetImpl.java 26 Feb 2007 19:12:03 -0000 1.10
@@ -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.ProjectUtil;
import org.jboss.ide.eclipse.core.util.ResourceUtil;
import org.jboss.ide.eclipse.packages.core.PackagesCorePlugin;
import org.jboss.ide.eclipse.packages.core.model.DirectoryScannerFactory;
@@ -40,7 +41,7 @@
* A PackageFileSetImpl.
*
* @author <a href="marshall at jboss.org">Marshall Culpepper</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class PackageFileSetImpl extends PackageNodeImpl implements
IPackageFileSet {
@@ -78,8 +79,6 @@
public IPath[] findMatchingPaths (DirectoryScanner scanner)
{
- if (isInWorkspace()) return new IPath[0];
-
if (isSingleFile())
return new IPath[] { getFilePath() };
else
@@ -87,7 +86,14 @@
}
public String getDestinationFilename() {
- return filesetDelegate.getToFile();
+ String destFilename = filesetDelegate.getToFile();
+
+ if (destFilename == null)
+ {
+ return getFilePath().lastSegment();
+ }
+
+ return destFilename;
}
public String getExcludesPattern() {
@@ -124,7 +130,8 @@
public IPath getSourcePath() {
String path = filesetDelegate.getDir();
- if (path == null) return null;
+ if (filesetDelegate.getDir() == null || filesetDelegate.getDir().equals(".") || filesetDelegate.getDir().equals(""))
+ return ProjectUtil.getProjectLocation(getSourceProject());
return new Path(path);
}
More information about the jboss-cvs-commits
mailing list