Author: rob.stryker(a)jboss.com Date: 2008-08-01 20:40:16 -0400 (Fri, 01 Aug 2008) New Revision: 9477 Modified: 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/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 Log: JBIDE-460 - archives view in common nav Modified: 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 2008-08-02 00:40:00 UTC (rev 9476) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewEARAction.java 2008-08-02 00:40:16 UTC (rev 9477) @@ -22,48 +22,43 @@ package org.jboss.ide.eclipse.as.ui.packages; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; 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.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.extensions.archives.EarArchiveType; -public class NewEARAction extends ActionWithDelegate { +public class NewEARAction implements IActionDelegate { + private IStructuredSelection selection; public void run() { AbstractArchiveWizard wizard = new NewEARWizard(); - wizard.init(PlatformUI.getWorkbench(), ProjectArchivesView.getInstance().getSelection()); + wizard.init(PlatformUI.getWorkbench(), selection); 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 void run(IAction action) { + run(); } - - public String getText() { - return "EAR"; + + public void selectionChanged(IAction action, ISelection selection) { + if( selection instanceof IStructuredSelection) + this.selection = (IStructuredSelection)selection; } - public String getToolTipText() { - return "Create a new EAR archive"; - } - public void init(IViewPart view) { - } public static class NewEARWizard extends AbstractArchiveWizard { 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 2008-08-02 00:40:00 UTC (rev 9476) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewEJBJARAction.java 2008-08-02 00:40:16 UTC (rev 9477) @@ -22,50 +22,38 @@ package org.jboss.ide.eclipse.as.ui.packages; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.ui.IViewActionDelegate; -import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.PlatformUI; 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.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.extensions.archives.EjbArchiveType; -public class NewEJBJARAction extends ActionWithDelegate implements IViewActionDelegate { - +public class NewEJBJARAction implements IActionDelegate { + private IStructuredSelection selection; public void run() { AbstractArchiveWizard wizard = new NewEJBWizard(); - wizard.init(PlatformUI.getWorkbench(), ProjectArchivesView.getInstance().getSelection()); + wizard.init(PlatformUI.getWorkbench(), selection); WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard); dialog.open(); } - public IStructuredSelection getSelection() { - return ProjectArchivesView.getInstance().getSelection(); + + public void run(IAction action) { + run(); } - - public ImageDescriptor getImageDescriptor() { - return ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_EJB_JAR); + public void selectionChanged(IAction action, ISelection selection) { + if( selection instanceof IStructuredSelection) + this.selection = (IStructuredSelection)selection; } - - public String getText() { - return "EJB JAR"; - } - - public String getToolTipText() { - return "Create a new EJB JAR archive"; - } - - public void init(IViewPart view) { - - } public static class NewEJBWizard extends AbstractArchiveWizard { 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 2008-08-02 00:40:00 UTC (rev 9476) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/NewWARAction.java 2008-08-02 00:40:16 UTC (rev 9477) @@ -22,47 +22,41 @@ package org.jboss.ide.eclipse.as.ui.packages; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.ui.IViewActionDelegate; +import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; 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.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.extensions.archives.WarArchiveType; -public class NewWARAction extends ActionWithDelegate implements IViewActionDelegate { - +public class NewWARAction implements IActionDelegate { + private IStructuredSelection selection; public void run() { NewWARWizard wizard = new NewWARWizard(); - wizard.init(PlatformUI.getWorkbench(), ProjectArchivesView.getInstance().getSelection()); + wizard.init(PlatformUI.getWorkbench(), selection); WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard); dialog.open(); } - - public ImageDescriptor getImageDescriptor() { - return ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_WAR); + + public void run(IAction action) { + run(); } - - public String getText() { - return "WAR"; + + public void selectionChanged(IAction action, ISelection selection) { + if( selection instanceof IStructuredSelection) + this.selection = (IStructuredSelection)selection; } + - public String getToolTipText() { - return "Create a new WAR archive"; - } - - public void init(IViewPart view) { - - } - public static class NewWARWizard extends AbstractArchiveWizard { private WarPreviewPage warInfoPage; @@ -107,9 +101,4 @@ "You can customize this structure further after pressing finish."; } } - - 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 2008-08-02 00:40:00 UTC (rev 9476) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java 2008-08-02 00:40:16 UTC (rev 9477) @@ -54,8 +54,8 @@ import org.eclipse.wst.server.core.internal.ServerPlugin; import org.jboss.ide.eclipse.archives.core.model.IArchive; import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder; -import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProvider; import org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider; +import org.jboss.ide.eclipse.archives.ui.views.ArchivesContentProvider; import org.jboss.ide.eclipse.archives.ui.wizards.AbstractArchiveWizard; import org.jboss.ide.eclipse.archives.ui.wizards.WizardPageWithNotification;