Author: rob.stryker(a)jboss.com Date: 2008-08-18 18:36:27 -0400 (Mon, 18 Aug 2008) New Revision: 9785 Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelRootNode.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IVariableManager.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java Log: JBIDE-2651 JBIDE-2652 UUGGH forgot to commit core. Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelRootNode.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelRootNode.java 2008-08-18 21:22:14 UTC (rev 9784) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelRootNode.java 2008-08-18 22:36:27 UTC (rev 9785) @@ -35,6 +35,7 @@ public interface IArchiveModelRootNode extends IArchiveNode { public static final double DESCRIPTOR_VERSION_1_0 = 1.0; public static final double DESCRIPTOR_VERSION_1_2 = 1.2; + public static final double DESCRIPTOR_VERSION_LATEST = DESCRIPTOR_VERSION_1_2; public void setModel(IArchiveModel model); public IArchiveModel getModel(); Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IVariableManager.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IVariableManager.java 2008-08-18 21:22:14 UTC (rev 9784) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IVariableManager.java 2008-08-18 22:36:27 UTC (rev 9785) @@ -26,7 +26,7 @@ * */ public interface IVariableManager { - public static final String CURRENT_PROJECT = "current.project"; + public static final String CURRENT_PROJECT = "archives_current_project"; public boolean containsVariable(String variable); public String getVariableValue(String variable); public String[] getVariableNames(); Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2008-08-18 21:22:14 UTC (rev 9784) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2008-08-18 22:36:27 UTC (rev 9785) @@ -56,7 +56,7 @@ public static String getAbsoluteLocation(String expression, String projectName, boolean inWorkspace, double version) { - if( "".equals(expression) || ".".equals(expression)) + if( inWorkspace && ("".equals(expression) || ".".equals(expression))) return new Path(projectName).makeAbsolute().toString(); try {