Merge remote-tracking branch 'origin/PVA' into PVA

# Conflicts: # highchartsapi-demo/highchartsapi-demo.iml # highchartsapi/pom.xml
downdrown · Apr 14, 2015 · 162cb44 · 162cb44
2 parents 58b0098 + 6d21f1f
commit 162cb44
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/highchartsapi/src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/Axis.java b/highchartsapi/src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/Axis.java
@@ -22,9 +22,13 @@ public class Axis {
     private boolean showLastLabel = true;
     private boolean labelsEnabled = true;
     private boolean allowDecimals = true;
-    private int tickLength = 0;
+    private int tickLength = 1;
     private int gridLineWidth = 1;
 
+    public Axis() {
+
+    }
+
     public Axis(AxisType axisType) {
         this.axisType = axisType;
     }
@@ -146,7 +150,7 @@ public String getHighChartValue() throws HighChartsException {
         if (this.title != null) {
             builder.append("title : { text: '" + this.title + "' }");
         } else {
-            builder.append("title : { enabled: false}");
+            builder.append("title : { text: null }");
         }
 
         //Axis Value Type