Author: rob.stryker(a)jboss.com
Date: 2007-05-09 13:23:39 -0400 (Wed, 09 May 2007)
New Revision: 2019
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveNodeDestinationComposite.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
big errors in fileset getting paths such as
c:\eclipse\install\workspacename\eclipse\install\workspacename\relativepath
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveNodeDestinationComposite.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveNodeDestinationComposite.java 2007-05-09
16:47:07 UTC (rev 2018)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveNodeDestinationComposite.java 2007-05-09
17:23:39 UTC (rev 2019)
@@ -113,7 +113,7 @@
protected void openDestinationDialog ()
{
- ArchiveNodeDestinationDialog dialog = new ArchiveNodeDestinationDialog(getShell(),
nodeDestination, true, true);
+ ArchiveNodeDestinationDialog dialog = new ArchiveNodeDestinationDialog(getShell(),
nodeDestination, false, true);
if (nodeDestination != null)
dialog.setInitialSelection(nodeDestination);
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java 2007-05-09
16:47:07 UTC (rev 2018)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java 2007-05-09
17:23:39 UTC (rev 2019)
@@ -2,6 +2,7 @@
import java.lang.reflect.InvocationTargetException;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -56,8 +57,13 @@
private void fillFilesetFromPage (IArchiveFileSet fileset) {
fileset.setExcludesPattern(page1.getExcludes());
fileset.setIncludesPattern(page1.getIncludes());
- fileset.setSourcePath(new Path(page1.getRootDir()));
- fileset.setInWorkspace(page1.isRootDirWorkspaceRelative());
+ if( page1.isRootDirWorkspaceRelative()) {
+ int workspaceLength =
ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString().length();
+ fileset.setSourcePath(new Path(page1.getRootDir().substring(workspaceLength)));
+ } else {
+ fileset.setSourcePath(new Path(page1.getRootDir()));
+ fileset.setInWorkspace(false);
+ }
}
public void addPages() {
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2007-05-09
16:47:07 UTC (rev 2018)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2007-05-09
17:23:39 UTC (rev 2019)
@@ -49,7 +49,7 @@
* This variable must at all times be global. ALWAYS
*/
private IPath rootDir;
- private boolean rootDirIsWorkspaceRelative, fileIsWorkspaceRelative;
+ private boolean rootDirIsWorkspaceRelative;
private FilesetPreviewComposite previewComposite;
private Composite mainComposite;
@@ -277,10 +277,6 @@
return rootDirIsWorkspaceRelative;
}
- public boolean isFileWorkspaceRelative () {
- return fileIsWorkspaceRelative;
- }
-
private void fillDefaults () {
if (fileset != null) {
if (fileset.getIncludesPattern() != null)
@@ -295,7 +291,6 @@
}
} else {
rootProjectLabel.setText(parentNode.getProject().getName());
- fileIsWorkspaceRelative = true;
rootDirIsWorkspaceRelative = true;
rootDir =
ResourcesPlugin.getWorkspace().getRoot().getProject(parentNode.getProject().getName()).getLocation();
}
Show replies by date