Author: rob.stryker(a)jboss.com
Date: 2011-06-03 08:32:47 -0400 (Fri, 03 Jun 2011)
New Revision: 31807
Modified:
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
JBIDE-8952 part 2 for UI
Modified:
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
---
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2011-06-03
11:55:53 UTC (rev 31806)
+++
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2011-06-03
12:32:47 UTC (rev 31807)
@@ -304,8 +304,12 @@
DirectoryScannerExtension ds = null;
Runnable r;
try {
+ String effectiveExcludes = excludes;
+ if( parentNode.getRootArchive().isDestinationInWorkspace()) {
+ effectiveExcludes += "," +
parentNode.getRootArchive().getRawDestinationPath(); //$NON-NLS-1$
+ }
ds = DirectoryScannerFactory.createDirectoryScanner(
- replaceVariables(), null, includes, excludes, parentNode.getProjectName(),
+ replaceVariables(), null, includes, effectiveExcludes,
parentNode.getProjectName(),
srcDestComposite.isWorkspaceRelative(),
parentNode.getModelRootNode().getDescriptorVersion(), false);
Iterator<File> it = ds.iterator();
ArrayList<String> paths2 = new ArrayList<String>();
Show replies by date