Author: rob.stryker(a)jboss.com Date: 2008-08-13 14:33:54 -0400 (Wed, 13 Aug 2008) New Revision: 9708 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 trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootContentProvider.java Log: JBIDE-2618 - archives view menu was not showing up Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-08-13 17:59:34 UTC (rev 9707) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-08-13 18:33:54 UTC (rev 9708) @@ -98,6 +98,22 @@ <contentExtension pattern="org.jboss.ide.eclipse.archives.ui.archivesRootBridgeContent"/> </includes> </viewerContentBinding> + <viewerActionBinding + viewerId="org.jboss.ide.eclipse.archives.ui.ProjectArchivesView"> + <includes> + <actionExtension + pattern="org.jboss.ide.eclipse.archives.ui.providers.ArchivesActionProvider"> + </actionExtension> + </includes> + </viewerActionBinding> + <viewerActionBinding + viewerId="org.eclipse.ui.navigator.ProjectExplorer"> + <includes> + <actionExtension + pattern="org.jboss.ide.eclipse.archives.ui.providers.ArchivesActionProvider"> + </actionExtension> + </includes> + </viewerActionBinding> </extension> <extension @@ -123,10 +139,6 @@ </instanceof> </or> </possibleChildren> - <actionProvider - class="org.jboss.ide.eclipse.archives.ui.providers.ArchivesActionProvider" - id="org.jboss.ide.eclipse.archives.ui.views.ArchivesActionProvider1"> - </actionProvider> </navigatorContent> <navigatorContent contentProvider="org.jboss.ide.eclipse.archives.ui.providers.ArchivesRootBridgeContentProvider" @@ -140,10 +152,6 @@ value="org.eclipse.core.resources.IProject"> </instanceof> </triggerPoints> - <actionProvider - class="org.jboss.ide.eclipse.archives.ui.providers.ArchivesActionProvider" - id="org.jboss.ide.eclipse.archives.ui.views.ArchivesActionProvider2"> - </actionProvider> <possibleChildren> <or> <instanceof @@ -152,6 +160,23 @@ </or> </possibleChildren> </navigatorContent> + <actionProvider + class="org.jboss.ide.eclipse.archives.ui.providers.ArchivesActionProvider" + id="org.jboss.ide.eclipse.archives.ui.providers.ArchivesActionProvider"> + <enablement> + <or> + <instanceof + value="org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate$WrappedProject"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.archives.core.model.IArchiveNode"> + </instanceof> + <count + value="0"> + </count> + </or> + </enablement> + </actionProvider> </extension> </plugin> 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-08-13 17:59:34 UTC (rev 9707) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java 2008-08-13 18:33:54 UTC (rev 9708) @@ -37,6 +37,7 @@ import org.jboss.ide.eclipse.archives.ui.ExtensionManager; import org.jboss.ide.eclipse.archives.ui.NodeContribution; 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.wizards.FilesetWizard; import org.jboss.ide.eclipse.archives.ui.wizards.NewJARWizard; @@ -76,7 +77,7 @@ if (selection != null && !selection.isEmpty()) { Object element = selection.getFirstElement(); - if (element instanceof IProject) { + if (element instanceof IProject || element instanceof WrappedProject ) { manager.add(newPackageManager); manager.add(buildAction); buildAction.setText(ArchivesUIMessages.ProjectPackagesView_buildProjectAction_label); Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2008-08-13 17:59:34 UTC (rev 9707) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2008-08-13 18:33:54 UTC (rev 9708) @@ -5,6 +5,14 @@ import org.eclipse.jface.viewers.Viewer; import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate.WrappedProject; +/** + * This class is the contribution to the Project Explorer. + * It returns a wrapped project suitable for adding archives to. + * It delegates all further content to the common provider. + * + * @author rob.stryker(a)redhat.com + * + */ public class ArchivesRootBridgeContentProvider implements ITreeContentProvider { private ArchivesContentProviderDelegate delegate; public ArchivesRootBridgeContentProvider() { Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootContentProvider.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootContentProvider.java 2008-08-13 17:59:34 UTC (rev 9707) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootContentProvider.java 2008-08-13 18:33:54 UTC (rev 9708) @@ -6,7 +6,6 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.jboss.ide.eclipse.archives.core.model.ArchivesModel; import org.jboss.ide.eclipse.archives.ui.PrefsInitializer; import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate.WrappedProject; import org.jboss.ide.eclipse.archives.ui.views.ProjectArchivesCommonView; @@ -34,9 +33,10 @@ if( showAllProjects() ) { IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); ArrayList<IProject> tmp = new ArrayList<IProject>(); - for( int i = 0; i < projects.length; i++ ) - if( ArchivesModel.instance().canReregister(projects[i].getLocation())) + for( int i = 0; i < projects.length; i++ ) { + if( projects[i].isAccessible()) tmp.add(projects[i]); + } return wrap((IProject[]) tmp.toArray(new IProject[tmp.size()])); } IProject cp = ProjectArchivesCommonView.getInstance().getCurrentProject();