Tweaks (#572)

* Refactored

* Fixed WM legend in pdf

Author: bowring

squidApp/src/main/java/org/cirdles/squid/gui/dateInterpretations/plots/squid/WeightedMeanPlot.java

@@ -948,15 +948,15 @@ private void paintToSVG(Graphics2D g2d) {
 
         // legend
         text.setText("Legend:");
-        g2d.drawString(text.getText(), leftMargin + 225, topMargin + graphHeight + 80);
+        g2d.drawString(text.getText(), leftMargin + 125, topMargin + graphHeight + 80);
 
         g2d.setPaint(java.awt.Color.RED);
         text.setText("Included");
-        g2d.drawString(text.getText(), leftMargin + 325, topMargin + graphHeight + 80);
+        g2d.drawString(text.getText(), leftMargin + 225, topMargin + graphHeight + 80);
 
         g2d.setPaint(java.awt.Color.BLUE);
         text.setText("Excluded");
-        g2d.drawString(text.getText(), leftMargin + 425, topMargin + graphHeight + 80);
+        g2d.drawString(text.getText(), leftMargin + 325, topMargin + graphHeight + 80);
 
         // provide highlight and info about selected spot
         g2d.setFont(new java.awt.Font("SansSerif", java.awt.Font.PLAIN, 11));

squidCore/src/main/java/org/cirdles/squid/squidReports/squidReportColumns/SquidReportColumnXMLConverter.java

@@ -23,7 +23,7 @@ public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingC
         if (col.getUncertaintyColumn() != null) {
             context.convertAnother(col.getUncertaintyColumn());
         } else {
-            writer.setValue("null");
+            writer.setValue("");
         }
         writer.endNode();
 
@@ -59,7 +59,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
         reader.moveUp();
 
         reader.moveDown();
-        if (!reader.getValue().equals("null")) {
+        if (reader.getValue().length() > 0) {
             SquidReportColumnInterface uncertaintyColumn = SquidReportColumn.createSquidReportColumn("");
             uncertaintyColumn = (SquidReportColumnInterface) context.convertAnother(uncertaintyColumn, SquidReportColumn.class);
             col.setUncertaintyColumn(uncertaintyColumn);