SE-179 yeastx plugin improvements

SVN: 14275

rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/eicml/EICMLChromatogramsReporter.java

@@ -152,9 +152,9 @@ public class EICMLChromatogramsReporter extends AbstractDatastorePlugin implemen
     private static void addReportHeaders(SimpleTableModelBuilder builder)
     {
         builder.addHeader("Label");
-        builder.addHeader("RT Start");
-        builder.addHeader("RT End");
-        builder.addHeader("Max. Intensity");
+        builder.addHeader("RT Start", true);
+        builder.addHeader("RT End", true);
+        builder.addHeader("Max. Intensity", true);
         builder.addHeader("Q1 Mz", true);
         builder.addHeader("Q3Low Mz", true);
         builder.addHeader("Q3High Mz", true);

rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/eicml/EICMLRunsReporter.java

@@ -16,12 +16,11 @@
 
 package ch.systemsx.cisd.yeastx.eicml;
 
-import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.SimpleTableModelBuilder.asDate;
 import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.SimpleTableModelBuilder.asNum;
-import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.SimpleTableModelBuilder.asText;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
@@ -96,6 +95,23 @@ public class EICMLRunsReporter extends AbstractDatastorePlugin implements IRepor
         return row;
     }
 
+    private static ISerializableComparable asDate(Date dateOrNull)
+    {
+        if (dateOrNull != null)
+        {
+            return SimpleTableModelBuilder.asDate(dateOrNull);
+        } else
+        {
+            return SimpleTableModelBuilder.asText("");
+        }
+    }
+
+    private static ISerializableComparable asText(String textOrNull)
+    {
+        String text = textOrNull == null ? "" : textOrNull;
+        return SimpleTableModelBuilder.asText(text);
+    }
+
     private static void addReportHeaders(SimpleTableModelBuilder builder)
     {
         builder.addHeader("Dataset");