Author: rob.stryker(a)jboss.com Date: 2007-05-01 15:30:18 -0400 (Tue, 01 May 2007) New Revision: 1981 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewEARAction.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewEJBJARAction.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewWARAction.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: Setting up ui for addition of ear, ejb types Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2007-05-01 18:54:19 UTC (rev 1980) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2007-05-01 19:30:18 UTC (rev 1981) @@ -54,7 +54,6 @@ org.apache.ant, org.jboss.ide.eclipse.as.core, org.jboss.ide.eclipse.firstrun, - org.jboss.ide.eclipse.ui, org.jboss.ide.eclipse.archives.core, org.jboss.ide.eclipse.archives.ui Eclipse-LazyStart: true Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewEARAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewEARAction.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewEARAction.java 2007-05-01 19:30:18 UTC (rev 1981) @@ -0,0 +1,92 @@ +package org.jboss.ide.eclipse.as.ui.packages; + +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.PlatformUI; +import org.jboss.ide.eclipse.archives.core.model.ArchivesCore; +import org.jboss.ide.eclipse.archives.core.model.IArchive; +import org.jboss.ide.eclipse.archives.core.model.IArchiveType; +import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages; +import org.jboss.ide.eclipse.archives.ui.actions.ActionWithDelegate; +import org.jboss.ide.eclipse.archives.ui.views.ProjectArchivesView; +import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard; +import org.jboss.ide.eclipse.as.core.packages.types.EarArchiveType; + +public class NewEARAction extends ActionWithDelegate { + + public void run() { + AbstractArchiveWizard wizard = new NewEARWizard(); + wizard.init(PlatformUI.getWorkbench(), ProjectArchivesView.getInstance().getSelection()); + WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard); + dialog.open(); + } + public IStructuredSelection getSelection() { + return ProjectArchivesView.getInstance().getSelection(); + } + + + public ImageDescriptor getImageDescriptor() { + return ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EJB_JAR); + } + + public String getText() { + return "EAR"; + } + + public String getToolTipText() { + return "Create a new EAR archive"; + } + + public void init(IViewPart view) { + + } + + public static class NewEARWizard extends AbstractArchiveWizard { + + private EARPreviewPage earInfoPage; + + public NewEARWizard () { + setWindowTitle("New EAR"); + } + + public ImageDescriptor getImageDescriptor() { + return ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EAR); + } + + public WizardPage[] createWizardPages() { + earInfoPage = new EARPreviewPage(this); + + return new WizardPage[] { earInfoPage }; + } + + public boolean performFinish(IArchive pkg) { + pkg.setArchiveType(ArchivesCore.getArchiveType(EarArchiveType.ID)); + return true; + } + + public String getArchiveExtension() { + return "jar"; + } + } + + + protected static class EARPreviewPage extends PreviewPage { + protected EARPreviewPage(NewEARWizard wiz) { + super(wiz, "EAR Preview", "EAR Preview", + ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EAR)); + } + protected void addToPackage() { + IArchiveType type = ArchivesCore.getArchiveType(EarArchiveType.ID); + type.fillDefaultConfiguration(wizard.getProject(), wizard.getArchive(), new NullProgressMonitor()); + } + + protected String getDescriptionMessage() { + return "Preview the EAR\n" + + "Later, you can customize this structure further."; + } + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewEJBJARAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewEJBJARAction.java 2007-05-01 18:54:19 UTC (rev 1980) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewEJBJARAction.java 2007-05-01 19:30:18 UTC (rev 1981) @@ -1,6 +1,8 @@ package org.jboss.ide.eclipse.as.ui.packages; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.ui.IViewActionDelegate; @@ -10,20 +12,23 @@ import org.jboss.ide.eclipse.archives.core.model.IArchive; import org.jboss.ide.eclipse.archives.core.model.IArchiveType; import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages; +import org.jboss.ide.eclipse.archives.ui.actions.ActionWithDelegate; import org.jboss.ide.eclipse.archives.ui.views.ProjectArchivesView; import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard; import org.jboss.ide.eclipse.as.core.packages.types.EjbArchiveType; -import org.jboss.ide.eclipse.as.ui.packages.NewWARAction.NewWARWizard; -import org.jboss.ide.eclipse.ui.util.ActionWithDelegate; public class NewEJBJARAction extends ActionWithDelegate implements IViewActionDelegate { public void run() { - NewWARWizard wizard = new NewWARWizard(); + AbstractArchiveWizard wizard = new NewEJBWizard(); wizard.init(PlatformUI.getWorkbench(), ProjectArchivesView.getInstance().getSelection()); WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard); dialog.open(); } + public IStructuredSelection getSelection() { + return ProjectArchivesView.getInstance().getSelection(); + } + public ImageDescriptor getImageDescriptor() { return ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EJB_JAR); @@ -77,7 +82,7 @@ } protected void addToPackage() { IArchiveType type = ArchivesCore.getArchiveType(EjbArchiveType.ID); - + type.fillDefaultConfiguration(wizard.getProject(), wizard.getArchive(), new NullProgressMonitor()); } protected String getDescriptionMessage() { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewWARAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewWARAction.java 2007-05-01 18:54:19 UTC (rev 1980) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewWARAction.java 2007-05-01 19:30:18 UTC (rev 1981) @@ -1,8 +1,8 @@ package org.jboss.ide.eclipse.as.ui.packages; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.ui.IViewActionDelegate; @@ -12,10 +12,10 @@ import org.jboss.ide.eclipse.archives.core.model.IArchive; import org.jboss.ide.eclipse.archives.core.model.IArchiveType; import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages; +import org.jboss.ide.eclipse.archives.ui.actions.ActionWithDelegate; import org.jboss.ide.eclipse.archives.ui.views.ProjectArchivesView; import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard; import org.jboss.ide.eclipse.as.core.packages.types.WarArchiveType; -import org.jboss.ide.eclipse.ui.util.ActionWithDelegate; public class NewWARAction extends ActionWithDelegate implements IViewActionDelegate { @@ -77,10 +77,8 @@ ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_WAR_WIZARD)); } protected void addToPackage() { - IArchiveType type = ArchivesCore.getArchiveType("org.jboss.ide.eclipse.as.core.packages.warPackage"); - if( type instanceof WarArchiveType ) { - ((WarArchiveType)type).fillDefaultConfiguration(wizard.getProject(), wizard.getArchive(), new NullProgressMonitor()); - } + IArchiveType type = ArchivesCore.getArchiveType(WarArchiveType.WAR_PACKAGE_TYPE); + type.fillDefaultConfiguration(wizard.getProject(), wizard.getArchive(), new NullProgressMonitor()); } protected String getDescriptionMessage() { @@ -89,4 +87,8 @@ } } + public IStructuredSelection getSelection() { + return ProjectArchivesView.getInstance().getSelection(); + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java 2007-05-01 18:54:19 UTC (rev 1980) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java 2007-05-01 19:30:18 UTC (rev 1981) @@ -57,7 +57,7 @@ protected abstract String getDescriptionMessage(); public void createControl(Composite parent) { - setMessage(getDescription()); + setMessage(getDescriptionMessage()); Composite main = new Composite(parent, SWT.NONE); main.setLayout(new FormLayout()); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2007-05-01 18:54:19 UTC (rev 1980) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2007-05-01 19:30:18 UTC (rev 1981) @@ -295,6 +295,11 @@ icon="icons/packages/EJBJar.gif" id="org.jboss.ide.eclipse.packages.ui.newEJBJarAction" label="EJB JAR"/> + <newPackageAction + class="org.jboss.ide.eclipse.as.ui.packages.NewEARAction" + icon="icons/packages/ear.gif" + id="org.jboss.ide.eclipse.packages.ui.newEARAction" + label="EAR"/> </extension> </plugin>