- Added BoxPlotChart support.

- Added BubbleChart support.
- Added ColumnRangeChart support.
- Added ErrorBarChart support.
- Added FunnelChart support.

- Added exporting.js
- Added funnel.js

src/main/java/at/downdrown/vaadinaddons/highchartsapi/HighChart.java

@@ -2,7 +2,7 @@
 
 import com.vaadin.annotations.JavaScript;
 
-@JavaScript({"jquery-2.1.3.min.js", "highcharts-more.js", "highcharts.js", "highcharts-connector.js"})
+@JavaScript({"jquery-2.1.3.min.js", "exporting.js", "funnel.js", "highcharts-more.js", "highcharts.js", "highcharts-connector.js"})
 public class HighChart extends AbstractHighChart {
     private static final long serialVersionUID = -7326315426217377753L;
 }

src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/data/AreaRangeChartData.java

@@ -1,5 +1,7 @@
 package at.downdrown.vaadinaddons.highchartsapi.model.data;
 
+import at.downdrown.vaadinaddons.highchartsapi.model.data.base.RangeData;
+
 /**
  * Projekt: VaadinHighChartsAPI<br>
  * Package: at.downdrown.vaadinaddons.highchartsapi.model.data<br>
@@ -10,49 +12,10 @@
  *
  * @author Manfred Huber (02ub0j08)<br>
  */
