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

[blackhole at projects.hepforge.org]

Author: whalley
Date: Thu Oct 21 10:53:27 2010
New Revision: 1417

Log:
fix html display with  missing properties

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.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	Wed Oct 20 10:28:59 2010	(r1416)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DatasetAsHtml.java	Thu Oct 21 10:53:27 2010	(r1417)
@@ -115,7 +115,16 @@
 // this is the actual output
 // first check is same across row
                 Boolean same = true;
-                for (int nmy=0; nmy<ny-1; nmy++){ if(!store[nmy][i].equals(store[nmy+1][i])){ same = false; } }
+                for (int nmy=0; nmy<ny-1; nmy++){ 
+             
+                    if(store[nmy][i] != null && store[nmy+1][i] != null){                 
+                        if(!store[nmy][i].equals(store[nmy+1][i])){ 
+                            same = false; 
+                        } 
+                    } else{
+                        same = false;
+                    }  
+                }
                 if(same) {
                     writer.element("th");
                     writer.attributes("colspan",ny);