[HepData-svn] r1806 - trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components

[blackhole at projects.hepforge.org]

Author: watt
Date: Thu Jul 24 09:30:13 2014
New Revision: 1806

Log:
Support all signs for errors in HTML display of record

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java	Thu Jul 24 09:28:04 2014	(r1805)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java	Thu Jul 24 09:30:13 2014	(r1806)
@@ -614,8 +614,7 @@
 					writer.write(e.getNormType().toSymbol());
 				    } else {
 					vale = new SignificantFigures(e.getPlus());
-					if(e.getPlus()<0.0){ writer.write("");}
-					else if(e.getPlus() > e.getMinus()) { writer.write(" +"); }
+					if(e.getPlus()<0.0){ writer.write(""); }
 					else                           { writer.write(" +"); }
 					if (e.getNormType() == ErrorNorm.PCT) { lsd = vale.getLSD(); }
 					msd = vale.getMSD();
@@ -624,10 +623,8 @@
 					else { writer.write(Formats.forms(e.getPlus(), msd, -lsd)); }
 					writer.write(e.getNormType().toSymbol());
 					vale = new SignificantFigures(e.getMinus());
-					if(e.getPlus()<0.0){ writer.writeRaw(",+");}
-					else if(e.getPlus() > e.getMinus()) { writer.writeRaw(",-");}
-					//                                    else                           { writer.write(",+"); }
-					else                           { writer.write(",-"); }
+					if (e.getMinus()<0.0) { writer.write(","); }
+					else { writer.write(",+"); }
 					if (e.getNormType() == ErrorNorm.PCT) { lsd = vale.getLSD(); }
 					msd = vale.getMSD();
 					if (msd <= 0) msd = 1;

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java	Thu Jul 24 09:28:04 2014	(r1805)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/Tip.java	Thu Jul 24 09:30:13 2014	(r1806)
@@ -48,7 +48,7 @@
 
         writer.element("b");
 	writer.element("u");
-	writer.write("The basic hepdata keywords are");
+	writer.write("The basic HepData keywords are");
 	writer.end();
 	writer.write(": ");
         writer.end();