[Schmitzm-commits] r254 - trunk/src/schmitzm/jfree/chart/style

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-07-31 14:32:56 +0200 (Fri, 31 Jul 2009)
New Revision: 254

Modified:
   trunk/src/schmitzm/jfree/chart/style/ChartStyleXMLFactory.java
Log:
Just two developers synchronizing their changes...

Modified: trunk/src/schmitzm/jfree/chart/style/ChartStyleXMLFactory.java
===================================================================
--- trunk/src/schmitzm/jfree/chart/style/ChartStyleXMLFactory.java	2009-07-31 12:30:14 UTC (rev 253)
+++ trunk/src/schmitzm/jfree/chart/style/ChartStyleXMLFactory.java	2009-07-31 12:32:56 UTC (rev 254)
@@ -140,19 +140,19 @@
       throw new UnsupportedOperationException("Unknown orientation definition: "+orientationStr);
 
     // Title style
-    if ( element.getChild("title") != null );
+    if ( element.getChild("title") != null )
       chartStyle.setTitleStyle( createLabelStyleFromXML(element.getChild("title") ) );
     // Description style
-    if ( element.getChild("desc") != null );
+    if ( element.getChild("desc") != null )
       chartStyle.setDescStyle( createLabelStyleFromXML(element.getChild("desc") ) );
     // Domain axis
-    if ( element.getChild("domainAxis") != null );
+    if ( element.getChild("domainAxis") != null )
       chartStyle.setAxisStyle( ChartStyle.DOMAIN_AXIS,createAxisStyleFromXML(element.getChild("domainAxis") ) );
     // Range axis
-    if ( element.getChild("rangeAxis") != null );
+    if ( element.getChild("rangeAxis") != null )
       chartStyle.setAxisStyle( ChartStyle.RANGE_AXIS,createAxisStyleFromXML(element.getChild("rangeAxis") ) );
     // Second range axis
-    if ( element.getChild("rangeAxis2") != null );
+    if ( element.getChild("rangeAxis2") != null )
       chartStyle.setAxisStyle( ChartStyle.RANGE_AXIS2,createAxisStyleFromXML(element.getChild("rangeAxis2") ) );
 
     // Rendering of series
@@ -161,7 +161,7 @@
       chartStyle.setRendererStyle(i,createRendererStyleFromXML(rendererElements.get(i)));
       
     // Plot
-    if ( element.getChild("plot") != null );
+    if ( element.getChild("plot") != null )
       chartStyle.setPlotStyle( createPlotStyleFromXML(element.getChild("plot") ) );
 
     // apply type specific properties
@@ -501,7 +501,7 @@
       child = null;
     
     // If element is given, the child is added
-    if ( element != null )
+    if ( element != null && child != null )
       element.addContent(child);
 
     return child;