Only show EGit views in the context of EGit

The navigation action set is no longer visible by default in all
perspectives and is instead added explicitly to the Git Repository
Exploring perspective layout.

Bug 356554
Change-Id: I136189f7605abe13f7f2c6346c093094ded64c78
Signed-off-by: Daniel Megert <daniel_megert@ch.ibm.com>
Signed-off-by: Kevin Sawicki <kevin@github.com>

2 files changed, 31 insertions, 2 deletions

diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index 2a82d60ee3..dd8b6a779c 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -3887,12 +3887,13 @@
             searchResultClass="org.eclipse.egit.ui.internal.search.CommitSearchResult">
       </viewPage>
    </extension>
+
    <extension
          point="org.eclipse.ui.actionSets">
       <actionSet
             id="org.eclipse.egit.ui.navigation"
             label="%NavigationActionSet.label"
-            visible="true">
+            visible="false">
         <action
                class="org.eclipse.egit.ui.internal.commit.OpenCommitAction"
                icon="icons/obj16/open-commit.gif"
@@ -3904,6 +3905,31 @@
                tooltip="%OpenCommitAction.tooltip"/>
        </actionSet>
    </extension>
+   <extension
+         point="org.eclipse.ui.actionSetPartAssociations">
+      <actionSetPartAssociation
+            targetID="org.eclipse.egit.ui.navigation">
+         <part
+               id="org.eclipse.egit.ui.RepositoriesView">
+         </part>
+         <part
+               id="org.eclipse.egit.ui.StagingView">
+         </part>
+         <part
+               id="org.eclipse.egit.ui.CompareTreeView">
+         </part>
+         <part
+               id="org.eclipse.egit.ui.ReflogView">
+         </part>
+         <part
+               id="org.eclipse.egit.ui.commitEditor">
+         </part>
+         <part
+               id="org.eclipse.team.ui.GenericHistoryView">
+         </part>
+      </actionSetPartAssociation>
+   </extension>
+
   <extension
 	point="org.eclipse.core.variables.dynamicVariables">
      <variable
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/GitRepositoriesPerspectiveFactory.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/GitRepositoriesPerspectiveFactory.java
index 297ae96ff9..a64243336e 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/GitRepositoriesPerspectiveFactory.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/GitRepositoriesPerspectiveFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 SAP AG.
+ * Copyright (c) 2010, 2011 SAP AG 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
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *    Mathias Kinzler (SAP AG) - initial implementation
+ *    Daniel Megert <daniel_megert@ch.ibm.com> - EGit must not pollute toolbars of perspectives it doesn't own - http://bugs.eclipse.org/356554
  *******************************************************************************/
 package org.eclipse.egit.ui;
 
@@ -45,6 +46,8 @@ public class GitRepositoriesPerspectiveFactory implements IPerspectiveFactory {
 		layout.addShowViewShortcut(StagingView.VIEW_ID);
 		// shortcut to Reflog view
 		layout.addShowViewShortcut(ReflogView.VIEW_ID);
+
+		layout.addActionSet("org.eclipse.egit.ui.navigation"); //$NON-NLS-1$
 	}
 
 }