Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-04-19 13:30:26 -0400
committerAndre Weinand2004-04-19 13:30:26 -0400
commitce86164934d392b2ec8efed0318cc2d4d4aa6207 (patch)
tree2f7287c3456451e61b5fd1d1e23bf9de4c9d4933 /bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
parentf2dbfb2a544b7e36ce129b32d04041b45d2bae2d (diff)
downloadeclipse.platform.team-ce86164934d392b2ec8efed0318cc2d4d4aa6207.tar.gz
eclipse.platform.team-ce86164934d392b2ec8efed0318cc2d4d4aa6207.tar.xz
eclipse.platform.team-ce86164934d392b2ec8efed0318cc2d4d4aa6207.zip
*** empty log message ***
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml')
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml28
1 files changed, 24 insertions, 4 deletions
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 163a0fd83..d9c32a910 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
@@ -310,11 +310,15 @@
<extension
point="org.eclipse.compare.streamMergers">
- <structureCreator
+ <streamMerger
extensions="txt"
- class="org.eclipse.compare.internal.merge.TextMerger"
- id="org.eclipse.compare.internal.merge.TextMerger">
- </structureCreator>
+ class="org.eclipse.compare.internal.merge.TextStreamMerger"
+ id="org.eclipse.compare.internal.merge.TextStreamMerger">
+ </streamMerger>
+ <contentTypeBinding
+ contentTypeId="org.eclipse.core.runtime.text"
+ streamMergerId="org.eclipse.compare.internal.merge.TextStreamMerger">
+ </contentTypeBinding>
</extension>
<extension
@@ -343,6 +347,10 @@
class="org.eclipse.compare.internal.ImageMergeViewerCreator"
id="org.eclipse.compare.ImageMergeViewerCreator">
</viewer>
+ <contentTypeBinding
+ contentTypeId="org.eclipse.core.runtime.text"
+ contentMergeViewerId="org.eclipse.compare.TextMergeViewerCreator">
+ </contentTypeBinding>
</extension>
<extension
@@ -352,6 +360,18 @@
class="org.eclipse.compare.internal.TextViewerCreator"
id="org.eclipse.compare.TextViewerCreator">
</viewer>
+ <contentTypeBinding
+ contentTypeId="org.eclipse.core.runtime.text"
+ contentViewerId="org.eclipse.compare.TextViewerCreator">
+ </contentTypeBinding>
</extension>
+
+ <extension point="org.eclipse.core.runtime.contentTypes">
+ <content-type id="foo" name="Foo Type"
+ base-type="org.eclipse.core.runtime.javaProperties"
+ file-extensions="foo"
+ />
+ </extension>
+
</plugin>

Back to the top