Author: rob.stryker(a)jboss.com Date: 2008-04-08 17:29:49 -0400 (Tue, 08 Apr 2008) New Revision: 7437 Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java Log: Filesets JBIDE-943 Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-04-08 19:39:20 UTC (rev 7436) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-04-08 21:29:49 UTC (rev 7437) @@ -239,7 +239,11 @@ * @see org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet#getPathRelativeToParent(org.eclipse.core.runtime.IPath) */ public IPath getPathRelativeToParent(IPath inputFile) { - String s = inputFile.toOSString().substring(getGlobalSourcePath().toOSString().length()+1); + String s; + if( isFlattened() ) + s = inputFile.toOSString().substring(getGlobalSourcePath().toOSString().length()+1); + else + s = inputFile.lastSegment(); return new Path(s); } Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2008-04-08 19:39:20 UTC (rev 7436) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2008-04-08 21:29:49 UTC (rev 7437) @@ -39,6 +39,7 @@ import org.jboss.ide.eclipse.archives.core.model.IArchiveNode; import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeVisitor; import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger; +import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveActionImpl; import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveFileSetImpl; import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveFolderImpl; import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveImpl; @@ -157,6 +158,7 @@ if( fileset.equals(filesets[i])) continue; relativePathsMatch = fileset.getRootArchiveRelativePath(path).equals(filesets[i].getRootArchiveRelativePath(path)); destinationsMatch = fileset.getRootArchive().getArchiveFilePath().equals(filesets[i].getRootArchive().getArchiveFilePath()); + if( relativePathsMatch && destinationsMatch ) { // the two put the file in the same spot, within the same archive! It's a match! return true; @@ -252,7 +254,7 @@ } else if (node instanceof XbFileSet) { nodeImpl = new ArchiveFileSetImpl((XbFileSet)node); } else if( node instanceof XbAction ) { - nodeImpl = null; // TODO + nodeImpl = new ArchiveActionImpl((XbAction)node); } for (Iterator iter = node.getAllChildren().iterator(); iter.hasNext(); ) {