Author: mculpepper(a)jboss.com Date: 2007-05-21 19:49:37 -0400 (Mon, 21 May 2007) New Revision: 2043 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/ArchiveImpl.java Log: refactored getWorkspacePath to getProjectPath(project) 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 2007-05-21 23:48:05 UTC (rev 2042) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2007-05-21 23:49:37 UTC (rev 2043) @@ -31,6 +31,7 @@ import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet; import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension; import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbFileSet; +import org.jboss.ide.eclipse.archives.core.util.ModelUtil; /** * An implementation for filesets @@ -98,7 +99,7 @@ if (path == null || path.equals(".") || path.equals("")) { return getProjectPath() == null ? null : getProjectPath(); } else if( isInWorkspace()){ - return ArchivesCore.getInstance().getVariables().getWorkspacePath().append(path); + return ModelUtil.workspacePathToAbsolutePath(new Path(path)); } else { return new Path(path); } Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java 2007-05-21 23:48:05 UTC (rev 2042) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java 2007-05-21 23:49:37 UTC (rev 2043) @@ -31,6 +31,7 @@ import org.jboss.ide.eclipse.archives.core.model.IArchiveType; import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackage; import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackages; +import org.jboss.ide.eclipse.archives.core.util.ModelUtil; /** * An archive @@ -71,7 +72,7 @@ return getProjectPath() == null ? null : getProjectPath(); if (isDestinationInWorkspace()) { - return ArchivesCore.getInstance().getVariables().getWorkspacePath().append(new Path(packageDelegate.getToDir())); + return ModelUtil.workspacePathToAbsolutePath(new Path(packageDelegate.getToDir())); } else return new Path(packageDelegate.getToDir()); }