[EGIT PATCH 1/4] Cleanup ui plugin.xml, refer to interface IResource, not Resource

[EGIT PATCH 1/4] Cleanup ui plugin.xml, refer to interface IResource, not Resource

[Robin Rosenberg]

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
 org.spearce.egit.ui/plugin.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/org.spearce.egit.ui/plugin.xml b/org.spearce.egit.ui/plugin.xml
index e6e3762..0b18f15 100644
--- a/org.spearce.egit.ui/plugin.xml
+++ b/org.spearce.egit.ui/plugin.xml
@@ -170,7 +170,7 @@
             </adapter>
          </factory>
          <factory
-               adaptableType="org.eclipse.core.internal.resources.Resource"
+	       adaptableType="org.eclipse.core.resources.IResource"
                class="org.spearce.egit.ui.internal.factories.GitAdapterFactory">
             <adapter
                   type="org.eclipse.team.ui.history.IHistoryPageSource">
-- 
1.6.1.285.g35d8b

[EGIT PATCH 2/4] Cleanup ui plugin.xml, replace deprecated elements and attributes

[Robin Rosenberg]

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
 org.spearce.egit.ui/plugin.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/org.spearce.egit.ui/plugin.xml b/org.spearce.egit.ui/plugin.xml
index 0b18f15..e5c81e5 100644
--- a/org.spearce.egit.ui/plugin.xml
+++ b/org.spearce.egit.ui/plugin.xml
@@ -196,11 +196,16 @@
 
    <extension point="org.eclipse.ui.propertyPages">
       <page
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true"
             name="%Git"
             class="org.spearce.egit.ui.internal.preferences.GitProjectPropertyPage"
             id="org.spearce.egit.ui.preferences.GitProjectPropertyPage">
+	    <enabledWhen>
+		<adapt type="org.eclipse.core.resources.IProject">
+			<test
+		    property="projectPersistentProperty org.eclipse.team.core.repository" value="org.spearce.egit.core.GitProvider">
+			</test>
+		</adapt>
+	    </enabledWhen>
          <filter
                name="projectPersistentProperty"
                value="org.eclipse.team.core.repository=org.spearce.egit.core.GitProvider">
-- 
1.6.1.285.g35d8b

[EGIT PATCH 3/4] Add the keyword "Git" to the git preferences pages.

[Robin Rosenberg]

If the users searches for "Git" in the workspaces preferences, all
git related preferences pages will now be found.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
 org.spearce.egit.ui/plugin.xml |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/org.spearce.egit.ui/plugin.xml b/org.spearce.egit.ui/plugin.xml
index e5c81e5..c2b82fd 100644
--- a/org.spearce.egit.ui/plugin.xml
+++ b/org.spearce.egit.ui/plugin.xml
@@ -187,11 +187,19 @@
       <page name="%GitPreferences_HistoryPreferencePage_name"
             category="org.eclipse.team.ui.TeamPreferences/org.spearce.egit.ui.GitPreferences"
             class="org.spearce.egit.ui.internal.preferences.HistoryPreferencePage"
-            id="org.spearce.egit.ui.internal.preferences.HistoryPreferencePage" />
+	    id="org.spearce.egit.ui.internal.preferences.HistoryPreferencePage" >
+	    <keywordReference
+		  id="org.spearce.egit.ui.keyword.git">
+	    </keywordReference>
+	    </page>
       <page name="%GitPreferences_WindowCachePreferencePage_name"
             category="org.eclipse.team.ui.TeamPreferences/org.spearce.egit.ui.GitPreferences"
             class="org.spearce.egit.ui.internal.preferences.WindowCachePreferencePage"
-            id="org.spearce.egit.ui.internal.preferences.WindowCachePreferencePage" />
+	    id="org.spearce.egit.ui.internal.preferences.WindowCachePreferencePage" >
+	    <keywordReference
+		  id="org.spearce.egit.ui.keyword.git">
+	    </keywordReference>
+      </page>
    </extension>
 
    <extension point="org.eclipse.ui.propertyPages">
@@ -212,6 +220,14 @@
          </filter>
       </page>
    </extension>
+
+   <extension point="org.eclipse.ui.keywords">
+	  <keyword
+			id="org.spearce.egit.ui.keyword.git"
+			label="git">
+	  </keyword>
+   </extension>
+
    <extension point="org.eclipse.ui.decorators">
       <decorator
             lightweight="true"
-- 
1.6.1.285.g35d8b

[EGIT PATCH 4/4] Retain Eclipse Git preferences page hierarchy without warnings in plugin.xml

[Robin Rosenberg]

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
 org.spearce.egit.ui/plugin.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.spearce.egit.ui/plugin.xml b/org.spearce.egit.ui/plugin.xml
index c2b82fd..869108c 100644
--- a/org.spearce.egit.ui/plugin.xml
+++ b/org.spearce.egit.ui/plugin.xml
@@ -185,7 +185,7 @@
             id="org.spearce.egit.ui.GitPreferences" />
 
       <page name="%GitPreferences_HistoryPreferencePage_name"
-            category="org.eclipse.team.ui.TeamPreferences/org.spearce.egit.ui.GitPreferences"
+	    category="org.spearce.egit.ui.GitPreferences"
             class="org.spearce.egit.ui.internal.preferences.HistoryPreferencePage"
 	    id="org.spearce.egit.ui.internal.preferences.HistoryPreferencePage" >
 	    <keywordReference
@@ -193,7 +193,7 @@
 	    </keywordReference>
 	    </page>
       <page name="%GitPreferences_WindowCachePreferencePage_name"
-            category="org.eclipse.team.ui.TeamPreferences/org.spearce.egit.ui.GitPreferences"
+	    category="org.spearce.egit.ui.GitPreferences"
             class="org.spearce.egit.ui.internal.preferences.WindowCachePreferencePage"
 	    id="org.spearce.egit.ui.internal.preferences.WindowCachePreferencePage" >
 	    <keywordReference
-- 
1.6.1.285.g35d8b