-public class AreaRangeChartData implements HighChartsData {
-
-    private double x;
-    private double low;
-    private double high;
+public class AreaRangeChartData extends RangeData {
 
     public AreaRangeChartData(double x, double low, double high) {
-        this.x = x;
-        this.low = low;
-        this.high = high;
+        super(x, low, high);
     }
 
-    public double getX() {
-        return x;
-    }
-
-    public void setX(double x) {
-        this.x = x;
-    }
-
-    public double getLow() {
-        return low;
-    }
-
-    public void setLow(double low) {
-        this.low = low;
-    }
-
-    public double getHigh() {
-        return high;
-    }
-
-    public void setHigh(double high) {
-        this.high = high;
-    }
-
-    @Override
-    public String getHighChartValue() {
-        return "[" + x + ", " + low + ", " + high + "]";
-    }
-
-    @Override
-    public String toString() {
-        return this.getHighChartValue();
-    }
 }

src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/data/AreaSplineRangeChartData.java

@@ -0,0 +1,21 @@
+package at.downdrown.vaadinaddons.highchartsapi.model.data;
+
+import at.downdrown.vaadinaddons.highchartsapi.model.data.base.RangeData;
+
+/**
+ * Projekt: VaadinHighChartsAPI<br>
+ * Package: at.downdrown.vaadinaddons.highchartsapi.model.data<br>
+ * Klasse: AreaRangeChartData.class<br>
+ * Erstellt am 21. August 2015.<br>
+ * Copyright &copy; HSWE Allg. Applikationen.<br>
+ * <br>
+ *
+ * @author Manfred Huber (02ub0j08)<br>
+ */
+public class AreaSplineRangeChartData extends RangeData {
+
+    public AreaSplineRangeChartData(double x, double low, double high) {
+        super(x, low, high);
+    }
+
+}

src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/data/BoxPlotChartData.java

@@ -0,0 +1,100 @@
+package at.downdrown.vaadinaddons.highchartsapi.model.data;
+
+/**
+ * Projekt: VaadinHighChartsAPI<br>
+ * Package: at.downdrown.vaadinaddons.highchartsapi.model.data<br>
+ * Klasse: BoxPlotChartData.class<br>
+ * Erstellt am 24. August 2015.<br>
+ * Copyright &copy; HSWE Allg. Applikationen.<br>
+ * <br>
+ *
+ * @author Manfred Huber (02ub0j08)<br>
+ */
+public class BoxPlotChartData implements HighChartsData {
+
+    private String name = null;
+    private double minimum;
+    private double lowerQuartile;
+    private double median;
+    private double upperQuartile;
+    private double maximum;
+
+    public BoxPlotChartData(String name, double minimum, double lowerQuartile, double median, double upperQuartile, double maximum) {
+        this.name = name;
+        this.minimum = minimum;
+        this.lowerQuartile = lowerQuartile;
+        this.median = median;
+        this.upperQuartile = upperQuartile;
+        this.maximum = maximum;
+    }
+
+    public BoxPlotChartData(double minimum, double lowerQuartile, double median, double upperQuartile, double maximum) {
+        this.minimum = minimum;
+        this.lowerQuartile = lowerQuartile;
+        this.median = median;
+        this.upperQuartile = upperQuartile;
+        this.maximum = maximum;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getMinimum() {
+        return minimum;
+    }
+
+    public void setMinimum(double minimum) {
+        this.minimum = minimum;
+    }
+
+    public double getLowerQuartile() {
+        return lowerQuartile;
+    }
+
+    public void setLowerQuartile(double lowerQuartile) {
+        this.lowerQuartile = lowerQuartile;
+    }
+
+    public double getMedian() {
+        return median;
+    }
+
+    public void setMedian(double median) {
+        this.median = median;
+    }
+
+    public double getUpperQuartile() {
+        return upperQuartile;
+    }
+
+    public void setUpperQuartile(double upperQuartile) {
+        this.upperQuartile = upperQuartile;
+    }
+
+    public double getMaximum() {
+        return maximum;
+    }
+
+    public void setMaximum(double maximum) {
+        this.maximum = maximum;
+    }
+
+    @Override
+    public String getHighChartValue() {
+        if (name != null) {
+            return "['" + name + "', " + minimum + ", " + lowerQuartile + ", " + median + ", " + upperQuartile + ", " + maximum + "]";
+        } else {
+            return "[" + minimum + ", " + lowerQuartile + ", " + median + ", " + upperQuartile + ", " + maximum + "]";
+        }
+    }
+
+    @Override
+    public String toString() {
+        return this.getHighChartValue();
+    }
+}

src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/data/BubbleChartData.java

@@ -0,0 +1,58 @@
+package at.downdrown.vaadinaddons.highchartsapi.model.data;
+
+/**
+ * Projekt: VaadinHighChartsAPI<br>
+ * Package: at.downdrown.vaadinaddons.highchartsapi.model.data<br>
+ * Klasse: BubbleChartData.class<br>
+ * Erstellt am 24. August 2015.<br>
+ * Copyright &copy; HSWE Allg. Applikationen.<br>
+ * <br>
+ *
+ * @author Manfred Huber (02ub0j08)<br>
+ */
+public class BubbleChartData implements HighChartsData {
+
+    private double x;
+    private double y;
+    private double z;
+
+    public BubbleChartData(double x, double y, double z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    public double getX() {
+        return x;
+    }
+
+    public void setX(double x) {
+        this.x = x;
+    }
+
+    public double getY() {
+        return y;
+    }
+
+    public void setY(double y) {
+        this.y = y;
+    }
+
+    public double getZ() {
+        return z;
+    }
+
+    public void setZ(double z) {
+        this.z = z;
+    }
+
+    @Override
+    public String getHighChartValue() {
+        return "[" + x + ", " + y + ", " + z + "]";
+    }
+
+    @Override
+    public String toString() {
+        return this.getHighChartValue();
+    }
+}

src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/data/ColumnRangeChartData.java

@@ -0,0 +1,20 @@
+package at.downdrown.vaadinaddons.highchartsapi.model.data;
+
+import at.downdrown.vaadinaddons.highchartsapi.model.data.base.RangeData;
+
+/**
+ * Projekt: VaadinHighChartsAPI<br>
+ * Package: at.downdrown.vaadinaddons.highchartsapi.model.data<br>
+ * Klasse: ColumnRangeChartData.class<br>
+ * Erstellt am 25. August 2015.<br>
+ * Copyright &copy; HSWE Allg. Applikationen.<br>
+ * <br>
+ *
+ * @author Manfred Huber (02ub0j08)<br>
+ */
+public class ColumnRangeChartData extends RangeData {
+
+    public ColumnRangeChartData(double x, double low, double high) {
+        super(x, low, high);
+    }
+}

src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/data/base/DoubleData.java

@@ -0,0 +1,38 @@
+package at.downdrown.vaadinaddons.highchartsapi.model.data.base;
+
+/**
+ * Projekt: VaadinHighChartsAPI<br>
+ * Package: at.downdrown.vaadinaddons.highchartsapi.model.data.base<br>
+ * Klasse: DoubleData.class<br>
+ * Erstellt am 25. August 2015.<br>
+ * Copyright &copy; HSWE Allg. Applikationen.<br>
+ * <br>
+ *
+ * @author Manfred Huber (02ub0j08)<br>
+ */
+public class DoubleData implements HighChartsBaseData {
+
+    private double value;
+
+    public DoubleData(double value) {
+        this.value = value;
+    }
+
+    public double getValue() {
+        return value;
+    }
+
+    public void setValue(double value) {
+        this.value = value;
+    }
+
+    @Override
+    public String getHighChartValue() {
+        return String.valueOf(this.value);
+    }
+
+    @Override
+    public String toString() {
+        return this.getHighChartValue();
+    }
+}

src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/data/base/ErrorBarChartData.java

@@ -0,0 +1,19 @@
+package at.downdrown.vaadinaddons.highchartsapi.model.data.base;
+
+/**
+ * Projekt: VaadinHighChartsAPI<br>
+ * Package: at.downdrown.vaadinaddons.highchartsapi.model.data.base<br>
+ * Klasse: ErrorBarChartData.class<br>
+ * Erstellt am 25. August 2015.<br>
+ * Copyright &copy; HSWE Allg. Applikationen.<br>
+ * <br>
+ *
+ * @author Manfred Huber (02ub0j08)<br>
+ */
+public class ErrorBarChartData extends RangeData {
+
+    public ErrorBarChartData(double x, double low, double high) {
+        super(x, low, high);
+    }
+
+}

src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/data/base/IntData.java

@@ -0,0 +1,38 @@
+package at.downdrown.vaadinaddons.highchartsapi.model.data.base;
+
+/**
+ * Projekt: VaadinHighChartsAPI<br>
+ * Package: at.downdrown.vaadinaddons.highchartsapi.model.data.base<br>
+ * Klasse: IntData.class<br>
+ * Erstellt am 25. August 2015.<br>
+ * Copyright &copy; HSWE Allg. Applikationen.<br>
+ * <br>
+ *
+ * @author Manfred Huber (02ub0j08)<br>
+ */
+public class IntData implements HighChartsBaseData {
+
+    private int value;
+
+    public IntData(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    @Override
+    public String getHighChartValue() {
+        return String.valueOf(this.value);
+    }
+
+    @Override
+    public String toString() {
+        return this.getHighChartValue();
+    }
+}

src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/data/base/AreaSplineRangeChartData.java → src/main/java/at/downdrown/vaadinaddons/highchartsapi/model/data/base/RangeData.java

@@ -12,13 +12,13 @@
  *
  * @author Manfred Huber (02ub0j08)<br>
  */
-public class AreaSplineRangeChartData implements HighChartsData {
+public class RangeData implements HighChartsData {
 
     private double x;
     private double low;
     private double high;
 
-    public AreaSplineRangeChartData(double x, double low, double high) {
+    public RangeData(double x, double low, double high) {
         this.x = x;
         this.low = low;
         this.high = high;