Author: rob.stryker(a)jboss.com Date: 2008-09-15 16:15:56 -0400 (Mon, 15 Sep 2008) New Revision: 10244 Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildAction.java Removed: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildProjectAction.java Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java Log: consolidating action code Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-09-15 16:54:33 UTC (rev 10243) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-09-15 20:15:56 UTC (rev 10244) @@ -31,7 +31,7 @@ label="Archives" visible="true"> <action - class="org.jboss.ide.eclipse.archives.ui.actions.BuildProjectAction" + class="org.jboss.ide.eclipse.archives.ui.actions.BuildAction" definitionId="org.jboss.ide.eclipse.packages.ui.actions.BuildArchivesAction" icon="icons/build_packages.gif" id="org.jboss.ide.eclipse.archives.ui.actions.BuildArchivesAction" Copied: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildAction.java (from rev 10206, trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildProjectAction.java) =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildAction.java (rev 0) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildAction.java 2008-09-15 20:15:56 UTC (rev 10244) @@ -0,0 +1,67 @@ +package org.jboss.ide.eclipse.archives.ui.actions; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.IWorkbenchWindowActionDelegate; +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; + +public class BuildAction implements IWorkbenchWindowActionDelegate { + private IProject selectedProject; + public void dispose() { + } + + public void init(IWorkbenchWindow window) { + } + + public void run(IAction action) { + if( selectedProject != null ) + buildSelectedNode(selectedProject); + } + + public void run(Object node) { + buildSelectedNode(node); + } + + public void selectionChanged(IAction action, ISelection selection) { + if( !selection.isEmpty() && selection instanceof IStructuredSelection ) { + Object o = ((IStructuredSelection)selection).getFirstElement(); + if( o instanceof IAdaptable ) { + IResource res = (IResource) ((IAdaptable)o).getAdapter(IResource.class); + if( res != null ) { + selectedProject = res.getProject(); + return; + } + } + } + selectedProject = null; + } + + private void buildSelectedNode(final Object selected) { + new Job("Build Archive Node") { + protected IStatus run(IProgressMonitor monitor) { + if( selected == null ) return Status.OK_STATUS; + if (selected instanceof IArchiveNode && + ((IArchiveNode)selected).getNodeType() == IArchiveNode.TYPE_ARCHIVE) { + new ArchiveBuildDelegate().fullArchiveBuild((IArchive)selected); + } else if( selected != null && selected instanceof IProject ){ + new ArchiveBuildDelegate().fullProjectBuild(((IProject)selected).getProject().getLocation()); + } else { + new ArchiveBuildDelegate().fullArchiveBuild(((IArchiveNode)selected).getRootArchive()); + } + return Status.OK_STATUS; + } + }.schedule(); + } + +} \ No newline at end of file Property changes on: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildAction.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildProjectAction.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildProjectAction.java 2008-09-15 16:54:33 UTC (rev 10243) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildProjectAction.java 2008-09-15 20:15:56 UTC (rev 10244) @@ -1,40 +0,0 @@ -package org.jboss.ide.eclipse.archives.ui.actions; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.IWorkbenchWindowActionDelegate; -import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate; - -public class BuildProjectAction implements IWorkbenchWindowActionDelegate { - private IProject selectedProject; - public void dispose() { - } - - public void init(IWorkbenchWindow window) { - } - - public void run(IAction action) { - if( selectedProject != null ) - new ArchiveBuildDelegate().fullProjectBuild(selectedProject.getLocation()); - } - - public void selectionChanged(IAction action, ISelection selection) { - if( !selection.isEmpty() && selection instanceof IStructuredSelection ) { - Object o = ((IStructuredSelection)selection).getFirstElement(); - if( o instanceof IAdaptable ) { - IResource res = (IResource) ((IAdaptable)o).getAdapter(IResource.class); - if( res != null ) { - selectedProject = res.getProject(); - return; - } - } - } - selectedProject = null; - } - -} \ No newline at end of file Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java 2008-09-15 16:54:33 UTC (rev 10243) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java 2008-09-15 20:15:56 UTC (rev 10244) @@ -3,10 +3,6 @@ import java.util.Arrays; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.IMenuManager; @@ -25,7 +21,6 @@ import org.eclipse.ui.navigator.CommonActionProvider; import org.eclipse.ui.navigator.ICommonActionExtensionSite; import org.eclipse.ui.navigator.ICommonViewerSite; -import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate; import org.jboss.ide.eclipse.archives.core.build.SaveArchivesJob; import org.jboss.ide.eclipse.archives.core.model.ArchiveNodeFactory; import org.jboss.ide.eclipse.archives.core.model.IArchive; @@ -36,6 +31,7 @@ import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages; import org.jboss.ide.eclipse.archives.ui.ExtensionManager; import org.jboss.ide.eclipse.archives.ui.NodeContribution; +import org.jboss.ide.eclipse.archives.ui.actions.BuildAction; import org.jboss.ide.eclipse.archives.ui.actions.NewArchiveAction; import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate.WrappedProject; import org.jboss.ide.eclipse.archives.ui.views.ProjectArchivesCommonView; @@ -144,7 +140,7 @@ buildAction = new Action("", ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_BUILD_PACKAGES)) { public void run() { - buildSelectedNode(getSelectedObject()); + new BuildAction().run(getSelectedObject()); } }; } @@ -309,23 +305,6 @@ } } - private void buildSelectedNode(final Object selected) { - new Job("Build Archive Node") { - protected IStatus run(IProgressMonitor monitor) { - if( selected == null ) return Status.OK_STATUS; - if (selected instanceof IArchiveNode && - ((IArchiveNode)selected).getNodeType() == IArchiveNode.TYPE_ARCHIVE) { - new ArchiveBuildDelegate().fullArchiveBuild((IArchive)selected); - } else if( selected != null && selected instanceof IProject ){ - new ArchiveBuildDelegate().fullProjectBuild(((IProject)selected).getProject().getLocation()); - } else { - new ArchiveBuildDelegate().fullArchiveBuild(((IArchiveNode)selected).getRootArchive()); - } - return Status.OK_STATUS; - } - }.schedule(); - } - private void deleteSelectedNode () { IArchiveNode node = getSelectedNode(); if (node != null) {