Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2005-02-07 17:58:24 +0000
committerAndre Weinand2005-02-07 17:58:24 +0000
commit679ecf3a03518cb288b900abec1b7cae90b67ce8 (patch)
treec4a8bdb09d715042f85aa19bb1f99aebcb447cbc /bundles/org.eclipse.compare/plugins
parentd96d0467513beea28a4be1693b257b73e0a50909 (diff)
downloadeclipse.platform.team-679ecf3a03518cb288b900abec1b7cae90b67ce8.tar.gz
eclipse.platform.team-679ecf3a03518cb288b900abec1b7cae90b67ce8.tar.xz
eclipse.platform.team-679ecf3a03518cb288b900abec1b7cae90b67ce8.zip
fixed bug #84487v20050207
Diffstat (limited to 'bundles/org.eclipse.compare/plugins')
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html8
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml9
3 files changed, 17 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath
index 3e86ace7d..d8656f772 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="compare"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="compare/"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index ad8a7a701..1dc28db48 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -12,6 +12,14 @@
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input February 8th 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=84487">84487</a>: Patch to put menu path contributions on ResourceMappings<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
Eclipse Build Input January 11th 2005
<h2>Problem reports fixed</h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
index ec7fac491..daeb0ade7 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
@@ -198,9 +198,9 @@
<extension
point="org.eclipse.ui.popupMenus">
<objectContribution
- objectClass="org.eclipse.core.resources.IResource"
+ objectClass="org.eclipse.core.resources.mapping.ResourceMapping"
adaptable="true"
- id="org.eclipse.compare.CompareAction">
+ id="org.eclipse.compare.MenuGroups">
<menu
label="%ReplaceWithMenu.label"
path="additions"
@@ -225,6 +225,11 @@
name="group1">
</separator>
</menu>
+ </objectContribution>
+ <objectContribution
+ objectClass="org.eclipse.core.resources.IResource"
+ adaptable="true"
+ id="org.eclipse.compare.CompareAction">
<action
label="%CompareWithEachOtherAction.label"
tooltip="%CompareWithEachOtherAction.tooltip"

Back to the top