[jbosstools-commits] JBoss Tools SVN: r43928 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-09-21 09:53:50 -0400 (Fri, 21 Sep 2012)
New Revision: 43928

Modified:
   trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
JBIDE-12659

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-21 13:37:27 UTC (rev 43927)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java	2012-09-21 13:53:50 UTC (rev 43928)
@@ -10,7 +10,6 @@
  ******************************************************************************/
 package org.jboss.ide.eclipse.archives.ui.wizards.pages;
 
-import java.awt.FlowLayout;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -25,15 +24,11 @@
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
@@ -308,8 +303,10 @@
 				if( parentNode.getRootArchive().isDestinationInWorkspace()) {
 					effectiveExcludes += "," + parentNode.getRootArchive().getRawDestinationPath(); //$NON-NLS-1$
 				}
-				ds = DirectoryScannerFactory.createDirectoryScanner(
-						replaceVariables(), null, includes, effectiveExcludes, parentNode.getProjectName(),
+				System.out.println(6);
+				IPath parentRelativeToRoot = parentNode.getRootArchiveRelativePath();
+				ds = DirectoryScannerFactory.createDirectoryScanner( 
+						replaceVariables(), parentRelativeToRoot, includes, effectiveExcludes, parentNode.getProjectName(),
 						srcDestComposite.isWorkspaceRelative(), parentNode.getModelRootNode().getDescriptorVersion(), false);
 				Iterator<File> it = ds.iterator();
 				ArrayList<String> paths2 = new ArrayList<String>();
@@ -333,6 +330,7 @@
 					}
 				};
 			} catch( Exception e ) {
+				e.printStackTrace(); 
 				r = new Runnable() {
 					public void run() {
 						previewComposite.setInput(new IPath[0]);