Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2008-05-21 11:53:48 +0000
committerTomasz Zarna2008-05-21 11:53:48 +0000
commit9d48a1b16c35070b23bb8d5f31050841e2d3b802 (patch)
tree762a910ec9f6b71aab2b008aa9757f1d05a52ebb /examples
parent34ada9070c760ec07c4571678d11772c3e982218 (diff)
downloadeclipse.platform.team-9d48a1b16c35070b23bb8d5f31050841e2d3b802.tar.gz
eclipse.platform.team-9d48a1b16c35070b23bb8d5f31050841e2d3b802.tar.xz
eclipse.platform.team-9d48a1b16c35070b23bb8d5f31050841e2d3b802.zip
bug 232272: [Examples] Don't use the XML Compare example for real XMLs
Diffstat (limited to 'examples')
-rw-r--r--examples/org.eclipse.compare.examples.xml/doc-html/idMapping.html2
-rw-r--r--examples/org.eclipse.compare.examples.xml/doc-html/ui_xmlcompare_ex.html2
-rw-r--r--examples/org.eclipse.compare.examples.xml/plugin.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/org.eclipse.compare.examples.xml/doc-html/idMapping.html b/examples/org.eclipse.compare.examples.xml/doc-html/idMapping.html
index bab1295f2..abe6298b5 100644
--- a/examples/org.eclipse.compare.examples.xml/doc-html/idMapping.html
+++ b/examples/org.eclipse.compare.examples.xml/doc-html/idMapping.html
@@ -37,7 +37,7 @@ For example, if we create an ID Mapping Scheme with extension cd, the plugin.xml
<p>&lt;extension
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point="org.eclipse.compare.structureMergeViewers">
<br>&nbsp;&nbsp;&nbsp;&lt;structureMergeViewer
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;extensions="xml,classpath,<b>cd</b>"
+<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;extensions="cxml,classpath,<b>cd</b>"
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;class="org.eclipse.compare.xml.XMLStructureViewerCreator">
<br>&nbsp;&nbsp;&nbsp;&lt;/structureMergeViewer>
</tt>
diff --git a/examples/org.eclipse.compare.examples.xml/doc-html/ui_xmlcompare_ex.html b/examples/org.eclipse.compare.examples.xml/doc-html/ui_xmlcompare_ex.html
index e2de25170..3421fe3f7 100644
--- a/examples/org.eclipse.compare.examples.xml/doc-html/ui_xmlcompare_ex.html
+++ b/examples/org.eclipse.compare.examples.xml/doc-html/ui_xmlcompare_ex.html
@@ -15,7 +15,7 @@ what differences there are with respect to attributes or body text.
<li>Copy the folder <tt>org.eclipse.compare.examples.xml</tt> to the <tt>plugins</tt> subfolder of Eclipse.
</ul>
<h2>Using the plugin</h2>
-The plugin is automatically used when comparing files with the extension .xml.
+The plugin is automatically used when comparing files with the extension .cxml. The reason for this is that the plug-in illustrates how to register a compare merge viewer and other viewers, not to provide a compare of real XML files itself.
<br>
By default, the XML compare uses the <em>Unordered</em> compare method, which ignores the order in which the XML elements appear in the document and matches them so that elements which are most similar are matched.
There is also an <em>Ordered</em> compare method, which simply compares the XML elements exactly in the order in which they appear in the document. In most cases, this compare method will not be of much use.
diff --git a/examples/org.eclipse.compare.examples.xml/plugin.xml b/examples/org.eclipse.compare.examples.xml/plugin.xml
index 61908d581..449e8bc3b 100644
--- a/examples/org.eclipse.compare.examples.xml/plugin.xml
+++ b/examples/org.eclipse.compare.examples.xml/plugin.xml
@@ -84,7 +84,7 @@
<extension
point="org.eclipse.compare.structureMergeViewers">
<viewer
- extensions="xml,classpath"
+ extensions="cxml,classpath"
class="org.eclipse.compare.examples.xml.XMLStructureViewerCreator"
id="org.eclipse.compare.examples.xml.XMLStructureViewerCreator">
</viewer>

Back to the top