Author: rob.stryker(a)jboss.com Date: 2007-06-15 13:03:18 -0400 (Fri, 15 Jun 2007) New Revision: 2134 Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java Log: ui cleanup Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java 2007-06-15 17:01:54 UTC (rev 2133) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java 2007-06-15 17:03:18 UTC (rev 2134) @@ -1,6 +1,7 @@ package org.jboss.ide.eclipse.archives.ui.wizards.pages; import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -141,13 +142,16 @@ if (archive.isTopLevel()) { // TODO: FIX THIS - destinationComposite.setPackageNodeDestination(archive.getDestinationPath()); + IContainer container = ResourcesPlugin.getWorkspace().getRoot().getContainerForLocation(archive.getGlobalDestinationPath()); + if( container != null ) + destinationComposite.setPackageNodeDestination(container); + else + destinationComposite.setPackageNodeDestination(archive.getGlobalDestinationPath()); } else { destinationComposite.setPackageNodeDestination(archive.getParent()); } - if (archive.isExploded()) - { + if (archive.isExploded()) { explodedButton.setEnabled(true); } else { compressedButton.setEnabled(true); @@ -194,7 +198,7 @@ for( int i = 0; i < packages.length; i++ ) { IArchive pkg = (IArchive) packages[i]; if (pkg.getName().equals(packageNameText.getText()) - && (pkg.getDestinationPath() != null && pkg.getDestinationPath().equals(container.getFullPath())) + && (pkg.getGlobalDestinationPath() != null && pkg.getGlobalDestinationPath().equals(container.getFullPath())) && (!pkg.equals(this.archive))) { setErrorMessage( @@ -212,7 +216,7 @@ for( int i = 0; i < packages.length; i++ ) { IArchive pkg = (IArchive) packages[i]; if (pkg.getName().equals(packageNameText.getText()) - && (pkg.getDestinationPath() != null && pkg.getDestinationPath().equals(path)) + && (pkg.getGlobalDestinationPath() != null && pkg.getGlobalDestinationPath().equals(path)) && (!pkg.equals(this.archive))) { setErrorMessage( 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-06-15 17:01:54 UTC (rev 2133) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2007-06-15 17:03:18 UTC (rev 2134) @@ -155,8 +155,8 @@ Label projectImageLabel = new Label(rootProjectVal, SWT.NONE); rootProjectLabel = new Label(rootProjectVal, SWT.NONE); - projectImageLabel.setLayoutData(createFormData(0,0,null,0,0,5, null,0)); - rootProjectLabel.setLayoutData(createFormData(0,0,null,0,projectImageLabel, 5, 100,-5)); + projectImageLabel.setLayoutData(createFormData(0,0,null,0,0,0, null,0)); + rootProjectLabel.setLayoutData(createFormData(0,0,null,0,projectImageLabel, 10, 100,-5)); rootProjectKey.setLayoutData(createFormData(destinationComposite,5,null,0,null,5,0,max)); rootProjectVal.setLayoutData(createFormData(destinationComposite,5, null, 0, destinationKey, 5, 100, -5));