Author: bobtarling
Date: 2008-05-06 17:35:30-0700
New Revision: 14652
Added:
trunk/src/argouml-app/src/org/argouml/persistence/upgrades/upgrade6.xsl
Modified:
trunk/src/argouml-app/src/org/argouml/persistence/PGML.tee
trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java
trunk/src/argouml-app/src/org/argouml/persistence/argo.tee
Log:
Wrap each member element in a members tag and make sure they are in the correct order.
Modified: trunk/src/argouml-app/src/org/argouml/persistence/PGML.tee
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/PGML.tee?view=diff&rev=14652&p1=trunk/src/argouml-app/src/org/argouml/persistence/PGML.tee&p2=trunk/src/argouml-app/src/org/argouml/persistence/PGML.tee&r1=14651&r2=14652
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/PGML.tee (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/PGML.tee 2008-05-06 17:35:30-0700
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!DOCTYPE TemplateSet [
<!ELEMENT TemplateSet (macro | template)* >
<!ELEMENT macro (#PCDATA)>
Modified: trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java?view=diff&rev=14652&p1=trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java&r1=14651&r2=14652
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java 2008-05-06 17:35:30-0700
@@ -87,7 +87,7 @@
* This controls conversion of old persistence version files to be
* converted to the current one, keeping ArgoUML backwards compatible.
*/
- public static final int PERSISTENCE_VERSION = 5;
+ public static final int PERSISTENCE_VERSION = 6;
/**
* The TOTAL_PHASES_LOAD constant is the number of phases used by the load
Modified: trunk/src/argouml-app/src/org/argouml/persistence/argo.tee
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/argo.tee?view=diff&rev=14652&p1=trunk/src/argouml-app/src/org/argouml/persistence/argo.tee&p2=trunk/src/argouml-app/src/org/argouml/persistence/argo.tee&r1=14651&r2=14652
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/argo.tee (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/argo.tee 2008-05-06 17:35:30-0700
@@ -74,7 +74,9 @@
<searchpath href="<ocl>self.searchPathList</ocl>" />
- <ocl>self.members</ocl>
+ <members>
+ <ocl>self.members</ocl>
+ </members>
<historyfile name="<ocl>self.historyFile</ocl>" />
Added: trunk/src/argouml-app/src/org/argouml/persistence/upgrades/upgrade6.xsl
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/upgrades/upgrade6.xsl?view=auto&rev=14652
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/persistence/upgrades/upgrade6.xsl 2008-05-06 17:35:30-0700
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:output method="xml" indent="yes"/>
+ <xsl:preserve-space elements="uml"/>
+
+
+<!-- Make sure pgml members appear immediately after xmi -->
+
+ <!-- Write member tags within members as profile, xmi, pgml, todo -->
+ <xsl:template match='member[1]'>
+ <members>
+ <xsl:for-each select='/uml/argo/member[./@type = "profile"]'>
+ <member>
+ <xsl:copy-of select="@*"/>
+ </member>
+ </xsl:for-each>
+ <xsl:for-each select='/uml/argo/member[./@type = "xmi"]'>
+ <member>
+ <xsl:copy-of select="@*"/>
+ </member>
+ </xsl:for-each>
+ <xsl:for-each select='/uml/argo/member[./@type = "pgml"]'>
+ <member>
+ <xsl:copy-of select="@*"/>
+ </member>
+ </xsl:for-each>
+ <xsl:for-each select='/uml/argo/member[./@type = "todo"]'>
+ <member>
+ <xsl:copy-of select="@*"/>
+ </member>
+ </xsl:for-each>
+ <!-- Any other members that may be defined by plugins -->
+ <xsl:for-each select='/uml/argo/member[./@type = "profile" and ./@type = "xmi" and ./@type = "pgml" and ./@type = "todo"]'>
+ <member>
+ <xsl:copy-of select="@*"/>
+ </member>
+ </xsl:for-each>
+ </members>
+ </xsl:template>
+
+ <xsl:template match='member[position() > 1]'>
+ </xsl:template>
+
+<!--
+Anything not touched by the fixes above must be copied over unchanged
+-->
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.