Author: rob.stryker(a)jboss.com
Date: 2012-09-24 21:36:57 -0400 (Mon, 24 Sep 2012)
New Revision: 43982
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
JBIDE-12494 to trunk
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2012-09-24
19:04:33 UTC (rev 43981)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2012-09-25
01:36:57 UTC (rev 43982)
@@ -66,9 +66,6 @@
// Get an absolute path, workspace-absolute or fs-absolute
public static String getAbsoluteLocation(String expression,
String projectName, boolean inWorkspace, double version) {
- if( inWorkspace && projectName == null )
- return null;
-
if( inWorkspace && ("".equals(expression) ||
".".equals(expression))) //$NON-NLS-1$ //$NON-NLS-2$
return new Path(projectName).makeAbsolute().toString();
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2012-09-24
19:04:33 UTC (rev 43981)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2012-09-25
01:36:57 UTC (rev 43982)
@@ -303,7 +303,6 @@
if( parentNode.getRootArchive().isDestinationInWorkspace()) {
effectiveExcludes += "," +
parentNode.getRootArchive().getRawDestinationPath(); //$NON-NLS-1$
}
- System.out.println(6);
IPath parentRelativeToRoot = parentNode.getRootArchiveRelativePath();
ds = DirectoryScannerFactory.createDirectoryScanner(
replaceVariables(), parentRelativeToRoot, includes, effectiveExcludes,
parentNode.getProjectName(),
Show replies by date