[HepData-svn] r1655 - trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats

[blackhole at projects.hepforge.org]

Author: whalley
Date: Wed Nov  6 14:31:52 2013
New Revision: 1655

Log:
further tweaks to HepML formatter

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/HepMLFormatter.java

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/HepMLFormatter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/HepMLFormatter.java	Wed Nov  6 12:01:57 2013	(r1654)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/formats/HepMLFormatter.java	Wed Nov  6 14:31:52 2013	(r1655)
@@ -88,7 +88,7 @@
                 if(err.getPlus() != null){ s.append(" plus='" + err.getPlus() + "'"); }
                 if(err.getMinus() != null){ s.append(" minus='" + err.getMinus() + "'"); }
                 if(err.getSourceType() != null){ s.append(" source='" + err.getSourceType().toShortString() + "'"); }
-                if(err.getNormType() != null){ s.append(" norm='" + err.getNormType().toSymbol() + "'"); }
+                if(err.getNormType() != null){ s.append(" norm='" + err.getNormType().toShortName() + "'"); }
                 if(err.getComment() != null){ s.append(" comment='" + err.getComment() + "'"); }
                 s.append(" />\n");
             }
@@ -119,7 +119,7 @@
                         s.append("              <particle");
                         if(part.getName() != null){ s.append(" name='" + part.getName() + "'"); }
                         if(part.getMultRelation() != null){ s.append(" relation='" + part.getMultRelation() + "'"); }
-                        if(part.getMultiplicity() != null){ s.append(" multiplicity='" + part.getMultiplicity() + "'"); }
+                        if(part.getMultiplicity() != null){ s.append(" multi='" + part.getMultiplicity() + "'"); }
                         s.append(" />\n");
                     }
                     s.append("            </initialstate>\n"); 
@@ -128,7 +128,7 @@
                          s.append("              <particle");
                         if(part.getName() != null){ s.append(" name='" + part.getName() + "'"); }
                         if(part.getMultRelation() != null){ s.append(" relation='" + part.getMultRelation() + "'"); }
-                        if(part.getMultiplicity() != null){ s.append(" multiplicity='" + part.getMultiplicity() + "'"); }
+                        if(part.getMultiplicity() != null){ s.append(" mult='" + part.getMultiplicity() + "'"); }
                         s.append(" />\n");
                     }
                     s.append("            </finalstate>\n"); 
@@ -154,7 +154,7 @@
                     if(err.getPlus() != null){ s.append(" plus='" + err.getPlus() + "'"); }
                     if(err.getMinus() != null){ s.append(" minus='" + err.getMinus() + "'"); }
                     if(err.getSourceType() != null){ s.append(" source='" + err.getSourceType().toShortString() + "'"); }
-                    if(err.getNormType() != null){ s.append(" norm='" + err.getNormType().toSymbol() + "'"); }
+                    if(err.getNormType() != null){ s.append(" norm='" + err.getNormType().toShortName() + "'"); }
                     if(err.getComment() != null){ s.append(" comment='" + err.getComment() + "'"); }
                     s.append(" />\n");
                 }