Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2012-10-25 23:54:52 +0000
committerJeff Johnston2012-10-26 16:13:23 +0000
commitd669aac7e232704c6fc4a98d30e533d2595d529b (patch)
treeac8daf49e8b58cef7942a71a0805fc02665507fc
parentfeb5808e24a379199b7d3a60172bda59870b0fb8 (diff)
downloadorg.eclipse.linuxtools-d669aac7e232704c6fc4a98d30e533d2595d529b.tar.gz
org.eclipse.linuxtools-d669aac7e232704c6fc4a98d30e533d2595d529b.tar.xz
org.eclipse.linuxtools-d669aac7e232704c6fc4a98d30e533d2595d529b.zip
Fix regression in ChangeLog UI
- Add menuContributions to replace the data in the old ActionSets which were removed Change-Id: I61b81548d241bc99af4950850d83d2490db53dc8 Reviewed-on: https://git.eclipse.org/r/8381 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> IP-Clean: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com>
-rw-r--r--changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF3
-rw-r--r--changelog/org.eclipse.linuxtools.changelog.core/plugin.xml64
2 files changed, 66 insertions, 1 deletions
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF
index 1ada34c5a0..b10f1171d4 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF
+++ b/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.team.ui,
org.eclipse.ui.navigator,
org.eclipse.compare,
org.eclipse.core.resources,
- org.eclipse.core.filesystem
+ org.eclipse.core.filesystem,
+ org.eclipse.core.expressions;bundle-version="3.3.0"
Export-Package: org.eclipse.linuxtools.changelog.core
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml b/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml
index 09df3422d3..e3b6103b56 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.core/plugin.xml
@@ -215,5 +215,69 @@
</visibleWhen>
</command>
</menuContribution>
+ <menuContribution
+ locationURI="menu:edit">
+ <command
+ commandId="org.eclipse.linuxtools.changelog.core.actions.KeyActionCommand"
+ style="push"
+ tooltip="%clEntry">
+ </command>
+ </menuContribution>
+ <menuContribution
+ locationURI="menu:project">
+ <command
+ commandId="org.eclipse.linuxtools.changelog.core.preparechangelog"
+ style="push"
+ tooltip="%prepChangeLog.tooltip">
+ <visibleWhen
+ checkEnabled="false">
+ <with variable="selection">
+ <iterate operator="and" ifEmpty="false">
+ <or>
+ <adapt
+ type="java.lang.Object">
+ </adapt>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test
+ property="org.eclipse.core.resources.projectNature"
+ value="org.eclipse.cdt.core.cnature"/>
+ </adapt>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test
+ property="org.eclipse.core.resources.projectNature"
+ value="org.eclipse.jdt.core.javanature"/>
+ </adapt>
+ </or>
+ <or>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test
+ args="org.eclipse.team.core.repository"
+ property="org.eclipse.core.resources.projectPersistentProperty"
+ value="org.eclipse.team.svn.core.svnnature"/>
+ </adapt>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test
+ args="org.eclipse.team.core.repository"
+ property="org.eclipse.core.resources.projectPersistentProperty"
+ value="org.eclipse.team.cvs.core.cvsnature"/>
+ </adapt>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test
+ args="org.eclipse.team.core.repository"
+ property="org.eclipse.core.resources.projectPersistentProperty"
+ value="org.tigris.subversion.subclipse.core.svnnature"/>
+ </adapt>
+ <adapt type="org.eclipse.core.resources.IResource">
+ <test
+ args="org.eclipse.team.core.repository"
+ property="org.eclipse.core.resources.projectPersistentProperty"
+ value="org.eclipse.egit.core.GitProvider"/>
+ </adapt>
+ </or>
+ </iterate>
+ </with>
+ </visibleWhen>
+ </command>
+ </menuContribution>
</extension>
</plugin>

Back to the top