Author: rob.stryker(a)jboss.com Date: 2008-08-18 15:18:12 -0400 (Mon, 18 Aug 2008) New Revision: 9779 Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java Log: JBIDE-2651 JBIDE-2652 For 2652, it was a simple error in greater-than vs less than. Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-08-18 17:31:44 UTC (rev 9778) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-08-18 19:18:12 UTC (rev 9779) @@ -34,6 +34,7 @@ import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.jboss.ide.eclipse.archives.core.ArchivesCore; +import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode; import org.jboss.ide.eclipse.archives.core.model.IArchiveNode; import org.jboss.ide.eclipse.archives.core.model.INamedContainerArchiveNode; import org.jboss.ide.eclipse.archives.core.util.PathUtils; @@ -166,7 +167,8 @@ } else if( result instanceof IContainer ) { destinationNode = null; IPath tmpPath = ((IContainer)result).getFullPath(); - if( tmpPath.segment(0).equals(projectName) && getDescriptorVersion() < 2.0) + if( tmpPath.segment(0).equals(projectName) && + getDescriptorVersion() >= IArchiveModelRootNode.DESCRIPTOR_VERSION_1_2) path = tmpPath.removeFirstSegments(1).makeRelative().toString(); else path = ((IContainer)result).getFullPath().makeAbsolute().toString(); Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java 2008-08-18 17:31:44 UTC (rev 9778) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java 2008-08-18 19:18:12 UTC (rev 9779) @@ -20,6 +20,8 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.navigator.CommonNavigator; +import org.eclipse.ui.views.properties.IPropertySheetPage; +import org.eclipse.ui.views.properties.PropertySheetPage; import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate; import org.jboss.ide.eclipse.archives.core.model.IArchive; import org.jboss.ide.eclipse.archives.core.model.IArchiveNode; @@ -133,4 +135,10 @@ return selection.getFirstElement(); return null; } + + public Object getAdapter(Class adapter) { + if( adapter == IPropertySheetPage.class ) + return new PropertySheetPage(); + return super.getAdapter(adapter); + } } 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 2008-08-18 17:31:44 UTC (rev 9778) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java 2008-08-18 19:18:12 UTC (rev 9779) @@ -256,7 +256,7 @@ IPath loc = wizard.getProject().getLocation(); if( ArchivesModel.instance().isProjectRegistered(loc)) return ArchivesModel.instance().getRoot(loc).getDescriptorVersion(); - return (float)2.0; + return IArchiveModelRootNode.DESCRIPTOR_VERSION_LATEST; } // Getters for the wizard to call