diff options
Diffstat (limited to 'examples/org.eclipse.compare.examples.xml')
-rw-r--r-- | examples/org.eclipse.compare.examples.xml/doc-html/idMapping.html (renamed from examples/org.eclipse.compare.examples.xml/doc-html/org_eclipse_xmlcompare_idMapping.html) | 11 | ||||
-rw-r--r-- | examples/org.eclipse.compare.examples.xml/doc-html/tutorial_and_examples.html (renamed from examples/org.eclipse.compare.examples.xml/doc-html/org_eclipse_xmlcompare_tutorial_and_examples.html) | 4 | ||||
-rw-r--r-- | examples/org.eclipse.compare.examples.xml/doc-html/ui_xmlcompare_ex.html (renamed from examples/org.eclipse.compare.examples.xml/doc-html/org_eclipse_xmlcompare.html) | 11 | ||||
-rw-r--r-- | examples/org.eclipse.compare.examples.xml/plugin.properties | 4 | ||||
-rw-r--r-- | examples/org.eclipse.compare.examples.xml/plugin.xml | 45 | ||||
-rw-r--r-- | examples/org.eclipse.compare.examples.xml/schema/idMapping.exsd | 11 | ||||
-rw-r--r-- | examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/xmlcompare.properties | 22 |
7 files changed, 60 insertions, 48 deletions
diff --git a/examples/org.eclipse.compare.examples.xml/doc-html/org_eclipse_xmlcompare_idMapping.html b/examples/org.eclipse.compare.examples.xml/doc-html/idMapping.html index c50e7a2af..38de5539c 100644 --- a/examples/org.eclipse.compare.examples.xml/doc-html/org_eclipse_xmlcompare_idMapping.html +++ b/examples/org.eclipse.compare.examples.xml/doc-html/idMapping.html @@ -9,10 +9,12 @@ <center> <h1> idMapping</h1></center> -<b><i>Identifier: </i></b>org.eclipse.compare.xml.idMapping +<b><i>Identifier: </i></b>org.eclipse.compare.examples.xml.idMapping <p><b><i>Description: </i></b>This extension point allows to define internal XML ID Mapping -schemes using the <i>mapping</i> element. These schemes can then be used when performing an XML compare to uniquely identify XML elements by the value of an attribute or the text in a child element. -<br>Additionally, <i>ordered</i> elements can be used to specify that the direct children of an element should be compared in ordered fashion instead of the default unordered way. +schemes using the <i>mapping</i> element. These schemes can then be used when performing an XML compare to uniquely identify XML elements by the value of an +attribute or the text in a child element. +<br>Additionally, <i>ordered</i> elements can be used to specify that the direct children of an element should be compared in ordered fashion instead of the +default unordered way. <p><b><i>Configuration Markup:</i></b> <p><tt> <!ELEMENT idmap (mapping*)></tt> <br><tt> <!ATTLIST idmap</tt> @@ -95,6 +97,7 @@ Also, the children of <i>target</i> will be compared in the order in which they </tt> <p><b><i>Supplied Implementation:</i></b> <br>The XML Compare plugin defines an ID Mapping scheme for Eclipse <tt>plugin.xml</tt> files, one for <tt>.classpath</tt> files and one for ANT files. -<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001. All Rights Reserved." BORDER=0 height=12 width=195></a> + +<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corporation and others 2000, 2003. All Rights Reserved." BORDER=0 height=14 width=324></a></p> </body> </html> diff --git a/examples/org.eclipse.compare.examples.xml/doc-html/org_eclipse_xmlcompare_tutorial_and_examples.html b/examples/org.eclipse.compare.examples.xml/doc-html/tutorial_and_examples.html index 5f23982a3..946601f25 100644 --- a/examples/org.eclipse.compare.examples.xml/doc-html/org_eclipse_xmlcompare_tutorial_and_examples.html +++ b/examples/org.eclipse.compare.examples.xml/doc-html/tutorial_and_examples.html @@ -239,8 +239,6 @@ Additionally, Id Mappings (see <a href="#id_mapping">previous section</a>) can b The XML Compare Plugin already comes with a ID Mapping Scheme for ANT files, which can be customized for particular ANT files. <br><br> - -<br><br> -<a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001. All Rights Reserved." BORDER=0 height=12 width=195></a> +<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corporation and others 2000, 2003. All Rights Reserved." BORDER=0 height=14 width=324></a></p> </body> </html> diff --git a/examples/org.eclipse.compare.examples.xml/doc-html/org_eclipse_xmlcompare.html b/examples/org.eclipse.compare.examples.xml/doc-html/ui_xmlcompare_ex.html index 512dae01b..ceb031707 100644 --- a/examples/org.eclipse.compare.examples.xml/doc-html/org_eclipse_xmlcompare.html +++ b/examples/org.eclipse.compare.examples.xml/doc-html/ui_xmlcompare_ex.html @@ -12,7 +12,7 @@ a difference tree which indicates which XML elements have been added or removed what differences there are with respect to attributes or body text. <h2>Installing the plugin</h2> <ul> -<li>Copy the folder <tt>org.eclipse.compare.xml</tt> to the <tt>plugins</tt> subfolder of Eclipse. +<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. @@ -28,7 +28,7 @@ contains elements that can uniquely be identified by an attribute or the text of it is recommended that an ID Mapping Scheme be created for this type of XML document. <br> <br> -See <a href="org_eclipse_xmlcompare_tutorial_and_examples.html">Tutorial and Examples</a> for more information on using the plugin. +See <a href="tutorial_and_examples.html">Tutorial and Examples</a> for more information on using the plugin. <br> <h3>ID Mapping Schemes</h3> An ID Mapping Scheme specifies for XML elements an attribute or the text of a child element that @@ -47,7 +47,7 @@ The children of these children will continue to be compared in unordered way, un <h3>Defining ID Mapping Schemes and Ordered entries</h3> ID Mapping Schemes can be created in three different ways: <ol> -<li>By extending the extension point <a href="org_eclipse_xmlcompare_idMapping.html"><em>idMapping</em></a></li> +<li>By extending the extension point <a href="idMapping.html"><em>idMapping</em></a></li> <li>Using the <a href="PreferencePage.gif">XML Compare Preference page</a>.</li> <li>Using the <a href="CreateNewIDMapButton.gif">Create new Id Map Scheme button</a> in the toolbar and the <a href="IDMapContextMenu.gif">context menu</a> </ol> @@ -77,8 +77,9 @@ Only one extension point is available in the XML Compare plugin. It is used to c internal ID Mapping Schemes: <ul> <li> -<a href="org_eclipse_xmlcompare_idMapping.html">org.eclipse.xmlcompare.idMapping</a></li> +<a href="idMapping.html">org.eclipse.compare.examples.xml.idMapping</a></li> </ul> -<a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001. All Rights Reserved." BORDER=0 height=12 width=195></a> + +<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corporation and others 2000, 2003. All Rights Reserved." BORDER=0 height=14 width=324></a></p> </body> </html> diff --git a/examples/org.eclipse.compare.examples.xml/plugin.properties b/examples/org.eclipse.compare.examples.xml/plugin.properties index b5c6a6168..c65c5bb87 100644 --- a/examples/org.eclipse.compare.examples.xml/plugin.properties +++ b/examples/org.eclipse.compare.examples.xml/plugin.properties @@ -15,3 +15,7 @@ pluginName= XML Compare Support providerName= Eclipse.org pluginNamePreferencePage= XML Compare idMapping= ID Mapping + +antMap=ANT +eclipsePluginMap=Eclipse Plugin +classpathMap=Eclipse ClassPath diff --git a/examples/org.eclipse.compare.examples.xml/plugin.xml b/examples/org.eclipse.compare.examples.xml/plugin.xml index 4dbb97726..1006ff33e 100644 --- a/examples/org.eclipse.compare.examples.xml/plugin.xml +++ b/examples/org.eclipse.compare.examples.xml/plugin.xml @@ -30,6 +30,31 @@ /> <!-- Extension points --> + + <extension + point="org.eclipse.compare.examples.xml.idMapping"> + + <idmap id="antMap" name="%antMap"> + <mapping signature="project" id="name"/> + <mapping signature="project>target" id="name"/> + <ordered signature="project>target"/> + </idmap> + + <idmap id="eclipsePluginMap" name="%eclipsePluginMap"> + <mapping signature="plugin" id="id"/> + <mapping signature="plugin>requires>import" id="plugin"/> + <mapping signature="plugin>runtime>library" id="name"/> + <mapping signature="plugin>runtime>library>export" id="name"/> + <mapping signature="plugin>extension-point" id="id"/> + <mapping signature="plugin>extension" id="point"/> + </idmap> + + <idmap id="classpathMap" name="%classpathMap" extension="CLASSPATH"> + <mapping signature="classpath>classpathentry" id="path"/> + </idmap> + + </extension> + <extension point="org.eclipse.compare.structureMergeViewers"> <structureMergeViewer @@ -46,25 +71,5 @@ category= "org.eclipse.ui.preferencePages.Workbench"> </page> </extension> - - <extension - point="org.eclipse.compare.examples.xml.idMapping"> - <idmap name="ANT"> - <mapping signature="project" id="name"/> - <mapping signature="project>target" id="name"/> - <ordered signature="project>target"/> - </idmap> - <idmap name="Eclipse Plugin"> - <mapping signature="plugin" id="id"/> - <mapping signature="plugin>requires>import" id="plugin"/> - <mapping signature="plugin>runtime>library" id="name"/> - <mapping signature="plugin>runtime>library>export" id="name"/> - <mapping signature="plugin>extension-point" id="id"/> - <mapping signature="plugin>extension" id="point"/> - </idmap> - <idmap name="Eclipse ClassPath" extension="CLASSPATH"> - <mapping signature="classpath>classpathentry" id="path"/> - </idmap> - </extension> </plugin> diff --git a/examples/org.eclipse.compare.examples.xml/schema/idMapping.exsd b/examples/org.eclipse.compare.examples.xml/schema/idMapping.exsd index ace351953..9632e1602 100644 --- a/examples/org.eclipse.compare.examples.xml/schema/idMapping.exsd +++ b/examples/org.eclipse.compare.examples.xml/schema/idMapping.exsd @@ -10,7 +10,7 @@ These schemes can then be used when performing an XML compare to uniquely identify XML elements by the value of an attribute or the text in a child element. Additionally, <i>ordered</i> elements can be used to specify that the direct children of an element -should be compared in ordered fashion instead of the default unordered way. +should be compared in an ordered fashion instead of the default unordered way. </documentation> </annotation> @@ -22,21 +22,21 @@ should be compared in ordered fashion instead of the default unordered way. <attribute name="point" type="string" use="required"> <annotation> <documentation> - + a fully qualified identifier of the target extension point </documentation> </annotation> </attribute> <attribute name="id" type="string"> <annotation> <documentation> - + an optional identifier of the extension instance </documentation> </annotation> </attribute> <attribute name="name" type="string"> <annotation> <documentation> - the name of the ID Mapping scheme. Should be unique. + an optional name of the extension instance. </documentation> </annotation> </attribute> @@ -46,7 +46,8 @@ should be compared in ordered fashion instead of the default unordered way. <element name="idMap"> <complexType> <sequence> - <element ref="mapping" minOccurs="1" maxOccurs="unbounded"/> + <element ref="mapping"/> + <element ref="ordered"/> </sequence> <attribute name="name" type="string" use="required"> <annotation> diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/xmlcompare.properties b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/xmlcompare.properties index 387ce2f45..aaa375e9d 100644 --- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/xmlcompare.properties +++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/xmlcompare.properties @@ -32,26 +32,26 @@ ChooseMatcherDropDownAction.tooltip= Compare Mode XMLComparePreference.idtype.attribute= attribute XMLComparePreference.idtype.child_body= child text XMLComparePreference.topTableLabel= Id Mapping schemes: -XMLComparePreference.topTableColumn1= name -XMLComparePreference.topTableColumn2= internal/user -XMLComparePreference.topTableColumn2internal= internal -XMLComparePreference.topTableColumn2user= user -XMLComparePreference.topTableColumn3= extension +XMLComparePreference.topTableColumn1= Name +XMLComparePreference.topTableColumn2= Internal/User +XMLComparePreference.topTableColumn2internal= Internal +XMLComparePreference.topTableColumn2user= User +XMLComparePreference.topTableColumn3= Extension XMLComparePreference.topAdd= &Add... XMLComparePreference.topRename= &Edit... XMLComparePreference.topRemove= &Remove XMLComparePreference.topEdit= Edit &Copy... -XMLComparePreference.middleTableColumn1= element -XMLComparePreference.middleTableColumn2= path -XMLComparePreference.middleTableColumn3= id attribute -XMLComparePreference.middleTableColumn4= id source +XMLComparePreference.middleTableColumn1= Element +XMLComparePreference.middleTableColumn2= Path +XMLComparePreference.middleTableColumn3= Id Attribute +XMLComparePreference.middleTableColumn4= Id Source XMLComparePreference.middleNew= &New... XMLComparePreference.middleEdit= E&dit... XMLComparePreference.middleRemove= Re&move XMLComparePreference.middleTableLabel=Element mappings of selected Id Mapping Scheme: XMLComparePreference.bottomTableLabel=Elements whose children are compared in ordered fashion: -XMLComparePreference.bottomTableColumn1=element -XMLComparePreference.bottomTableColumn2=path +XMLComparePreference.bottomTableColumn1=Element +XMLComparePreference.bottomTableColumn2=Path XMLComparePreference.bottomNew=Ne&w... XMLComparePreference.bottomEdit=Edi&t... XMLComparePreference.bottomRemove=Remo&ve |