Author: rob.stryker(a)jboss.com Date: 2011-06-03 04:23:28 -0400 (Fri, 03 Jun 2011) New Revision: 31797 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java Log: JBIDE-8303 - archive wizard's "perform finish" is inactive on page1 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java 2011-06-03 06:08:10 UTC (rev 31796) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEARAction.java 2011-06-03 08:23:28 UTC (rev 31797) @@ -27,6 +27,7 @@ import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard; import org.jboss.ide.eclipse.archives.webtools.Messages; import org.jboss.ide.eclipse.archives.webtools.archivetypes.EarArchiveType; +import org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType; public class NewEARAction implements IActionDelegate { @@ -85,11 +86,9 @@ super(wiz, Messages.EarPreview, Messages.EarPreview, ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EAR)); } - protected void addToPackage() { - IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(EarArchiveType.ID); - type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor()); + protected String getArchiveTypeId() { + return EarArchiveType.ID; } - protected String getDescriptionMessage() { return Messages.EarDescription; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java 2011-06-03 06:08:10 UTC (rev 31796) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewEJBJARAction.java 2011-06-03 08:23:28 UTC (rev 31797) @@ -25,6 +25,7 @@ import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages; import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard; import org.jboss.ide.eclipse.archives.webtools.Messages; +import org.jboss.ide.eclipse.archives.webtools.archivetypes.EarArchiveType; import org.jboss.ide.eclipse.archives.webtools.archivetypes.EjbArchiveType; public class NewEJBJARAction implements IActionDelegate { @@ -79,11 +80,9 @@ super(wiz, Messages.EjbJarPreview, Messages.EjbJarPreview, ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_JAR_WIZARD)); } - protected void addToPackage() { - IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(EjbArchiveType.ID); - type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor()); + protected String getArchiveTypeId() { + return EjbArchiveType.ID; } - protected String getDescriptionMessage() { return Messages.EjbJarDescription; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java 2011-06-03 06:08:10 UTC (rev 31796) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/NewWARAction.java 2011-06-03 08:23:28 UTC (rev 31797) @@ -79,9 +79,9 @@ super(wiz, Messages.WarPreview, Messages.WarPreview, ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_WAR_WIZARD)); } - protected void addToPackage() { - IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(WarArchiveType.WAR_PACKAGE_TYPE); - type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor()); + + protected String getArchiveTypeId() { + return WarArchiveType.WAR_PACKAGE_TYPE; } protected String getDescriptionMessage() { Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java 2011-06-03 06:08:10 UTC (rev 31796) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java 2011-06-03 08:23:28 UTC (rev 31797) @@ -21,6 +21,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; @@ -41,13 +42,16 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.wst.server.core.IModuleArtifact; import org.eclipse.wst.server.core.internal.ServerPlugin; +import org.jboss.ide.eclipse.archives.core.ArchivesCore; import org.jboss.ide.eclipse.archives.core.model.IArchive; import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder; +import org.jboss.ide.eclipse.archives.core.model.IArchiveType; import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate; import org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider; import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard; import org.jboss.ide.eclipse.archives.ui.wizards.WizardPageWithNotification; import org.jboss.ide.eclipse.archives.webtools.Messages; +import org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType; public abstract class PreviewPage extends WizardPageWithNotification { @@ -97,13 +101,10 @@ protected void fillGroups() { } public boolean isPageComplete() { - return hasCreated; + return true; } public void pageEntered(int button) { - if( !hasCreated ) { - addToPackage(); - hasCreated = true; - } + addToPackage(); fillWidgets(wizard.getArchive()); // if it's already a module type project, hide the meta inf stuff @@ -117,7 +118,17 @@ getWizard().getContainer().updateButtons(); } - protected abstract void addToPackage(); + protected void addToPackage() { + if( !hasCreated ) { + hasCreated = true; + String archiveTypeId = getArchiveTypeId(); + IArchiveType type = ArchivesCore.getInstance().getExtensionManager().getArchiveType(archiveTypeId); + type.fillDefaultConfiguration(wizard.getProject().getName(), wizard.getArchive(), new NullProgressMonitor()); + } + } + + protected abstract String getArchiveTypeId(); + protected void fillWidgets(IArchive pkg) { previewViewer.setInput(pkg); previewViewer.expandAll(); @@ -135,7 +146,9 @@ return result; } - public void pageExited(int button) {} + public void pageExited(int button) { + addToPackage(); + }