Attachment 161232 Details for Bug 304925 – Work in progress

[patch] Work in progress

clipboard.txt (text/plain), 35.84 KB, created by Francis Upton IV

on 2010-03-06 21:00:10 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Francis Upton IV

Created: 2010-03-06 21:00:10 EST

Size: 35.84 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.navigator
>Index: schema/navigatorContent.exsd
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/schema/navigatorContent.exsd,v
>retrieving revision 1.46
>diff -u -r1.46 navigatorContent.exsd
>--- schema/navigatorContent.exsd	12 Sep 2009 06:36:47 -0000	1.46
>+++ schema/navigatorContent.exsd	7 Mar 2010 01:58:51 -0000
>@@ -38,6 +38,7 @@
>                <element ref="actionProvider" minOccurs="0" maxOccurs="unbounded"/>
>                <element ref="commonWizard" minOccurs="0" maxOccurs="unbounded"/>
>                <element ref="commonFilter" minOccurs="0" maxOccurs="unbounded"/>
>+               <element ref="commandMenuContribution" minOccurs="0" maxOccurs="unbounded"/>
>             </choice>
>          </sequence>
>          <attribute name="point" type="string" use="required">
>@@ -664,6 +665,37 @@
>       </complexType>
>    </element>
> 
>+   <element name="commandMenuContribution">
>+      <annotation>
>+         <documentation>
>+            Specifies the contribution of a command to the context menu associated with a Common Navigator ViewPart. This is used in conjuction with the &lt;b&gt;viewerCommandMenuBinding&lt;/b&gt; element in the &lt;b&gt;viewer&lt;/b&gt; extension point.
>+&lt;br/&gt;&lt;br/&gt;
>+Its function is similar the &lt;b&gt;menuContribution&lt;/b&gt; element in the &lt;b&gt;org.eclipse.ui.menus&lt;/b&gt; extention point (and replaces its use in the context of the Common Navigator).
>+&lt;br/&gt;&lt;br/&gt;
>+You should use this element (instead of the &lt;b&gt;menuContribution&lt;/b&gt; element) when there is a possibility that the same command may be associated with a given Common Navigator ViewPart instance. Configuring using this element will make sure the command only occurs one time in the context menu, where if you used the &lt;b&gt;menuContribution&lt;/b&gt; element the command would be duplicated.
>+         </documentation>
>+      </annotation>
>+      <complexType>
>+         <attribute name="commandId" type="string" use="required">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+               <appInfo>
>+                  <meta.attribute kind="identifier" basedOn="org.eclipse.ui.commands/command/@id"/>
>+               </appInfo>
>+            </annotation>
>+         </attribute>
>+         <attribute name="after" type="string">
>+            <annotation>
>+               <documentation>
>+                  
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+      </complexType>
>+   </element>
>+
>    <annotation>
>       <appInfo>
>          <meta.section type="since"/>
>Index: schema/viewer.exsd
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/schema/viewer.exsd,v
>retrieving revision 1.23
>diff -u -r1.23 viewer.exsd
>--- schema/viewer.exsd	26 Mar 2009 13:38:48 -0000	1.23
>+++ schema/viewer.exsd	7 Mar 2010 01:58:51 -0000
>@@ -33,6 +33,8 @@
>          <sequence>
>             <element ref="viewer" minOccurs="0" maxOccurs="unbounded"/>
>             <element ref="viewerContentBinding" minOccurs="0" maxOccurs="unbounded"/>
>+            <element ref="viewerCommandMenuBinding" minOccurs="0" maxOccurs="unbounded"/>
>+            <element ref="viewerHandlerBinding" minOccurs="0" maxOccurs="unbounded"/>
>             <element ref="viewerActionBinding" minOccurs="0" maxOccurs="unbounded"/>
>             <element ref="dragAssistant" minOccurs="0" maxOccurs="unbounded"/>
>          </sequence>
>@@ -161,6 +163,68 @@
>       </complexType>
>    </element>
> 
>+   <element name="viewerCommandMenuBinding">
>+      <annotation>
>+         <documentation>
>+            Clients may use this to bind commands and handlers to their viewer. Although you can bind commands to a view using the normal mechanisms in the LINKcommand service, using this element is recommended if there will be multple unrelated plugins contributing to the view as it provides two additional benefits:
>+&lt;ol&gt;
>+&lt;li&gt;Prevents duplication - in the event that the same command is found to a viewer multiple times (by multiple unrelated plugins), it will be found only once. As is normal when using handlers, they must properly coordinate their activation.
>+&lt;li&gt;Dynamic handler creation - the specified handler will be created in response to this element, and if it has a constructor that has a LINKViewPart as its argument, that will be invoked, allowing the handler to register for and respond to the view&apos;s selection events.
>+&lt;/ol&gt;
>+Clients may define an &lt;b&gt;includes&lt;/b&gt; element to select which commands are visible to the viewer, and  similarly an &lt;b&gt;excludes&lt;/b&gt; element for commands that should not be made visible to the viewer. 
>+&lt;br&gt;&lt;br&gt;
>+A viewer may have multiple &lt;b&gt;viewerCommandBinding&lt;/b&gt;s defined, and their &lt;b&gt;includes&lt;/b&gt;/&lt;b&gt;excludes&lt;/b&gt; statements will be aggregated to produce the final behavior.
>+&lt;br&gt;&lt;br&gt;
>+For &lt;b&gt;actionProvider&lt;/b&gt; definitions which are not nested under a &lt;b&gt;navigatorContent&lt;/b&gt; definition, clients may specify a custom id. If clients do not specify an id, the id defaults to &quot;org.eclipse.ui.navigator.actionProvider.X&quot;. For clients that wish to pick up &lt;b&gt;actionProvider&lt;/b&gt;s with no specific id, clients must define a &lt;b&gt;viewerActionBinding&lt;/b&gt; for the default id. See the examples section for how this is done.
>+         </documentation>
>+      </annotation>
>+      <complexType>
>+         <sequence>
>+            <element ref="includes" minOccurs="0" maxOccurs="1"/>
>+            <element ref="excludes" minOccurs="0" maxOccurs="1"/>
>+         </sequence>
>+         <attribute name="viewerId" type="string" use="required">
>+            <annotation>
>+               <documentation>
>+                  The id of the common viewer. If the viewer is in a common navigator then the id must match the navigator&apos;s id defined in its &lt;b&gt;org.eclipse.ui.views&lt;/b&gt; extension.
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+      </complexType>
>+   </element>
>+
>+   <element name="viewerHandlerBinding">
>+      <annotation>
>+         <documentation>
>+            *** get rid of this one, just start the handlers with the project explorer **
>+
>+Clients may use this to bind commands and handlers to their viewer. Although you can bind commands to a view using the normal mechanisms in the LINKcommand service, using this element is recommended if there will be multple unrelated plugins contributing to the view as it provides two additional benefits:
>+&lt;ol&gt;
>+&lt;li&gt;Prevents duplication - in the event that the same command is found to a viewer multiple times (by multiple unrelated plugins), it will be found only once. As is normal when using handlers, they must properly coordinate their activation.
>+&lt;li&gt;Dynamic handler creation - the specified handler will be created in response to this element, and if it has a constructor that has a LINKViewPart as its argument, that will be invoked, allowing the handler to register for and respond to the view&apos;s selection events.
>+&lt;/ol&gt;
>+Clients may define an &lt;b&gt;includes&lt;/b&gt; element to select which commands are visible to the viewer, and  similarly an &lt;b&gt;excludes&lt;/b&gt; element for commands that should not be made visible to the viewer. 
>+&lt;br&gt;&lt;br&gt;
>+A viewer may have multiple &lt;b&gt;viewerCommandBinding&lt;/b&gt;s defined, and their &lt;b&gt;includes&lt;/b&gt;/&lt;b&gt;excludes&lt;/b&gt; statements will be aggregated to produce the final behavior.
>+&lt;br&gt;&lt;br&gt;
>+For &lt;b&gt;actionProvider&lt;/b&gt; definitions which are not nested under a &lt;b&gt;navigatorContent&lt;/b&gt; definition, clients may specify a custom id. If clients do not specify an id, the id defaults to &quot;org.eclipse.ui.navigator.actionProvider.X&quot;. For clients that wish to pick up &lt;b&gt;actionProvider&lt;/b&gt;s with no specific id, clients must define a &lt;b&gt;viewerActionBinding&lt;/b&gt; for the default id. See the examples section for how this is done.
>+         </documentation>
>+      </annotation>
>+      <complexType>
>+         <sequence>
>+            <element ref="includes" minOccurs="0" maxOccurs="1"/>
>+            <element ref="excludes" minOccurs="0" maxOccurs="1"/>
>+         </sequence>
>+         <attribute name="viewerId" type="string" use="required">
>+            <annotation>
>+               <documentation>
>+                  The id of the common viewer. If the viewer is in a common navigator then the id must match the navigator&apos;s id defined in its &lt;b&gt;org.eclipse.ui.views&lt;/b&gt; extension.
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+      </complexType>
>+   </element>
>+
>    <element name="includes">
>       <annotation>
>          <documentation>
>@@ -178,6 +242,12 @@
>             <sequence>
>                <element ref="actionExtension" minOccurs="1" maxOccurs="unbounded"/>
>             </sequence>
>+            <sequence>
>+               <element ref="commandMenuExtension" minOccurs="1" maxOccurs="unbounded"/>
>+            </sequence>
>+            <sequence>
>+               <element ref="handler" minOccurs="1" maxOccurs="unbounded"/>
>+            </sequence>
>          </choice>
>       </complexType>
>    </element>
>@@ -200,6 +270,12 @@
>             <sequence>
>                <element ref="actionExtension" minOccurs="1" maxOccurs="unbounded"/>
>             </sequence>
>+            <sequence>
>+               <element ref="commandMenuExtension" minOccurs="1" maxOccurs="unbounded"/>
>+            </sequence>
>+            <sequence>
>+               <element ref="handler" minOccurs="1" maxOccurs="unbounded"/>
>+            </sequence>
>          </choice>
>       </complexType>
>    </element>
>@@ -425,6 +501,44 @@
>       </complexType>
>    </element>
> 
>+   <element name="commandMenuExtension">
>+      <annotation>
>+         <documentation>
>+            Indicates the command id or regular expression pattern to be used to find the command(s) to be associated with the viewer. These must be declared using the &lt;b&gt;commandMenuContribution&lt;/b&gt; element in the &lt;b&gt;navigatorContent&lt;/b&gt; extension point.
>+         </documentation>
>+      </annotation>
>+      <complexType>
>+         <attribute name="pattern" type="string" use="required">
>+            <annotation>
>+               <documentation>
>+                  Content extensions may be selected exactly by using their content extension id. Clients may also use a regular expression pattern to select any content extensions that have ids that match the pattern. 
>+&lt;p&gt;
>+Patterns are regular expressions which match unique identifiers. Please see the Java(tm) Platform documentation for &lt;code&gt;java.util.regex.Pattern&lt;/code&gt; for further details.
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+      </complexType>
>+   </element>
>+
>+   <element name="handler">
>+      <annotation>
>+         <documentation>
>+            The identification of a handler to bind in the &lt;b&gt;viewerCommandBinding&lt;/b&gt;.
>+         </documentation>
>+      </annotation>
>+      <complexType>
>+         <attribute name="pattern" type="string" use="required">
>+            <annotation>
>+               <documentation>
>+                  Content extensions may be selected exactly by using their content extension id. Clients may also use a regular expression pattern to select any content extensions that have ids that match the pattern. 
>+&lt;p&gt;
>+Patterns are regular expressions which match unique identifiers. Please see the Java(tm) Platform documentation for &lt;code&gt;java.util.regex.Pattern&lt;/code&gt; for further details.
>+               </documentation>
>+            </annotation>
>+         </attribute>
>+      </complexType>
>+   </element>
>+
>    <annotation>
>       <appInfo>
>          <meta.section type="since"/>
>Index: src/org/eclipse/ui/internal/navigator/NavigatorContentService.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/NavigatorContentService.java,v
>retrieving revision 1.44
>diff -u -r1.44 NavigatorContentService.java
>--- src/org/eclipse/ui/internal/navigator/NavigatorContentService.java	5 Mar 2010 07:38:12 -0000	1.44
>+++ src/org/eclipse/ui/internal/navigator/NavigatorContentService.java	7 Mar 2010 01:58:52 -0000
>@@ -43,7 +43,10 @@
> import org.eclipse.jface.viewers.Viewer;
> 
> import org.eclipse.ui.IMemento;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.internal.navigator.dnd.NavigatorDnDService;
>+import org.eclipse.ui.internal.navigator.extensions.CommandMenuContributionDescriptor;
>+import org.eclipse.ui.internal.navigator.extensions.CommandMenuContributionDescriptorManager;
> import org.eclipse.ui.internal.navigator.extensions.ExtensionPriorityComparator;
> import org.eclipse.ui.internal.navigator.extensions.NavigatorContentDescriptor;
> import org.eclipse.ui.internal.navigator.extensions.NavigatorContentDescriptorManager;
>@@ -52,6 +55,11 @@
> import org.eclipse.ui.internal.navigator.extensions.NavigatorViewerDescriptorManager;
> import org.eclipse.ui.internal.navigator.extensions.StructuredViewerManager;
> import org.eclipse.ui.internal.navigator.sorters.NavigatorSorterService;
>+import org.eclipse.ui.menus.AbstractContributionFactory;
>+import org.eclipse.ui.menus.CommandContributionItem;
>+import org.eclipse.ui.menus.CommandContributionItemParameter;
>+import org.eclipse.ui.menus.IContributionRoot;
>+import org.eclipse.ui.menus.IMenuService;
> import org.eclipse.ui.navigator.IDescriptionProvider;
> import org.eclipse.ui.navigator.IExtensionActivationListener;
> import org.eclipse.ui.navigator.IExtensionStateModel;
>@@ -67,6 +75,7 @@
> import org.eclipse.ui.navigator.INavigatorSaveablesService;
> import org.eclipse.ui.navigator.INavigatorSorterService;
> import org.eclipse.ui.navigator.INavigatorViewerDescriptor;
>+import org.eclipse.ui.services.IServiceLocator;
> 
> /**
>  * <p>
>@@ -848,6 +857,46 @@
> 		return result;
> 	}
> 
>+	
>+	/**
>+	 * Install the commands into the specified viewer
>+	 * 
>+	 * @param viewer
>+	 */
>+	public void bindCommandMenuContributions(StructuredViewer viewer) {
>+		CommandMenuContributionDescriptorManager mgr = CommandMenuContributionDescriptorManager
>+				.getInstance();
>+
>+		final IMenuService menuService = (IMenuService) PlatformUI.getWorkbench().getService(
>+				IMenuService.class);
>+
>+		String urlBase = "popup:" + getViewerId(); //$NON-NLS-1$
>+		
>+		Iterator it = mgr.getDescriptors().iterator();
>+		while (it.hasNext()) {
>+			CommandMenuContributionDescriptor desc = (CommandMenuContributionDescriptor) it.next();
>+			NavigatorViewerDescriptor vd = NavigatorViewerDescriptorManager.getInstance()
>+					.getNavigatorViewerDescriptor(getViewerId());
>+			if (vd.isVisibleCommand(desc.getCommandId())) {
>+				final CommandMenuContributionDescriptor finalDesc = desc;
>+
>+				String url = urlBase;
>+				if (desc.getAfter() != null)
>+					url += "?after=" + desc.getAfter(); //$NON-NLS-1$
>+				
>+				AbstractContributionFactory factory = new AbstractContributionFactory(url, desc.getPluginId()) {
>+					public void createContributionItems(IServiceLocator serviceLocator,
>+							IContributionRoot additions) {
>+						CommandContributionItemParameter cp = new CommandContributionItemParameter(serviceLocator, null, finalDesc.getCommandId(), CommandContributionItem.STYLE_PULLDOWN);
>+						CommandContributionItem item = new CommandContributionItem(cp);
>+						additions.addContributionItem(item, null);
>+					}
>+				};
>+				menuService.addContributionFactory(factory);
>+			}
>+		}
>+	}
>+	
> 	/*
> 	 * (non-Javadoc)
> 	 * 
>Index: src/org/eclipse/ui/internal/navigator/extensions/CommandMenuContributionDescriptor.java
>===================================================================
>RCS file: src/org/eclipse/ui/internal/navigator/extensions/CommandMenuContributionDescriptor.java
>diff -N src/org/eclipse/ui/internal/navigator/extensions/CommandMenuContributionDescriptor.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ui/internal/navigator/extensions/CommandMenuContributionDescriptor.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,77 @@
>+/*******************************************************************************
>+ * Copyright (c) 2003, 2010 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.ui.internal.navigator.extensions;
>+
>+import org.eclipse.core.runtime.Assert;
>+import org.eclipse.core.runtime.IConfigurationElement;
>+import org.eclipse.ui.internal.navigator.extensions.INavigatorContentExtPtConstants;
>+
>+/**
>+ * 
>+ * 
>+ * @since 3.5
>+ */
>+public class CommandMenuContributionDescriptor implements INavigatorContentExtPtConstants {
>+
>+	private final IConfigurationElement configurationElement;
>+
>+	private final String commandId;
>+
>+	private final String after;
>+
>+	private final String pluginId;
>+
>+	private String toString;
>+
>+	/**
>+	 * @param aConfigElement
>+	 */
>+	public CommandMenuContributionDescriptor(IConfigurationElement aConfigElement) {
>+		super();
>+		Assert.isTrue(TAG_COMMAND_MENU_CONTRIBUTION.equals(aConfigElement.getName()));
>+		configurationElement = aConfigElement;
>+		pluginId = configurationElement.getContributor().getName();
>+		commandId = configurationElement.getAttribute(ATT_COMMAND_ID);
>+		after = configurationElement.getAttribute(ATT_AFTER);
>+	}
>+
>+	/**
>+	 * 
>+	 * @return The command id.
>+	 */
>+	public String getCommandId() {
>+		return commandId;
>+	}
>+
>+	/**
>+	 * 
>+	 * @return The after value which is which group the command is placed in in
>+	 *         the context menu.
>+	 */
>+	public String getAfter() {
>+		return after;
>+	}
>+
>+	/**
>+	 * @return the id of the contributing plugin
>+	 */
>+	public String getPluginId() {
>+		return pluginId;
>+	}
>+
>+	public String toString() {
>+		if (toString == null) {
>+			toString = "CommandMenuContributionDescriptor[commandId=" + getCommandId() + ", after=" + getAfter() + "]"; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
>+		}
>+		return toString;
>+	}
>+
>+}
>Index: src/org/eclipse/ui/internal/navigator/extensions/CommandMenuContributionDescriptorManager.java
>===================================================================
>RCS file: src/org/eclipse/ui/internal/navigator/extensions/CommandMenuContributionDescriptorManager.java
>diff -N src/org/eclipse/ui/internal/navigator/extensions/CommandMenuContributionDescriptorManager.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ui/internal/navigator/extensions/CommandMenuContributionDescriptorManager.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,79 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 Oakland Software Incorporated and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Francis Upton IV, Oakland Software Incorporated - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.ui.internal.navigator.extensions;
>+
>+import java.util.ArrayList;
>+import java.util.HashSet;
>+import java.util.List;
>+import java.util.Set;
>+
>+import org.eclipse.core.runtime.IConfigurationElement;
>+import org.eclipse.ui.internal.navigator.extensions.NavigatorContentRegistryReader;
>+
>+/**
>+ * Manages descriptors consumed from the 'commandMenuContribution' elements of
>+ * the <b>org.eclipse.ui.navigator.navigatorContent</b> extension point.
>+ * 
>+ * @since 3.5
>+ * 
>+ */
>+public class CommandMenuContributionDescriptorManager {
>+
>+	private static final CommandMenuContributionDescriptorManager INSTANCE = new CommandMenuContributionDescriptorManager();
>+
>+	private CommandMenuContributionDescriptorManager() {
>+
>+		new RegistryReader().readRegistry();
>+	}
>+
>+	/**
>+	 * @return the singleton instance of the this class
>+	 */
>+	public static CommandMenuContributionDescriptorManager getInstance() {
>+		return INSTANCE;
>+	}
>+
>+	private final Set rootDescriptors = new HashSet();
>+
>+	private final List rootDescriptorsList = new ArrayList();
>+
>+	/**
>+	 * @return the descriptors
>+	 */
>+	public List getDescriptors() {
>+		return rootDescriptorsList;
>+	}
>+	
>+	/**
>+	 * 
>+	 * @param descriptor
>+	 *            A valid descriptor to begin managing.
>+	 */
>+	protected void addActionDescriptor(CommandMenuContributionDescriptor descriptor) {
>+		if (rootDescriptors.contains(descriptor.getCommandId())) {
>+			return;
>+		}
>+		rootDescriptorsList.add(descriptor);
>+		rootDescriptors.add(descriptor.getCommandId());
>+	}
>+
>+	private class RegistryReader extends NavigatorContentRegistryReader {
>+
>+		protected boolean readElement(IConfigurationElement anElement) {
>+			if (TAG_COMMAND_MENU_CONTRIBUTION.equals(anElement.getName())) {
>+				addActionDescriptor(new CommandMenuContributionDescriptor(anElement));
>+				return true;
>+			}
>+			return super.readElement(anElement);
>+		}
>+	}
>+
>+}
>Index: src/org/eclipse/ui/internal/navigator/extensions/INavigatorContentExtPtConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/INavigatorContentExtPtConstants.java,v
>retrieving revision 1.9
>diff -u -r1.9 INavigatorContentExtPtConstants.java
>--- src/org/eclipse/ui/internal/navigator/extensions/INavigatorContentExtPtConstants.java	8 Mar 2009 14:34:56 -0000	1.9
>+++ src/org/eclipse/ui/internal/navigator/extensions/INavigatorContentExtPtConstants.java	7 Mar 2010 01:58:53 -0000
>@@ -20,6 +20,9 @@
> 	String TAG_ACTION_PROVIDER = "actionProvider"; //$NON-NLS-1$
> 
> 	/** */
>+	String TAG_COMMAND_MENU_CONTRIBUTION = "commandMenuContribution"; //$NON-NLS-1$
>+
>+	/** */
> 	String TAG_NAVIGATOR_CONTENT = "navigatorContent"; //$NON-NLS-1$
> 
> 	/** */
>@@ -62,6 +65,12 @@
> 	String ATT_ID = "id"; //$NON-NLS-1$
> 
> 	/** */
>+	String ATT_COMMAND_ID = "commandId"; //$NON-NLS-1$
>+
>+	/** */
>+	String ATT_AFTER = "after"; //$NON-NLS-1$
>+
>+	/** */
> 	String ATT_NAME = "name"; //$NON-NLS-1$	 
> 
> 	/** */
>Index: src/org/eclipse/ui/internal/navigator/extensions/IViewerExtPtConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/IViewerExtPtConstants.java,v
>retrieving revision 1.5
>diff -u -r1.5 IViewerExtPtConstants.java
>--- src/org/eclipse/ui/internal/navigator/extensions/IViewerExtPtConstants.java	25 May 2009 20:52:48 -0000	1.5
>+++ src/org/eclipse/ui/internal/navigator/extensions/IViewerExtPtConstants.java	7 Mar 2010 01:58:53 -0000
>@@ -36,6 +36,12 @@
> 	String TAG_VIEWER_ACTION_BINDING = "viewerActionBinding"; //$NON-NLS-1$
> 
> 	/** */
>+	String TAG_VIEWER_COMMAND_BINDING = "viewerCommandMenuBinding"; //$NON-NLS-1$
>+
>+	/** */
>+	String TAG_VIEWER_HANDLER_BINDING = "viewerHandlerBinding"; //$NON-NLS-1$
>+
>+	/** */
> 	String TAG_POPUP_MENU = "popupMenu"; //$NON-NLS-1$ 
> 
> 	/** */
>Index: src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptor.java,v
>retrieving revision 1.12
>diff -u -r1.12 NavigatorViewerDescriptor.java
>--- src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptor.java	25 May 2009 20:52:48 -0000	1.12
>+++ src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptor.java	7 Mar 2010 01:58:53 -0000
>@@ -48,9 +48,11 @@
> 
> 	static final String ATT_PATTERN = "pattern"; //$NON-NLS-1$
> 
>-	private static final String TAG_CONTENT_EXTENSION = "contentExtension"; //$NON-NLS-1$
>+	static final String TAG_CONTENT_EXTENSION = "contentExtension"; //$NON-NLS-1$
> 
>-	private static final String TAG_ACTION_EXTENSION = "actionExtension"; //$NON-NLS-1$ 
>+	static final String TAG_ACTION_EXTENSION = "actionExtension"; //$NON-NLS-1$ 
>+
>+	static final String TAG_COMMAND_MENU_EXTENSION = "commandMenuExtension"; //$NON-NLS-1$ 
> 
> 	private final String viewerId;
> 
>@@ -60,6 +62,8 @@
> 
> 	private Binding contentBinding = new Binding(TAG_CONTENT_EXTENSION);
> 
>+	private Binding commandBinding = new Binding(TAG_COMMAND_MENU_EXTENSION);
>+
> 	private MenuInsertionPoint[] customInsertionPoints = null;
> 
> 	private boolean allowsPlatformContributions = true;
>@@ -101,28 +105,6 @@
> 		return popupMenuId != null ? popupMenuId : viewerId;
> 	}
> 
>-	/**
>-	 * Consume an action binding for this viewer.
>-	 * 
>-	 * @param element
>-	 *            The IConfigurationElement containing a viewerActionBinding
>-	 *            element.
>-	 */
>-	public void consumeActionBinding(IConfigurationElement element) {
>-		consumeBinding(element, false);
>-	}
>-
>-	/**
>-	 * Consume a content binding for this viewer.
>-	 * 
>-	 * @param element
>-	 *            The IConfigurationElement containing a viewerContentBinding
>-	 *            element.
>-	 */
>-	public void consumeContentBinding(IConfigurationElement element) {
>-		consumeBinding(element, true);
>-	}
>-
> 	public boolean isRootExtension(String aContentExtensionId) {
> 		return contentBinding.isRootExtension(aContentExtensionId);
> 	}
>@@ -139,6 +121,10 @@
> 		return actionBinding.isVisibleExtension(anActionExtensionId);
> 	}
> 
>+	public boolean isVisibleCommand(String aCommandId) {
>+		return commandBinding.isVisibleExtension(aCommandId);
>+	}
>+
> 	public boolean hasOverriddenRootExtensions() {
> 		return contentBinding.hasOverriddenRootExtensions();
> 	}
>@@ -237,6 +223,20 @@
> 	}
> 	
> 	/**
>+	 * @param binding
>+	 */
>+	public void setCommandBinding(Binding binding) {
>+		commandBinding = binding;
>+	}
>+	
>+	/**
>+	 * @return the content Binding
>+	 */
>+	public Binding getCommandBinding() {
>+		return commandBinding;
>+	}
>+	
>+	/**
> 	 * @param assistants
> 	 */
> 	public void setDragAssistants(Set assistants) {
>@@ -328,16 +328,26 @@
> 		return dragAssistants;
> 	}
> 
>-	private void consumeBinding(IConfigurationElement element, boolean isContent) {
>+	/**
>+	 * @param element
>+	 * @param bindingTag
>+	 */
>+	public void consumeBinding(IConfigurationElement element, String bindingTag) {
> 		IConfigurationElement[] includesElement = element
> 				.getChildren(TAG_INCLUDES);
> 
>+		boolean respectRoots = false;
>+		Binding binding = null;
>+		if (bindingTag.equals(TAG_CONTENT_EXTENSION)) {
>+			binding = contentBinding;
>+			respectRoots = true;
>+		} else if (bindingTag.equals(TAG_ACTION_EXTENSION))
>+			binding = actionBinding;
>+		else if (bindingTag.equals(TAG_COMMAND_MENU_EXTENSION))
>+			binding = commandBinding;
>+		
> 		if (includesElement.length == 1) {
>-			if (isContent) {
>-				contentBinding.consumeIncludes(includesElement[0], true);
>-			} else {
>-				actionBinding.consumeIncludes(includesElement[0], false);
>-			}
>+			binding.consumeIncludes(includesElement[0], respectRoots);
> 		} else if (includesElement.length >= 1) {
> 			NavigatorPlugin.logError(0, NLS.bind(
> 					CommonNavigatorMessages.Too_many_elements_Warning,
>@@ -353,12 +363,7 @@
> 				.getChildren(TAG_EXCLUDES);
> 
> 		if (excludesElement.length == 1) {
>-
>-			if (isContent) {
>-				contentBinding.consumeExcludes(excludesElement[0]);
>-			} else {
>-				actionBinding.consumeExcludes(excludesElement[0]);
>-			}
>+			binding.consumeExcludes(excludesElement[0]);
> 		} else if (excludesElement.length >= 1) {
> 			NavigatorPlugin.logError(0, NLS.bind(
> 					CommonNavigatorMessages.Too_many_elements_Warning,
>@@ -371,4 +376,11 @@
> 		}
> 	}
> 
>+	void setupFromParent(NavigatorViewerDescriptor parentDesc) {
>+		setActionBinding(parentDesc.getActionBinding());
>+		setContentBinding(parentDesc.getContentBinding());
>+		setCommandBinding(parentDesc.getCommandBinding());
>+		setDragAssistants(parentDesc.getDragAssistants());
>+	}
>+	
> }
>Index: src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java,v
>retrieving revision 1.8
>diff -u -r1.8 NavigatorViewerDescriptorManager.java
>--- src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java	8 Mar 2009 20:45:04 -0000	1.8
>+++ src/org/eclipse/ui/internal/navigator/extensions/NavigatorViewerDescriptorManager.java	7 Mar 2010 01:58:53 -0000
>@@ -46,9 +46,7 @@
> 			NavigatorViewerDescriptor desc = (NavigatorViewerDescriptor) it.next();
> 			NavigatorViewerDescriptor parentDesc = (NavigatorViewerDescriptor) viewerDescriptors.get(desc.getInheritBindingsFromViewer());
> 			if (parentDesc != null) {
>-				desc.setActionBinding(parentDesc.getActionBinding());
>-				desc.setContentBinding(parentDesc.getContentBinding());
>-				desc.setDragAssistants(parentDesc.getDragAssistants());
>+				desc.setupFromParent(parentDesc);
> 			}
> 		}
> 	}
>@@ -179,18 +177,28 @@
> 				}
> 				return true;
> 			}
>+			
>+			System.out.println("name: " + element.getName()); //$NON-NLS-1$
>+			
> 			if (TAG_VIEWER_CONTENT_BINDING.equals(element.getName())) {
> 				String viewerId = element.getAttribute(ATT_VIEWER_ID);
> 				NavigatorViewerDescriptor descriptor = getNavigatorViewerDescriptor(viewerId);
>-				descriptor.consumeContentBinding(element);
>+				descriptor.consumeBinding(element, NavigatorViewerDescriptor.TAG_CONTENT_EXTENSION);
> 				return true;
> 			}
> 			if (TAG_VIEWER_ACTION_BINDING.equals(element.getName())) {
> 				String viewerId = element.getAttribute(ATT_VIEWER_ID);
> 				NavigatorViewerDescriptor descriptor = getNavigatorViewerDescriptor(viewerId);
>-				descriptor.consumeActionBinding(element);
>+				descriptor.consumeBinding(element, NavigatorViewerDescriptor.TAG_ACTION_EXTENSION);
> 				return true;
>-			} if (TAG_DRAG_ASSISTANT.equals(element.getName())) {
>+			}
>+			if (TAG_VIEWER_COMMAND_BINDING.equals(element.getName())) {
>+				String viewerId = element.getAttribute(ATT_VIEWER_ID);
>+				NavigatorViewerDescriptor descriptor = getNavigatorViewerDescriptor(viewerId);
>+				descriptor.consumeBinding(element, NavigatorViewerDescriptor.TAG_COMMAND_MENU_EXTENSION);
>+				return true;
>+			}
>+			if (TAG_DRAG_ASSISTANT.equals(element.getName())) {
> 				String viewerId = element.getAttribute(ATT_VIEWER_ID);
> 				NavigatorViewerDescriptor descriptor = getNavigatorViewerDescriptor(viewerId);
> 				descriptor.addDragAssistant(new CommonDragAssistantDescriptor(element));
>Index: src/org/eclipse/ui/navigator/CommonNavigator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigator.java,v
>retrieving revision 1.47
>diff -u -r1.47 CommonNavigator.java
>--- src/org/eclipse/ui/navigator/CommonNavigator.java	8 Mar 2009 20:45:04 -0000	1.47
>+++ src/org/eclipse/ui/navigator/CommonNavigator.java	7 Mar 2010 01:58:54 -0000
>@@ -12,6 +12,7 @@
>  *******************************************************************************/
> package org.eclipse.ui.navigator;
> 
>+import org.eclipse.core.commands.IHandler;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.PerformanceStats;
> import org.eclipse.jface.action.IAction;
>@@ -432,6 +433,17 @@
> 		return super.getAdapter(adapter);
> 	}
> 
>+	
>+	/**
>+	 * @param commandId
>+	 * @param handler
>+	 * 
>+	 * @since 3.5
>+	 */
>+	public void bindHandler(String commandId, IHandler handler) {
>+		
>+	}
>+	
>     /**
>      * Returns the <code>IShowInSource</code> for this view.
>      */
>Index: src/org/eclipse/ui/navigator/CommonViewer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java,v
>retrieving revision 1.40
>diff -u -r1.40 CommonViewer.java
>--- src/org/eclipse/ui/navigator/CommonViewer.java	10 Jan 2010 09:48:50 -0000	1.40
>+++ src/org/eclipse/ui/navigator/CommonViewer.java	7 Mar 2010 01:58:54 -0000
>@@ -109,6 +109,7 @@
> 		setContentProvider(contentService.createCommonContentProvider());
> 		setLabelProvider(new NavigatorDecoratingLabelProvider(contentService.createCommonLabelProvider()));
> 		initDragAndDrop();
>+		contentService.bindCommandMenuContributions(this);
> 	}
> 
> 	void setCommonNavigator(CommonNavigator navigator) {
>Index: src/org/eclipse/ui/navigator/INavigatorViewerDescriptor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/INavigatorViewerDescriptor.java,v
>retrieving revision 1.14
>diff -u -r1.14 INavigatorViewerDescriptor.java
>--- src/org/eclipse/ui/navigator/INavigatorViewerDescriptor.java	8 Mar 2009 20:45:04 -0000	1.14
>+++ src/org/eclipse/ui/navigator/INavigatorViewerDescriptor.java	7 Mar 2010 01:58:54 -0000
>@@ -93,6 +93,19 @@
> 	boolean isVisibleActionExtension(String anActionExtensionId);
> 
> 	/**
>+	 * Returns true if a command with the given id is 'visible'. A command
>+	 * is 'visible' if it matches a viewerCommandMenuBinding for the
>+	 * given viewer id.
>+	 * 
>+	 * @param aCommandId
>+	 *            The id to query
>+	 * @return True if the command id matches a viewerCommandMenuBinding for
>+	 *         the viewer id of this descriptor.
>+	 * @since 3.5
>+	 */
>+	boolean isVisibleCommand(String aCommandId);
>+
>+	/**
> 	 * Returns true if the content extension of the given id matches a
> 	 * viewerContentBinding extension that declares isRoot as true.
> 	 * 
>#P org.eclipse.ui.navigator.resources
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator.resources/plugin.properties,v
>retrieving revision 1.16
>diff -u -r1.16 plugin.properties
>--- plugin.properties	25 May 2009 20:52:22 -0000	1.16
>+++ plugin.properties	7 Mar 2010 01:58:55 -0000
>@@ -15,6 +15,8 @@
> resourceGoTo.extension.name=Resources Go To
> workingsets.extension.name=Working Sets
> Common_Resource_Navigator=Project Explorer
>+
>+command.goToResource=Go To Resource
>  
> filters.startsWithDot.name=.* resources
> filters.startsWithDot.description=Hides resources that begin with "."
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.navigator.resources/plugin.xml,v
>retrieving revision 1.42
>diff -u -r1.42 plugin.xml
>--- plugin.xml	22 Jan 2009 23:08:33 -0000	1.42
>+++ plugin.xml	7 Mar 2010 01:58:55 -0000
>@@ -58,6 +58,22 @@
>            <contentExtension pattern="org.eclipse.ui.navigator.resources.workingSets"/>
>           </includes>
>        </viewerContentBinding>
>+       <viewerCommandMenuBinding
>+             viewerId="org.eclipse.ui.navigator.ProjectExplorer">
>+          <includes>
>+             <commandMenuExtension
>+                   pattern="org.eclipse.ui.navigate.goToResource">
>+             </commandMenuExtension>
>+          </includes>
>+       </viewerCommandMenuBinding>
>+       <viewerHandlerBinding
>+             viewerId="org.eclipse.ui.navigator.ProjectExplorer">
>+          <includes>
>+             <handler
>+                   pattern="org.eclipse.ui.navigate.goToResource">
>+             </handler>
>+          </includes>
>+       </viewerHandlerBinding>
>        <viewerActionBinding
>             viewerId="org.eclipse.ui.navigator.ProjectExplorer">
>          <includes>
>@@ -313,6 +329,9 @@
>                class="org.eclipse.ui.internal.navigator.workingsets.WorkingSetSorter"
>                id="org.eclipse.ui.navigator.resources.workingSets.sorter"/>  
>       </navigatorContent>
>+      <commandMenuContribution
>+            commandId="org.eclipse.ui.navigate.goToResource">
>+      </commandMenuContribution>
>       
>    </extension>
>     <extension
>@@ -373,5 +392,5 @@
>     	<perspectiveExtension targetID = "org.eclipse.ui.resourcePerspective">
> 		    <showInPart id = "org.eclipse.ui.navigator.ProjectExplorer"/>
>     	</perspectiveExtension>
>-   	</extension>    
>+   	</extension>
> </plugin>

Actions: View | Diff

Attachments on bug 304925: 161232 | 161234