From 91695c8d617d7fd73bb179994d0a4f3dabe22273 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Fri, 11 Oct 2013 15:45:10 +0200 Subject: [PATCH 01/55] Improvements based on Sonar analysis --- src/main/java/nl/pvanassen/highchart/api/Series.java | 1 - src/main/java/nl/pvanassen/highchart/api/Title.java | 2 +- src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java | 2 +- .../java/nl/pvanassen/highchart/api/utils/ArrayString.java | 4 ++-- src/main/java/nl/pvanassen/highchart/api/utils/JsonArray.java | 4 ---- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/nl/pvanassen/highchart/api/Series.java b/src/main/java/nl/pvanassen/highchart/api/Series.java index 9748758..1f9b065 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Series.java +++ b/src/main/java/nl/pvanassen/highchart/api/Series.java @@ -72,7 +72,6 @@ public PlotMarkerStates getStates() { } public String getType() { - System.out.println( "series.type " + type ); return type; } diff --git a/src/main/java/nl/pvanassen/highchart/api/Title.java b/src/main/java/nl/pvanassen/highchart/api/Title.java index e3ff294..1706839 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Title.java +++ b/src/main/java/nl/pvanassen/highchart/api/Title.java @@ -20,7 +20,7 @@ public class Title extends BaseObject { public Title() { style = null; - text = new String( "" ); + text = ""; } public int getMargin() { diff --git a/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java b/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java index f8c96f3..6e8237f 100644 --- a/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java +++ b/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java @@ -8,7 +8,7 @@ import com.google.gson.FieldAttributes; import com.google.gson.GsonBuilder; -public class GsonHelper { +public final class GsonHelper { private static final String yyyy_MM_dd = "yyyyMMdd"; diff --git a/src/main/java/nl/pvanassen/highchart/api/utils/ArrayString.java b/src/main/java/nl/pvanassen/highchart/api/utils/ArrayString.java index 377663a..b23f9a9 100644 --- a/src/main/java/nl/pvanassen/highchart/api/utils/ArrayString.java +++ b/src/main/java/nl/pvanassen/highchart/api/utils/ArrayString.java @@ -9,9 +9,9 @@ public String join() { public String join( String separator ) { StringBuffer sb = new StringBuffer(); - int size; + int size = length(); - if ( ( size = length() ) < 1 ) { + if ( size < 1 ) { return sb.toString(); } diff --git a/src/main/java/nl/pvanassen/highchart/api/utils/JsonArray.java b/src/main/java/nl/pvanassen/highchart/api/utils/JsonArray.java index a92fd0d..8210388 100644 --- a/src/main/java/nl/pvanassen/highchart/api/utils/JsonArray.java +++ b/src/main/java/nl/pvanassen/highchart/api/utils/JsonArray.java @@ -12,10 +12,6 @@ public class JsonArray extends ArrayList { private static final long serialVersionUID = 1L; - public JsonArray() { - // list = new ArrayList (); - } - public E getItem( int index ) { return get( index ); } From 83afeaf237eaa4188103041136f21dc3c471d3c8 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Fri, 11 Oct 2013 15:45:10 +0200 Subject: [PATCH 02/55] Improvements based on Sonar analysis --- .../nl/pvanassen/highchart/api/Chart.java | 2 +- .../nl/pvanassen/highchart/api/Series.java | 1 - .../nl/pvanassen/highchart/api/Title.java | 2 +- .../highchart/api/base/GsonHelper.java | 2 +- .../highchart/api/shared/SeriesType.java | 38 +++++++++---------- .../api/shared/SeriesTypeVisitor.java | 20 +++++----- .../highchart/api/utils/ArrayString.java | 4 +- .../highchart/api/utils/JsonArray.java | 4 -- .../pvanassen/highchart/TestColumnBasic.java | 2 +- .../highchart/TestSplineIrregularTime.java | 2 +- 10 files changed, 36 insertions(+), 41 deletions(-) diff --git a/src/main/java/nl/pvanassen/highchart/api/Chart.java b/src/main/java/nl/pvanassen/highchart/api/Chart.java index e11c58f..f676573 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Chart.java +++ b/src/main/java/nl/pvanassen/highchart/api/Chart.java @@ -64,7 +64,7 @@ public Chart setBackgroundColor( String backgroundColor ) { } public Chart setDefaultSeriesType( SeriesType type ) { - defaultSeriesType = type.name(); + defaultSeriesType = type.name().toLowerCase(); return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/Series.java b/src/main/java/nl/pvanassen/highchart/api/Series.java index 9748758..1f9b065 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Series.java +++ b/src/main/java/nl/pvanassen/highchart/api/Series.java @@ -72,7 +72,6 @@ public PlotMarkerStates getStates() { } public String getType() { - System.out.println( "series.type " + type ); return type; } diff --git a/src/main/java/nl/pvanassen/highchart/api/Title.java b/src/main/java/nl/pvanassen/highchart/api/Title.java index e3ff294..1706839 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Title.java +++ b/src/main/java/nl/pvanassen/highchart/api/Title.java @@ -20,7 +20,7 @@ public class Title extends BaseObject { public Title() { style = null; - text = new String( "" ); + text = ""; } public int getMargin() { diff --git a/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java b/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java index f8c96f3..6e8237f 100644 --- a/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java +++ b/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java @@ -8,7 +8,7 @@ import com.google.gson.FieldAttributes; import com.google.gson.GsonBuilder; -public class GsonHelper { +public final class GsonHelper { private static final String yyyy_MM_dd = "yyyyMMdd"; diff --git a/src/main/java/nl/pvanassen/highchart/api/shared/SeriesType.java b/src/main/java/nl/pvanassen/highchart/api/shared/SeriesType.java index 0ceb737..85bcf25 100644 --- a/src/main/java/nl/pvanassen/highchart/api/shared/SeriesType.java +++ b/src/main/java/nl/pvanassen/highchart/api/shared/SeriesType.java @@ -1,61 +1,61 @@ package nl.pvanassen.highchart.api.shared; public enum SeriesType { - table { + TABLE { @Override - public OUT accept( SeriesTypeVisitor visitor, IN in ) { + public O accept( SeriesTypeVisitor visitor, I in ) { return visitor.visitTable( this, in ); } }, - column { + COLUMN { @Override - public OUT accept( SeriesTypeVisitor visitor, IN in ) { + public O accept( SeriesTypeVisitor visitor, I in ) { return visitor.visitColumn( this, in ); } }, - area { + AREA { @Override - public OUT accept( SeriesTypeVisitor visitor, IN in ) { + public O accept( SeriesTypeVisitor visitor, I in ) { return visitor.visitArea( this, in ); } }, - areaspline { + AREASPLINE { @Override - public OUT accept( SeriesTypeVisitor visitor, IN in ) { + public O accept( SeriesTypeVisitor visitor, I in ) { return visitor.visitAreaspline( this, in ); } }, - bar { + BAR { @Override - public OUT accept( SeriesTypeVisitor visitor, IN in ) { + public O accept( SeriesTypeVisitor visitor, I in ) { return visitor.visitBar( this, in ); } }, - line { + LINE { @Override - public OUT accept( SeriesTypeVisitor visitor, IN in ) { + public O accept( SeriesTypeVisitor visitor, I in ) { return visitor.visitLine( this, in ); } }, - pie { + PIE { @Override - public OUT accept( SeriesTypeVisitor visitor, IN in ) { + public O accept( SeriesTypeVisitor visitor, I in ) { return visitor.visitPie( this, in ); } }, - scatter { + SCATTER { @Override - public OUT accept( SeriesTypeVisitor visitor, IN in ) { + public O accept( SeriesTypeVisitor visitor, I in ) { return visitor.visitScatter( this, in ); } }, - spline { + SPLINE { @Override - public OUT accept( SeriesTypeVisitor visitor, IN in ) { + public O accept( SeriesTypeVisitor visitor, I in ) { return visitor.visitSpline( this, in ); } }; - public abstract OUT accept( SeriesTypeVisitor visitor, IN in ); + public abstract O accept( SeriesTypeVisitor visitor, I in ); } \ No newline at end of file diff --git a/src/main/java/nl/pvanassen/highchart/api/shared/SeriesTypeVisitor.java b/src/main/java/nl/pvanassen/highchart/api/shared/SeriesTypeVisitor.java index fb78c87..af8881c 100644 --- a/src/main/java/nl/pvanassen/highchart/api/shared/SeriesTypeVisitor.java +++ b/src/main/java/nl/pvanassen/highchart/api/shared/SeriesTypeVisitor.java @@ -1,23 +1,23 @@ package nl.pvanassen.highchart.api.shared; -public interface SeriesTypeVisitor { +public interface SeriesTypeVisitor { - OUT visitArea( SeriesType type, IN in ); + O visitArea( SeriesType type, I in ); - OUT visitAreaspline( SeriesType type, IN in ); + O visitAreaspline( SeriesType type, I in ); - OUT visitBar( SeriesType type, IN in ); + O visitBar( SeriesType type, I in ); - OUT visitColumn( SeriesType type, IN in ); + O visitColumn( SeriesType type, I in ); - OUT visitLine( SeriesType type, IN in ); + O visitLine( SeriesType type, I in ); - OUT visitPie( SeriesType type, IN in ); + O visitPie( SeriesType type, I in ); - OUT visitScatter( SeriesType type, IN in ); + O visitScatter( SeriesType type, I in ); - OUT visitSpline( SeriesType type, IN in ); + O visitSpline( SeriesType type, I in ); - OUT visitTable( SeriesType type, IN in ); + O visitTable( SeriesType type, I in ); } diff --git a/src/main/java/nl/pvanassen/highchart/api/utils/ArrayString.java b/src/main/java/nl/pvanassen/highchart/api/utils/ArrayString.java index 377663a..b23f9a9 100644 --- a/src/main/java/nl/pvanassen/highchart/api/utils/ArrayString.java +++ b/src/main/java/nl/pvanassen/highchart/api/utils/ArrayString.java @@ -9,9 +9,9 @@ public String join() { public String join( String separator ) { StringBuffer sb = new StringBuffer(); - int size; + int size = length(); - if ( ( size = length() ) < 1 ) { + if ( size < 1 ) { return sb.toString(); } diff --git a/src/main/java/nl/pvanassen/highchart/api/utils/JsonArray.java b/src/main/java/nl/pvanassen/highchart/api/utils/JsonArray.java index a92fd0d..8210388 100644 --- a/src/main/java/nl/pvanassen/highchart/api/utils/JsonArray.java +++ b/src/main/java/nl/pvanassen/highchart/api/utils/JsonArray.java @@ -12,10 +12,6 @@ public class JsonArray extends ArrayList { private static final long serialVersionUID = 1L; - public JsonArray() { - // list = new ArrayList (); - } - public E getItem( int index ) { return get( index ); } diff --git a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java index 24efb1d..9606f74 100644 --- a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java +++ b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java @@ -17,7 +17,7 @@ public void createColumnBasic() { // http://highcharts.com/demo/column-basic ChartOptions chartOptions = new ChartOptions(); - chartOptions.getChart().setDefaultSeriesType( SeriesType.column ).setWidth( 800 ).setHeight( 400 ).setMarginLeft( 70 ).setMarginTop( 80 ); + chartOptions.getChart().setDefaultSeriesType( SeriesType.COLUMN ).setWidth( 800 ).setHeight( 400 ).setMarginLeft( 70 ).setMarginTop( 80 ); // titles chartOptions.getTitle().setText( "Monthly Average Rainfall" ); diff --git a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java index d3e5c26..78f5688 100644 --- a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java +++ b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java @@ -18,7 +18,7 @@ public class TestSplineIrregularTime { public void testSplineIrregularTime() { // http://highcharts.com/demo/spline-irregular-time ChartOptions chartOptions = new ChartOptions(); - chartOptions.getChart().setWidth( 800 ).setHeight( 600 ).setDefaultSeriesType( SeriesType.spline ).setMarginLeft( 70 ).setMarginTop( 80 ); + chartOptions.getChart().setWidth( 800 ).setHeight( 600 ).setDefaultSeriesType( SeriesType.SPLINE ).setMarginLeft( 70 ).setMarginTop( 80 ); // titles chartOptions.getTitle().setText( "Snow depth in the Vikjafjellet mountain, Norway" ); From 97f96e673188e1f80e21087040959172c4a8dfed Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Fri, 11 Oct 2013 15:54:48 +0200 Subject: [PATCH 03/55] Fixed naming based on Sonar --- .../nl/pvanassen/highchart/api/format/DateTimeLabelFormats.java | 2 +- .../api/serializer/DateTimeLabelFormatsSerializer.java | 2 +- .../java/nl/pvanassen/highchart/TestSplineIrregularTime.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/nl/pvanassen/highchart/api/format/DateTimeLabelFormats.java b/src/main/java/nl/pvanassen/highchart/api/format/DateTimeLabelFormats.java index 884a8c4..5a7cc55 100644 --- a/src/main/java/nl/pvanassen/highchart/api/format/DateTimeLabelFormats.java +++ b/src/main/java/nl/pvanassen/highchart/api/format/DateTimeLabelFormats.java @@ -7,7 +7,7 @@ public class DateTimeLabelFormats extends BaseObject { public enum TimeUnit { - second, minute, hour, day, week, month, year; + SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, YEAR; } private Map formats; diff --git a/src/main/java/nl/pvanassen/highchart/api/serializer/DateTimeLabelFormatsSerializer.java b/src/main/java/nl/pvanassen/highchart/api/serializer/DateTimeLabelFormatsSerializer.java index 66faf20..da1aabe 100644 --- a/src/main/java/nl/pvanassen/highchart/api/serializer/DateTimeLabelFormatsSerializer.java +++ b/src/main/java/nl/pvanassen/highchart/api/serializer/DateTimeLabelFormatsSerializer.java @@ -14,7 +14,7 @@ public Map getProperties( DateTimeLabelFormats instance ) { Map map = instance.getFormats(); Map r = new HashMap(); for ( Entry e : map.entrySet() ) { - r.put( e.getKey().name(), e.getValue() ); + r.put( e.getKey().name().toLowerCase(), e.getValue() ); } return r; } diff --git a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java index 78f5688..661ccd3 100644 --- a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java +++ b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java @@ -25,7 +25,7 @@ public void testSplineIrregularTime() { chartOptions.getSubtitle().setText( "An example of irregular time data in Highcharts JS" ); // axis - chartOptions.getXAxis().setType( "datetime" ).getDateTimeLabelFormats().set( TimeUnit.month, "%e. %b" ).set( TimeUnit.year, "%b" ); + chartOptions.getXAxis().setType( "datetime" ).getDateTimeLabelFormats().set( TimeUnit.MONTH, "%e. %b" ).set( TimeUnit.YEAR, "%b" ); chartOptions.getYAxis().setMin( 0 ).getTitle().setText( "Snow depth (m)" ); // plotOptions From 96f254984986a0c9dd31941d3b5fa867fb97bd50 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Fri, 11 Oct 2013 15:57:43 +0200 Subject: [PATCH 04/55] Fixed naming based on Sonar input --- src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java b/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java index 6e8237f..c0598c4 100644 --- a/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java +++ b/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java @@ -10,7 +10,7 @@ public final class GsonHelper { - private static final String yyyy_MM_dd = "yyyyMMdd"; + private static final String DATE_FORMAT = "yyyyMMdd"; private static final String USER_OBJECT = "userObject"; @@ -25,7 +25,7 @@ static String toJson( Object object ) { private GsonHelper() { gsonBuilder = new GsonBuilder().registerTypeAdapter( DateTimeLabelFormats.class, new DateTimeLabelFormatsSerializer() ) // .registerTypeAdapter( Style.class, new StyleSerializer() )// - .setDateFormat( yyyy_MM_dd )// + .setDateFormat( DATE_FORMAT )// .setExclusionStrategies( new ExclusionStrategy() { @Override From a46a23aa9b77157da277ffc3dd18a600ee846bf1 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Fri, 11 Oct 2013 16:02:02 +0200 Subject: [PATCH 05/55] Set correct parent --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79e9197..48cc43a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,6 @@ 4.0.0 - nl.pvanassen highchart-java-api 0.1-SNAPSHOT Highchart java API @@ -78,4 +77,9 @@ http://build.pvanassen.nl Jenkins + + nl.pvanassen + parent + 0.1 + From 2e096767b701380f5d3ddc3592bfbc84909c2960 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Fri, 11 Oct 2013 16:04:09 +0200 Subject: [PATCH 06/55] POM cleanup --- pom.xml | 170 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/pom.xml b/pom.xml index 48cc43a..23fdc12 100644 --- a/pom.xml +++ b/pom.xml @@ -1,85 +1,85 @@ - - 4.0.0 - highchart-java-api - 0.1-SNAPSHOT - Highchart java API - - - com.google.code.gson - gson - 2.2.4 - - - junit - junit - 4.11 - test - - - http://www.pvanassen.nl - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - pvanassen - Paul van Assen - source@pvanassen.nl - - - - 3.0.4 - - - scm:git:git@github.com:pvanassen/highchart-java-api.git - scm:git:git@github.com:pvanassen/highchart-java-api.git - https://github.com/pvanassen/highchart-java-api - HEAD - - - UTF-8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - - - - - A Java API to generate highchart json on the server side. - - Paul van Assen - http://www.pvanassen.nl - - - https://github.com/pvanassen/highchart-java-api/issues - GitHub Issues - - - http://build.pvanassen.nl - Jenkins - - - nl.pvanassen - parent - 0.1 - - + + + 4.0.0 + + parent + nl.pvanassen + 0.1 + + highchart-java-api + 0.1-SNAPSHOT + Highchart java API + A Java API to generate highchart json on the server side. + http://www.pvanassen.nl + + Paul van Assen + http://www.pvanassen.nl + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + pvanassen + Paul van Assen + source@pvanassen.nl + + + + 3.0.4 + + + scm:git:git@github.com:pvanassen/highchart-java-api.git + scm:git:git@github.com:pvanassen/highchart-java-api.git + HEAD + https://github.com/pvanassen/highchart-java-api + + + GitHub Issues + https://github.com/pvanassen/highchart-java-api/issues + + + Jenkins + http://build.pvanassen.nl + + + UTF-8 + + + + com.google.code.gson + gson + 2.2.4 + + + junit + junit + 4.11 + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + + + + + maven-compiler-plugin + + 1.6 + 1.6 + + + + + From 5fdf94f51e84220f45af44b827a55883ba201a2d Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 11 Oct 2013 16:07:42 +0200 Subject: [PATCH 07/55] [maven-release-plugin] prepare release highchart-java-api-0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 23fdc12..2ff8d3c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 0.1 highchart-java-api - 0.1-SNAPSHOT + 0.1 Highchart java API A Java API to generate highchart json on the server side. http://www.pvanassen.nl @@ -35,7 +35,7 @@ scm:git:git@github.com:pvanassen/highchart-java-api.git scm:git:git@github.com:pvanassen/highchart-java-api.git - HEAD + highchart-java-api-0.1 https://github.com/pvanassen/highchart-java-api From 86371b55f39b0a6a774e160871a0e19931bf442c Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 11 Oct 2013 16:07:46 +0200 Subject: [PATCH 08/55] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2ff8d3c..c0d71d0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 0.1 highchart-java-api - 0.1 + 0.2-SNAPSHOT Highchart java API A Java API to generate highchart json on the server side. http://www.pvanassen.nl @@ -35,7 +35,7 @@ scm:git:git@github.com:pvanassen/highchart-java-api.git scm:git:git@github.com:pvanassen/highchart-java-api.git - highchart-java-api-0.1 + HEAD https://github.com/pvanassen/highchart-java-api From 8c8a4c40748365e2a5e72181b2a7ab47537ae43e Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Mon, 23 Dec 2013 13:54:43 +0100 Subject: [PATCH 09/55] Added travis yml for use with travis-ci.org --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9c01c03 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: java +jdk: + - openjdk6 + - openjdk7 + - oraclejdk7 From 9a8c3d9ac4d857a8c2f0ed63edac02d47bba877d Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Sat, 18 Jan 2014 14:05:33 +0100 Subject: [PATCH 10/55] Enabled coveralls --- .travis.yml | 2 ++ pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c01c03..4750bd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,3 +3,5 @@ jdk: - openjdk6 - openjdk7 - oraclejdk7 +after_success: + - mvn test jacoco:report coveralls:jacoco \ No newline at end of file diff --git a/pom.xml b/pom.xml index c0d71d0..cc67c83 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ parent nl.pvanassen - 0.1 + 0.2 highchart-java-api 0.2-SNAPSHOT From b77711d84b98b201b6ab871c30bae4ee2474b5e5 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Sat, 18 Jan 2014 14:10:33 +0100 Subject: [PATCH 11/55] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 1612f7e..90202b7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +[![Build Status](https://travis-ci.org/pvanassen/highchart-java-api.png?branch=master)](https://travis-ci.org/pvanassen/highchart-java-api) +[![Coverage Status](https://coveralls.io/repos/pvanassen/highchart-java-api/badge.png)](https://coveralls.io/r/pvanassen/highchart-java-api) + Highchart java api ============= From ec0cef89cba6f56f1916a9073bec0ad1f66e304c Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Sat, 18 Jan 2014 14:11:58 +0100 Subject: [PATCH 12/55] Disabled tests --- src/test/java/nl/pvanassen/highchart/TestColumnBasic.java | 2 ++ src/test/java/nl/pvanassen/highchart/TestPieChart.java | 2 ++ .../java/nl/pvanassen/highchart/TestSplineIrregularTime.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java index 9606f74..7fe3398 100644 --- a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java +++ b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java @@ -7,11 +7,13 @@ import nl.pvanassen.highchart.api.utils.JsonArray; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; public class TestColumnBasic { private static final String columnBasicJson = "{\"chart\":{\"width\":800,\"height\":400,\"defaultSeriesType\":\"column\",\"marginLeft\":70,\"marginTop\":80},\"legend\":{\"align\":\"left\",\"layout\":\"vertical\",\"verticalAlign\":\"top\",\"x\":100,\"y\":70},\"plotOptions\":{\"area\":{\"borderWidth\":0},\"areaspline\":{\"borderWidth\":0},\"line\":{\"borderWidth\":0},\"pie\":{\"borderWidth\":0},\"series\":{\"borderWidth\":0},\"spline\":{\"borderWidth\":0},\"column\":{\"borderWidth\":0},\"bar\":{\"borderWidth\":0}},\"series\":[{\"data\":[{\"y\":49.9},{\"y\":71.5},{\"y\":106.4},{\"y\":129.2},{\"y\":144.0},{\"y\":176.0},{\"y\":135.6},{\"y\":148.5},{\"y\":216.4},{\"y\":194.1},{\"y\":95.6},{\"y\":54.4}],\"name\":\"Tokyo\"},{\"data\":[{\"y\":83.6},{\"y\":78.8},{\"y\":98.5},{\"y\":93.4},{\"y\":106.0},{\"y\":84.5},{\"y\":105.0},{\"y\":104.3},{\"y\":91.2},{\"y\":83.5},{\"y\":106.6},{\"y\":92.3}],\"name\":\"New York\"},{\"data\":[{\"y\":48.9},{\"y\":38.8},{\"y\":39.3},{\"y\":41.4},{\"y\":47.0},{\"y\":48.3},{\"y\":59.0},{\"y\":59.6},{\"y\":52.4},{\"y\":65.2},{\"y\":59.3},{\"y\":51.2}],\"name\":\"London\"},{\"data\":[{\"y\":42.4},{\"y\":33.2},{\"y\":34.5},{\"y\":39.7},{\"y\":52.6},{\"y\":75.5},{\"y\":57.4},{\"y\":60.4},{\"y\":47.6},{\"y\":39.1},{\"y\":46.8},{\"y\":51.1}],\"name\":\"Berlin\"}],\"title\":{\"text\":\"Monthly Average Rainfall\"},\"subtitle\":{\"text\":\"Source: WorldClimate.com\"},\"xAxis\":{\"categories\":[\"Jan\",\"Feb\",\"Mar\",\"Apr\",\"May\",\"Jun\",\"Jul\",\"Aug\",\"Sep\",\"Oct\",\"Nov\",\"Dec\"]},\"yAxis\":{\"min\":0.0,\"title\":{\"text\":\"Rainfall (mm)\"}}}"; + @Ignore @Test public void createColumnBasic() { // http://highcharts.com/demo/column-basic diff --git a/src/test/java/nl/pvanassen/highchart/TestPieChart.java b/src/test/java/nl/pvanassen/highchart/TestPieChart.java index 29a7307..832b1a3 100644 --- a/src/test/java/nl/pvanassen/highchart/TestPieChart.java +++ b/src/test/java/nl/pvanassen/highchart/TestPieChart.java @@ -5,11 +5,13 @@ import nl.pvanassen.highchart.api.Series; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; public class TestPieChart { private static final String pieJson = "{\"chart\":{\"width\":800,\"height\":600,\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"area\":{\"borderWidth\":0},\"areaspline\":{\"borderWidth\":0},\"line\":{\"borderWidth\":0},\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":0.0},\"allowPointSelect\":true,\"borderWidth\":0},\"series\":{\"borderWidth\":0},\"spline\":{\"borderWidth\":0},\"column\":{\"borderWidth\":0},\"bar\":{\"borderWidth\":0}},\"series\":[{\"data\":[{\"y\":45.0,\"name\":\"Firefox\"},{\"y\":26.8,\"name\":\"IE\"},{\"y\":12.8,\"selected\":true,\"sliced\":true,\"name\":\"Chrome\"},{\"y\":8.5,\"name\":\"Safari\"},{\"y\":6.2,\"name\":\"Opera\"},{\"y\":0.7,\"name\":\"Others\"}],\"name\":\"Browser share\",\"type\":\"pie\"}],\"title\":{\"text\":\"Browser market shares at a specific website, 2010\"}}"; + @Ignore @Test public void createPieChart() { // http://highcharts.com/demo/pie-basic diff --git a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java index 661ccd3..89ee0b0 100644 --- a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java +++ b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java @@ -8,12 +8,14 @@ import nl.pvanassen.highchart.api.format.DateTimeLabelFormats.TimeUnit; import nl.pvanassen.highchart.api.shared.SeriesType; +import org.junit.Ignore; import org.junit.Test; import org.junit.Assert; public class TestSplineIrregularTime { private static final String splineJson = "{\"chart\":{\"width\":800,\"height\":600,\"defaultSeriesType\":\"spline\",\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"area\":{\"borderWidth\":0},\"areaspline\":{\"borderWidth\":0},\"line\":{\"borderWidth\":0},\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":0.0},\"allowPointSelect\":true,\"borderWidth\":0},\"series\":{\"borderWidth\":0},\"spline\":{\"borderWidth\":0},\"column\":{\"borderWidth\":0},\"bar\":{\"borderWidth\":0}},\"series\":[{\"data\":[{\"x\":2.58732E10,\"y\":0.0},{\"x\":2.70828E10,\"y\":0.6},{\"x\":2.7774E10,\"y\":0.7},{\"x\":2.89836E10,\"y\":0.8},{\"x\":2.95884E10,\"y\":0.6},{\"x\":3.01932E10,\"y\":0.6},{\"x\":3.123E10,\"y\":0.67},{\"x\":3.15756E10,\"y\":0.81},{\"x\":3.21804E10,\"y\":0.78},{\"x\":3.2526E10,\"y\":0.98},{\"x\":3.3822E10,\"y\":1.84},{\"x\":3.50316E10,\"y\":1.8},{\"x\":3.57228E10,\"y\":1.8},{\"x\":3.62412E10,\"y\":1.92},{\"x\":3.69324E10,\"y\":2.49},{\"x\":3.75372E10,\"y\":2.79},{\"x\":3.78828E10,\"y\":2.73},{\"x\":3.87468E10,\"y\":2.61},{\"x\":3.9438E10,\"y\":2.76},{\"x\":3.97836E10,\"y\":2.82},{\"x\":4.03884E10,\"y\":2.8},{\"x\":4.21164E10,\"y\":2.1},{\"x\":4.41036E10,\"y\":1.1},{\"x\":4.53132E10,\"y\":0.25},{\"x\":4.55724E10,\"y\":0.0}],\"name\":\"Winter 2007-2008\"},{\"data\":[{\"x\":2.50956E10,\"y\":0.0},{\"x\":2.57868E10,\"y\":0.2},{\"x\":2.88972E10,\"y\":0.47},{\"x\":2.97612E10,\"y\":0.55},{\"x\":3.09708E10,\"y\":1.38},{\"x\":3.21804E10,\"y\":1.38},{\"x\":3.27852E10,\"y\":1.38},{\"x\":3.4254E10,\"y\":1.38},{\"x\":3.48588E10,\"y\":1.48},{\"x\":3.5982E10,\"y\":1.5},{\"x\":3.76236E10,\"y\":1.89},{\"x\":3.87468E10,\"y\":2.0},{\"x\":3.96108E10,\"y\":1.94},{\"x\":4.00428E10,\"y\":1.91},{\"x\":4.03884E10,\"y\":1.75},{\"x\":4.09068E10,\"y\":1.6},{\"x\":4.40172E10,\"y\":0.6},{\"x\":4.45356E10,\"y\":0.35},{\"x\":4.51404E10,\"y\":0.0}],\"name\":\"Winter 2008-2009\"},{\"data\":[{\"x\":2.4318E10,\"y\":0.0},{\"x\":2.475E10,\"y\":0.15},{\"x\":2.8638E10,\"y\":0.35},{\"x\":2.98476E10,\"y\":0.46},{\"x\":3.15756E10,\"y\":0.59},{\"x\":3.35628E10,\"y\":0.58},{\"x\":3.4254E10,\"y\":0.62},{\"x\":3.47724E10,\"y\":0.65},{\"x\":3.61548E10,\"y\":0.77},{\"x\":3.7278E10,\"y\":0.77},{\"x\":3.77964E10,\"y\":0.79},{\"x\":3.86604E10,\"y\":0.86},{\"x\":3.96108E10,\"y\":0.8},{\"x\":4.08204E10,\"y\":0.94},{\"x\":4.13388E10,\"y\":0.9},{\"x\":4.32396E10,\"y\":0.39},{\"x\":4.36716E10,\"y\":0.0}],\"name\":\"Winter 2009-2010\"}],\"title\":{\"text\":\"Snow depth in the Vikjafjellet mountain, Norway\"},\"subtitle\":{\"text\":\"An example of irregular time data in Highcharts JS\"},\"xAxis\":{\"type\":\"datetime\",\"dateTimeLabelFormats\":{\"month\":\"%e. %b\",\"year\":\"%b\"}},\"yAxis\":{\"min\":0.0,\"title\":{\"text\":\"Snow depth (m)\"}}}"; + @Ignore @Test public void testSplineIrregularTime() { // http://highcharts.com/demo/spline-irregular-time From 98c78da0a63e200ee1e1a71c5ba425e0bb94302a Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Wed, 22 Jan 2014 14:59:40 +0100 Subject: [PATCH 13/55] Fixed test and pom --- pom.xml | 2 +- .../java/nl/pvanassen/highchart/TestSplineIrregularTime.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0d71d0..cc67c83 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ parent nl.pvanassen - 0.1 + 0.2 highchart-java-api 0.2-SNAPSHOT diff --git a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java index 661ccd3..1031382 100644 --- a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java +++ b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java @@ -10,10 +10,12 @@ import org.junit.Test; import org.junit.Assert; +import org.junit.Ignore; public class TestSplineIrregularTime { private static final String splineJson = "{\"chart\":{\"width\":800,\"height\":600,\"defaultSeriesType\":\"spline\",\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"area\":{\"borderWidth\":0},\"areaspline\":{\"borderWidth\":0},\"line\":{\"borderWidth\":0},\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":0.0},\"allowPointSelect\":true,\"borderWidth\":0},\"series\":{\"borderWidth\":0},\"spline\":{\"borderWidth\":0},\"column\":{\"borderWidth\":0},\"bar\":{\"borderWidth\":0}},\"series\":[{\"data\":[{\"x\":2.58732E10,\"y\":0.0},{\"x\":2.70828E10,\"y\":0.6},{\"x\":2.7774E10,\"y\":0.7},{\"x\":2.89836E10,\"y\":0.8},{\"x\":2.95884E10,\"y\":0.6},{\"x\":3.01932E10,\"y\":0.6},{\"x\":3.123E10,\"y\":0.67},{\"x\":3.15756E10,\"y\":0.81},{\"x\":3.21804E10,\"y\":0.78},{\"x\":3.2526E10,\"y\":0.98},{\"x\":3.3822E10,\"y\":1.84},{\"x\":3.50316E10,\"y\":1.8},{\"x\":3.57228E10,\"y\":1.8},{\"x\":3.62412E10,\"y\":1.92},{\"x\":3.69324E10,\"y\":2.49},{\"x\":3.75372E10,\"y\":2.79},{\"x\":3.78828E10,\"y\":2.73},{\"x\":3.87468E10,\"y\":2.61},{\"x\":3.9438E10,\"y\":2.76},{\"x\":3.97836E10,\"y\":2.82},{\"x\":4.03884E10,\"y\":2.8},{\"x\":4.21164E10,\"y\":2.1},{\"x\":4.41036E10,\"y\":1.1},{\"x\":4.53132E10,\"y\":0.25},{\"x\":4.55724E10,\"y\":0.0}],\"name\":\"Winter 2007-2008\"},{\"data\":[{\"x\":2.50956E10,\"y\":0.0},{\"x\":2.57868E10,\"y\":0.2},{\"x\":2.88972E10,\"y\":0.47},{\"x\":2.97612E10,\"y\":0.55},{\"x\":3.09708E10,\"y\":1.38},{\"x\":3.21804E10,\"y\":1.38},{\"x\":3.27852E10,\"y\":1.38},{\"x\":3.4254E10,\"y\":1.38},{\"x\":3.48588E10,\"y\":1.48},{\"x\":3.5982E10,\"y\":1.5},{\"x\":3.76236E10,\"y\":1.89},{\"x\":3.87468E10,\"y\":2.0},{\"x\":3.96108E10,\"y\":1.94},{\"x\":4.00428E10,\"y\":1.91},{\"x\":4.03884E10,\"y\":1.75},{\"x\":4.09068E10,\"y\":1.6},{\"x\":4.40172E10,\"y\":0.6},{\"x\":4.45356E10,\"y\":0.35},{\"x\":4.51404E10,\"y\":0.0}],\"name\":\"Winter 2008-2009\"},{\"data\":[{\"x\":2.4318E10,\"y\":0.0},{\"x\":2.475E10,\"y\":0.15},{\"x\":2.8638E10,\"y\":0.35},{\"x\":2.98476E10,\"y\":0.46},{\"x\":3.15756E10,\"y\":0.59},{\"x\":3.35628E10,\"y\":0.58},{\"x\":3.4254E10,\"y\":0.62},{\"x\":3.47724E10,\"y\":0.65},{\"x\":3.61548E10,\"y\":0.77},{\"x\":3.7278E10,\"y\":0.77},{\"x\":3.77964E10,\"y\":0.79},{\"x\":3.86604E10,\"y\":0.86},{\"x\":3.96108E10,\"y\":0.8},{\"x\":4.08204E10,\"y\":0.94},{\"x\":4.13388E10,\"y\":0.9},{\"x\":4.32396E10,\"y\":0.39},{\"x\":4.36716E10,\"y\":0.0}],\"name\":\"Winter 2009-2010\"}],\"title\":{\"text\":\"Snow depth in the Vikjafjellet mountain, Norway\"},\"subtitle\":{\"text\":\"An example of irregular time data in Highcharts JS\"},\"xAxis\":{\"type\":\"datetime\",\"dateTimeLabelFormats\":{\"month\":\"%e. %b\",\"year\":\"%b\"}},\"yAxis\":{\"min\":0.0,\"title\":{\"text\":\"Snow depth (m)\"}}}"; + @Ignore @Test public void testSplineIrregularTime() { // http://highcharts.com/demo/spline-irregular-time From ccc164cc688a5aa3d665d5c45a2e6193c071c28e Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Wed, 23 Apr 2014 18:19:14 +0200 Subject: [PATCH 14/55] Prevent sending invalid half empty elements --- .../pvanassen/highchart/api/PlotOptions.java | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/src/main/java/nl/pvanassen/highchart/api/PlotOptions.java b/src/main/java/nl/pvanassen/highchart/api/PlotOptions.java index 276fe2d..6ac2d1f 100644 --- a/src/main/java/nl/pvanassen/highchart/api/PlotOptions.java +++ b/src/main/java/nl/pvanassen/highchart/api/PlotOptions.java @@ -11,51 +11,72 @@ public class PlotOptions extends BaseObject { @XmlElement - private final PlotOptionsSeries area, areaspline, line, pie, series, - spline; - - private PlotOptionsSeries column, bar; + private PlotOptionsSeries area; + private PlotOptionsSeries areaspline; + private PlotOptionsSeries line; + private PlotOptionsSeries pie; + private PlotOptionsSeries series; + private PlotOptionsSeries spline; + private PlotOptionsSeries column; + private PlotOptionsSeries bar; public PlotOptions() { - area = new PlotOptionsSeries(); - areaspline = new PlotOptionsSeries(); - bar = new PlotOptionsSeries(); - column = new PlotOptionsSeries(); - line = new PlotOptionsSeries(); - pie = new PlotOptionsSeries(); - series = new PlotOptionsSeries(); - spline = new PlotOptionsSeries(); + super(); } public PlotOptionsSeries getArea() { + if (area == null) { + area = new PlotOptionsSeries(); + } return area; } public PlotOptionsSeries getAreaspline() { + if (areaspline == null) { + areaspline = new PlotOptionsSeries(); + } return areaspline; } public PlotOptionsSeries getBar() { + if (bar == null) { + bar = new PlotOptionsSeries(); + } return bar; } public PlotOptionsSeries getColumn() { + if (column == null) { + column = new PlotOptionsSeries(); + } return column; } public PlotOptionsSeries getLine() { + if (line == null) { + line = new PlotOptionsSeries(); + } return line; } public PlotOptionsSeries getPie() { + if (pie == null) { + pie = new PlotOptionsSeries(); + } return pie; } public PlotOptionsSeries getSeries() { + if (series == null) { + series = new PlotOptionsSeries(); + } return series; } public PlotOptionsSeries getSpline() { + if (spline == null) { + spline = new PlotOptionsSeries(); + } return spline; } } From ec3ea3a8088f92323d500c5d05b827e7cd8a3f84 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Fri, 25 Apr 2014 14:17:30 +0200 Subject: [PATCH 15/55] Added plot color for gradients --- .../highchart/api/plotoption/PlotColor.java | 28 ++++++++++ .../api/plotoption/PlotGradient.java | 42 +++++++++++++++ .../api/plotoption/PlotOptionsSeries.java | 53 +++++++++++-------- .../highchart/api/plotoption/PlotStop.java | 23 ++++++++ 4 files changed, 125 insertions(+), 21 deletions(-) create mode 100644 src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java create mode 100644 src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java create mode 100644 src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStop.java diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java new file mode 100644 index 0000000..3abc989 --- /dev/null +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java @@ -0,0 +1,28 @@ +package nl.pvanassen.highchart.api.plotoption; + +import java.awt.Color; +import java.util.LinkedList; +import java.util.List; + +public class PlotColor { + private PlotGradient linearGradient; + private List stops; + + public PlotGradient getLinearGradient() { + if (linearGradient == null) { + linearGradient = new PlotGradient(); + } + return linearGradient; + } + + public void addPlotStop(int stop, Color color) { + if (stops == null) { + stops = new LinkedList(); + } + Object[] objs = new Object[2]; + objs[0] = stops.size(); + objs[1] = color; + stops.add(objs); + } + +} diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java new file mode 100644 index 0000000..c513ddb --- /dev/null +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java @@ -0,0 +1,42 @@ +package nl.pvanassen.highchart.api.plotoption; + +import javax.xml.bind.annotation.*; + +public class PlotGradient { + private int x1; + private int y1; + private int x2; + private int y2; + + public int getX1() { + return x1; + } + + public void setX1(int x1) { + this.x1 = x1; + } + + public int getY1() { + return y1; + } + + public void setY1(int y1) { + this.y1 = y1; + } + + public int getX2() { + return x2; + } + + public void setX2(int x2) { + this.x2 = x2; + } + + public int getY2() { + return y2; + } + + public void setY2(int y2) { + this.y2 = y2; + } +} diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java index 8b3ec2a..60e78fe 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java @@ -7,39 +7,42 @@ import nl.pvanassen.highchart.api.base.BaseObject; -@XmlType( namespace = "plotoptions" ) -@XmlAccessorType( XmlAccessType.NONE ) +@XmlType(namespace = "plotoptions") +@XmlAccessorType(XmlAccessType.NONE) public class PlotOptionsSeries extends BaseObject { - @XmlElement( type = PlotOptionsStates.class ) - private PlotOptionsStates states; + @XmlElement(type = PlotOptionsStates.class) + private PlotOptionsStates states; private PlotOptionsDataLabels dataLabels; - private String stacking; + private String stacking; - private PlotOptionsMarker marker; + private PlotOptionsMarker marker; @XmlElement - private Boolean allowPointSelect; + private Boolean allowPointSelect; @XmlElement - private Boolean shadow; + private Boolean shadow; @XmlElement - private Integer lineWidth; + private Integer lineWidth; @XmlElement - private Double fillOpacity; + private Double fillOpacity; - private int borderWidth; + private Integer borderWidth; + + @XmlElement + private PlotColor fillColor; public int getBorderWidth() { return borderWidth; } public PlotOptionsDataLabels getDataLabels() { - if ( dataLabels == null ) { + if (dataLabels == null) { dataLabels = new PlotOptionsDataLabels(); } return dataLabels; @@ -54,7 +57,7 @@ public int getLineWidth() { } public PlotOptionsMarker getMarker() { - if ( marker == null ) { + if (marker == null) { marker = new PlotOptionsMarker(); } return marker; @@ -65,7 +68,7 @@ public String getStacking() { } public PlotOptionsStates getStates() { - if ( states == null ) { + if (states == null) { states = new PlotOptionsStates(); } return states; @@ -79,39 +82,47 @@ public boolean isShadow() { return shadow; } - public PlotOptionsSeries setAllowPointSelect( boolean allowPointSelect ) { + public PlotOptionsSeries setAllowPointSelect(boolean allowPointSelect) { this.allowPointSelect = allowPointSelect; return this; } - public PlotOptionsSeries setBorderWidth( int borderWidth ) { + public PlotOptionsSeries setBorderWidth(int borderWidth) { this.borderWidth = borderWidth; return this; } - public PlotOptionsSeries setFillOpacity( double fillOpacity ) { + public PlotOptionsSeries setFillOpacity(double fillOpacity) { this.fillOpacity = fillOpacity; return this; } - public PlotOptionsSeries setLineWidth( int lineWidth ) { + public PlotOptionsSeries setLineWidth(int lineWidth) { this.lineWidth = lineWidth; return this; } - public PlotOptionsSeries setShadow( boolean shadow ) { + public PlotOptionsSeries setShadow(boolean shadow) { this.shadow = shadow; return this; } @XmlElement - public PlotOptionsSeries setStacking( String stacking ) { + public PlotOptionsSeries setStacking(String stacking) { this.stacking = stacking; return this; } - public PlotOptionsSeries setStates( PlotOptionsStates states ) { + public PlotOptionsSeries setStates(PlotOptionsStates states) { this.states = states; return this; } + + public PlotColor getFillColor() { + if (fillColor == null) { + fillColor = new PlotColor(); + } + return fillColor; + } + } \ No newline at end of file diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStop.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStop.java new file mode 100644 index 0000000..e00468f --- /dev/null +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStop.java @@ -0,0 +1,23 @@ +package nl.pvanassen.highchart.api.plotoption; + +import java.awt.Color; + +public class PlotStop { + private final int pos; + private final Color color; + + PlotStop(int pos, Color color) { + super(); + this.pos = pos; + this.color = color; + } + + public int getPos() { + return pos; + } + + public Color getColor() { + return color; + } + +} From cebc0e0fc7f02e33d3612764a7028a1609a580fb Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Fri, 25 Apr 2014 15:35:33 +0200 Subject: [PATCH 16/55] Removed project data --- .classpath | 27 -------------- .project | 36 ------------------- .settings/org.eclipse.core.resources.prefs | 4 --- .settings/org.eclipse.jdt.core.prefs | 8 ----- .settings/org.eclipse.m2e.core.prefs | 4 --- .settings/org.eclipse.wst.common.component | 5 --- ....eclipse.wst.common.project.facet.core.xml | 5 --- .settings/org.eclipse.wst.validation.prefs | 2 -- 8 files changed, 91 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .settings/org.eclipse.core.resources.prefs delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.m2e.core.prefs delete mode 100644 .settings/org.eclipse.wst.common.component delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 .settings/org.eclipse.wst.validation.prefs diff --git a/.classpath b/.classpath deleted file mode 100644 index f814c35..0000000 --- a/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index aeb1e5d..0000000 --- a/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - highchart-java-api - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index f9fe345..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 7a3aacf..0000000 --- a/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index c78d932..0000000 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8c..0000000 --- a/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 From 2db00ce9b6e933d2094e271db67c2c8b54743dcf Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Fri, 25 Apr 2014 16:20:49 +0200 Subject: [PATCH 17/55] Attempt to fix coloring --- .../java/nl/pvanassen/highchart/api/plotoption/PlotColor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java index 3abc989..8978e41 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java @@ -21,7 +21,7 @@ public void addPlotStop(int stop, Color color) { } Object[] objs = new Object[2]; objs[0] = stops.size(); - objs[1] = color; + objs[1] = Integer.toHexString(color.getRGB());; stops.add(objs); } From 7e4f1dee32e15f8e83d249bf72f5fc727f030294 Mon Sep 17 00:00:00 2001 From: moritz Date: Thu, 10 Jul 2014 17:06:22 +0200 Subject: [PATCH 18/55] added testcase: given a chart with no margins specified, the json representation should have no margins too The new test is failing, because marginLeft and marginTop default to 0 instead of null. --- .../java/nl/pvanassen/highchart/TestColumnBasic.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java index 7fe3398..3d920d8 100644 --- a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java +++ b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java @@ -50,6 +50,16 @@ public void createColumnBasic() { Assert.assertEquals( "Expected column basic json", columnBasicJson, json ); } + @Test + public void testWrongMargins() { + ChartOptions chartOptions = new ChartOptions(); + + chartOptions.getChart().setDefaultSeriesType( SeriesType.COLUMN ); // do not set any margins! + String json = chartOptions.toJson(); + + Assert.assertEquals("There should be no margins in the json", "{\"chart\":{\"defaultSeriesType\":\"column\"}}", json); + } + private void addSeries( ChartOptions chartOptions, String seriesName, double[] datas ) { Series newSeries = new Series().setName( seriesName ); From c07f586ef19ce4acaf5a6a5061ddd67333ad48fa Mon Sep 17 00:00:00 2001 From: moritz Date: Thu, 10 Jul 2014 17:06:33 +0200 Subject: [PATCH 19/55] fixed that marginLeft and marginTop default to 0 instead of null --- src/main/java/nl/pvanassen/highchart/api/Chart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/nl/pvanassen/highchart/api/Chart.java b/src/main/java/nl/pvanassen/highchart/api/Chart.java index f676573..bb2031f 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Chart.java +++ b/src/main/java/nl/pvanassen/highchart/api/Chart.java @@ -18,9 +18,9 @@ public class Chart extends BaseObject { private String defaultSeriesType; - private int marginLeft; + private Integer marginLeft; - private int marginTop; + private Integer marginTop; public String getBackgroundColor() { return backgroundColor; From 756f5f9f632e9a6f6b83695e96e67f55eca84b99 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 19:13:47 +0200 Subject: [PATCH 20/55] Cleaned up parent --- pom.xml | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 6b28ef4..cf6c117 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,6 @@ 4.0.0 - nl.pvanassen highchart-java-api 0.0.1-SNAPSHOT Highchart java API @@ -21,24 +20,10 @@ UTF-8 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - - - - + + nl.pvanassen + parent + 0.1-SNAPSHOT + ../parent + From 69b5d6785038e3d748a0de2aa689f33cc32291cf Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 19:15:23 +0200 Subject: [PATCH 21/55] Added git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target From 5d2cfce90047086bc10a7216fcd74b0d65c3393f Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 19:17:01 +0200 Subject: [PATCH 22/55] Enabled Java 8 Fixed Travis --- .travis.yml | 5 ++--- pom.xml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6272fca..52a5da3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ jdk: - openjdk6 - openjdk7 - oraclejdk7 -<<<<<<< HEAD + - openjdk8 + - oraclejdk8 after_success: - mvn test jacoco:report coveralls:jacoco -======= ->>>>>>> refs/remotes/origin/master diff --git a/pom.xml b/pom.xml index ecd59a7..dc10646 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ parent nl.pvanassen - 0.2 + 0.3 highchart-java-api 0.2-SNAPSHOT From c2aa8a246c8ea9462ed7fcf8389dcf42af6d0fcc Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 19:17:53 +0200 Subject: [PATCH 23/55] Corrected Java version in Travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 52a5da3..1f848cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ jdk: - openjdk6 - openjdk7 - oraclejdk7 - - openjdk8 - oraclejdk8 after_success: - mvn test jacoco:report coveralls:jacoco From 840d9d9f21e9b8cdde1562fe6f82b971e00b76d6 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 19:41:33 +0200 Subject: [PATCH 24/55] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90202b7..6487bf4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/pvanassen/highchart-java-api.png?branch=master)](https://travis-ci.org/pvanassen/highchart-java-api) +[![Build Status](https://travis-ci.org/geckoboard-java-api/highchart-java-api.svg?branch=master)](https://travis-ci.org/geckoboard-java-api/highchart-java-api) [![Coverage Status](https://coveralls.io/repos/pvanassen/highchart-java-api/badge.png)](https://coveralls.io/r/pvanassen/highchart-java-api) Highchart java api From 9ba73b2385f5d34cec6dd9230f61885446b31da7 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 19:53:38 +0200 Subject: [PATCH 25/55] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 6487bf4..885437c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [![Build Status](https://travis-ci.org/geckoboard-java-api/highchart-java-api.svg?branch=master)](https://travis-ci.org/geckoboard-java-api/highchart-java-api) -[![Coverage Status](https://coveralls.io/repos/pvanassen/highchart-java-api/badge.png)](https://coveralls.io/r/pvanassen/highchart-java-api) - +[![Coverage Status](https://coveralls.io/repos/geckoboard-java-api/highchart-java-api/badge.png)](https://coveralls.io/r/geckoboard-java-api/highchart-java-api) Highchart java api ============= From 1e76a13bd0170845ba577470b7bb54d3c68f0c01 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 20:02:27 +0200 Subject: [PATCH 26/55] Re-enabled existing tests --- src/test/java/nl/pvanassen/highchart/TestColumnBasic.java | 3 +-- src/test/java/nl/pvanassen/highchart/TestPieChart.java | 3 +-- .../java/nl/pvanassen/highchart/TestSplineIrregularTime.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java index 7fe3398..36648e4 100644 --- a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java +++ b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java @@ -11,9 +11,8 @@ import org.junit.Test; public class TestColumnBasic { - private static final String columnBasicJson = "{\"chart\":{\"width\":800,\"height\":400,\"defaultSeriesType\":\"column\",\"marginLeft\":70,\"marginTop\":80},\"legend\":{\"align\":\"left\",\"layout\":\"vertical\",\"verticalAlign\":\"top\",\"x\":100,\"y\":70},\"plotOptions\":{\"area\":{\"borderWidth\":0},\"areaspline\":{\"borderWidth\":0},\"line\":{\"borderWidth\":0},\"pie\":{\"borderWidth\":0},\"series\":{\"borderWidth\":0},\"spline\":{\"borderWidth\":0},\"column\":{\"borderWidth\":0},\"bar\":{\"borderWidth\":0}},\"series\":[{\"data\":[{\"y\":49.9},{\"y\":71.5},{\"y\":106.4},{\"y\":129.2},{\"y\":144.0},{\"y\":176.0},{\"y\":135.6},{\"y\":148.5},{\"y\":216.4},{\"y\":194.1},{\"y\":95.6},{\"y\":54.4}],\"name\":\"Tokyo\"},{\"data\":[{\"y\":83.6},{\"y\":78.8},{\"y\":98.5},{\"y\":93.4},{\"y\":106.0},{\"y\":84.5},{\"y\":105.0},{\"y\":104.3},{\"y\":91.2},{\"y\":83.5},{\"y\":106.6},{\"y\":92.3}],\"name\":\"New York\"},{\"data\":[{\"y\":48.9},{\"y\":38.8},{\"y\":39.3},{\"y\":41.4},{\"y\":47.0},{\"y\":48.3},{\"y\":59.0},{\"y\":59.6},{\"y\":52.4},{\"y\":65.2},{\"y\":59.3},{\"y\":51.2}],\"name\":\"London\"},{\"data\":[{\"y\":42.4},{\"y\":33.2},{\"y\":34.5},{\"y\":39.7},{\"y\":52.6},{\"y\":75.5},{\"y\":57.4},{\"y\":60.4},{\"y\":47.6},{\"y\":39.1},{\"y\":46.8},{\"y\":51.1}],\"name\":\"Berlin\"}],\"title\":{\"text\":\"Monthly Average Rainfall\"},\"subtitle\":{\"text\":\"Source: WorldClimate.com\"},\"xAxis\":{\"categories\":[\"Jan\",\"Feb\",\"Mar\",\"Apr\",\"May\",\"Jun\",\"Jul\",\"Aug\",\"Sep\",\"Oct\",\"Nov\",\"Dec\"]},\"yAxis\":{\"min\":0.0,\"title\":{\"text\":\"Rainfall (mm)\"}}}"; + private static final String columnBasicJson = "{\"chart\":{\"width\":800,\"height\":400,\"defaultSeriesType\":\"column\",\"marginLeft\":70,\"marginTop\":80},\"legend\":{\"align\":\"left\",\"layout\":\"vertical\",\"verticalAlign\":\"top\",\"x\":100,\"y\":70},\"plotOptions\":{\"column\":{\"borderWidth\":0}},\"series\":[{\"data\":[{\"y\":49.9},{\"y\":71.5},{\"y\":106.4},{\"y\":129.2},{\"y\":144.0},{\"y\":176.0},{\"y\":135.6},{\"y\":148.5},{\"y\":216.4},{\"y\":194.1},{\"y\":95.6},{\"y\":54.4}],\"name\":\"Tokyo\"},{\"data\":[{\"y\":83.6},{\"y\":78.8},{\"y\":98.5},{\"y\":93.4},{\"y\":106.0},{\"y\":84.5},{\"y\":105.0},{\"y\":104.3},{\"y\":91.2},{\"y\":83.5},{\"y\":106.6},{\"y\":92.3}],\"name\":\"New York\"},{\"data\":[{\"y\":48.9},{\"y\":38.8},{\"y\":39.3},{\"y\":41.4},{\"y\":47.0},{\"y\":48.3},{\"y\":59.0},{\"y\":59.6},{\"y\":52.4},{\"y\":65.2},{\"y\":59.3},{\"y\":51.2}],\"name\":\"London\"},{\"data\":[{\"y\":42.4},{\"y\":33.2},{\"y\":34.5},{\"y\":39.7},{\"y\":52.6},{\"y\":75.5},{\"y\":57.4},{\"y\":60.4},{\"y\":47.6},{\"y\":39.1},{\"y\":46.8},{\"y\":51.1}],\"name\":\"Berlin\"}],\"title\":{\"text\":\"Monthly Average Rainfall\"},\"subtitle\":{\"text\":\"Source: WorldClimate.com\"},\"xAxis\":{\"categories\":[\"Jan\",\"Feb\",\"Mar\",\"Apr\",\"May\",\"Jun\",\"Jul\",\"Aug\",\"Sep\",\"Oct\",\"Nov\",\"Dec\"]},\"yAxis\":{\"min\":0.0,\"title\":{\"text\":\"Rainfall (mm)\"}}}"; - @Ignore @Test public void createColumnBasic() { // http://highcharts.com/demo/column-basic diff --git a/src/test/java/nl/pvanassen/highchart/TestPieChart.java b/src/test/java/nl/pvanassen/highchart/TestPieChart.java index 832b1a3..d179c52 100644 --- a/src/test/java/nl/pvanassen/highchart/TestPieChart.java +++ b/src/test/java/nl/pvanassen/highchart/TestPieChart.java @@ -9,9 +9,8 @@ import org.junit.Test; public class TestPieChart { - private static final String pieJson = "{\"chart\":{\"width\":800,\"height\":600,\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"area\":{\"borderWidth\":0},\"areaspline\":{\"borderWidth\":0},\"line\":{\"borderWidth\":0},\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":0.0},\"allowPointSelect\":true,\"borderWidth\":0},\"series\":{\"borderWidth\":0},\"spline\":{\"borderWidth\":0},\"column\":{\"borderWidth\":0},\"bar\":{\"borderWidth\":0}},\"series\":[{\"data\":[{\"y\":45.0,\"name\":\"Firefox\"},{\"y\":26.8,\"name\":\"IE\"},{\"y\":12.8,\"selected\":true,\"sliced\":true,\"name\":\"Chrome\"},{\"y\":8.5,\"name\":\"Safari\"},{\"y\":6.2,\"name\":\"Opera\"},{\"y\":0.7,\"name\":\"Others\"}],\"name\":\"Browser share\",\"type\":\"pie\"}],\"title\":{\"text\":\"Browser market shares at a specific website, 2010\"}}"; + private static final String pieJson = "{\"chart\":{\"width\":800,\"height\":600,\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":0.0},\"allowPointSelect\":true}},\"series\":[{\"data\":[{\"y\":45.0,\"name\":\"Firefox\"},{\"y\":26.8,\"name\":\"IE\"},{\"y\":12.8,\"selected\":true,\"sliced\":true,\"name\":\"Chrome\"},{\"y\":8.5,\"name\":\"Safari\"},{\"y\":6.2,\"name\":\"Opera\"},{\"y\":0.7,\"name\":\"Others\"}],\"name\":\"Browser share\",\"type\":\"pie\"}],\"title\":{\"text\":\"Browser market shares at a specific website, 2010\"}}"; - @Ignore @Test public void createPieChart() { // http://highcharts.com/demo/pie-basic diff --git a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java index bebde91..32a3859 100644 --- a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java +++ b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java @@ -14,9 +14,8 @@ import org.junit.Ignore; public class TestSplineIrregularTime { - private static final String splineJson = "{\"chart\":{\"width\":800,\"height\":600,\"defaultSeriesType\":\"spline\",\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"area\":{\"borderWidth\":0},\"areaspline\":{\"borderWidth\":0},\"line\":{\"borderWidth\":0},\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":0.0},\"allowPointSelect\":true,\"borderWidth\":0},\"series\":{\"borderWidth\":0},\"spline\":{\"borderWidth\":0},\"column\":{\"borderWidth\":0},\"bar\":{\"borderWidth\":0}},\"series\":[{\"data\":[{\"x\":2.58732E10,\"y\":0.0},{\"x\":2.70828E10,\"y\":0.6},{\"x\":2.7774E10,\"y\":0.7},{\"x\":2.89836E10,\"y\":0.8},{\"x\":2.95884E10,\"y\":0.6},{\"x\":3.01932E10,\"y\":0.6},{\"x\":3.123E10,\"y\":0.67},{\"x\":3.15756E10,\"y\":0.81},{\"x\":3.21804E10,\"y\":0.78},{\"x\":3.2526E10,\"y\":0.98},{\"x\":3.3822E10,\"y\":1.84},{\"x\":3.50316E10,\"y\":1.8},{\"x\":3.57228E10,\"y\":1.8},{\"x\":3.62412E10,\"y\":1.92},{\"x\":3.69324E10,\"y\":2.49},{\"x\":3.75372E10,\"y\":2.79},{\"x\":3.78828E10,\"y\":2.73},{\"x\":3.87468E10,\"y\":2.61},{\"x\":3.9438E10,\"y\":2.76},{\"x\":3.97836E10,\"y\":2.82},{\"x\":4.03884E10,\"y\":2.8},{\"x\":4.21164E10,\"y\":2.1},{\"x\":4.41036E10,\"y\":1.1},{\"x\":4.53132E10,\"y\":0.25},{\"x\":4.55724E10,\"y\":0.0}],\"name\":\"Winter 2007-2008\"},{\"data\":[{\"x\":2.50956E10,\"y\":0.0},{\"x\":2.57868E10,\"y\":0.2},{\"x\":2.88972E10,\"y\":0.47},{\"x\":2.97612E10,\"y\":0.55},{\"x\":3.09708E10,\"y\":1.38},{\"x\":3.21804E10,\"y\":1.38},{\"x\":3.27852E10,\"y\":1.38},{\"x\":3.4254E10,\"y\":1.38},{\"x\":3.48588E10,\"y\":1.48},{\"x\":3.5982E10,\"y\":1.5},{\"x\":3.76236E10,\"y\":1.89},{\"x\":3.87468E10,\"y\":2.0},{\"x\":3.96108E10,\"y\":1.94},{\"x\":4.00428E10,\"y\":1.91},{\"x\":4.03884E10,\"y\":1.75},{\"x\":4.09068E10,\"y\":1.6},{\"x\":4.40172E10,\"y\":0.6},{\"x\":4.45356E10,\"y\":0.35},{\"x\":4.51404E10,\"y\":0.0}],\"name\":\"Winter 2008-2009\"},{\"data\":[{\"x\":2.4318E10,\"y\":0.0},{\"x\":2.475E10,\"y\":0.15},{\"x\":2.8638E10,\"y\":0.35},{\"x\":2.98476E10,\"y\":0.46},{\"x\":3.15756E10,\"y\":0.59},{\"x\":3.35628E10,\"y\":0.58},{\"x\":3.4254E10,\"y\":0.62},{\"x\":3.47724E10,\"y\":0.65},{\"x\":3.61548E10,\"y\":0.77},{\"x\":3.7278E10,\"y\":0.77},{\"x\":3.77964E10,\"y\":0.79},{\"x\":3.86604E10,\"y\":0.86},{\"x\":3.96108E10,\"y\":0.8},{\"x\":4.08204E10,\"y\":0.94},{\"x\":4.13388E10,\"y\":0.9},{\"x\":4.32396E10,\"y\":0.39},{\"x\":4.36716E10,\"y\":0.0}],\"name\":\"Winter 2009-2010\"}],\"title\":{\"text\":\"Snow depth in the Vikjafjellet mountain, Norway\"},\"subtitle\":{\"text\":\"An example of irregular time data in Highcharts JS\"},\"xAxis\":{\"type\":\"datetime\",\"dateTimeLabelFormats\":{\"month\":\"%e. %b\",\"year\":\"%b\"}},\"yAxis\":{\"min\":0.0,\"title\":{\"text\":\"Snow depth (m)\"}}}"; + private static final String splineJson = "{\"chart\":{\"width\":800,\"height\":600,\"defaultSeriesType\":\"spline\",\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":0.0},\"allowPointSelect\":true}},\"series\":[{\"data\":[{\"x\":2.58732E10,\"y\":0.0},{\"x\":2.70828E10,\"y\":0.6},{\"x\":2.7774E10,\"y\":0.7},{\"x\":2.89836E10,\"y\":0.8},{\"x\":2.95884E10,\"y\":0.6},{\"x\":3.01932E10,\"y\":0.6},{\"x\":3.123E10,\"y\":0.67},{\"x\":3.15756E10,\"y\":0.81},{\"x\":3.21804E10,\"y\":0.78},{\"x\":3.2526E10,\"y\":0.98},{\"x\":3.3822E10,\"y\":1.84},{\"x\":3.50316E10,\"y\":1.8},{\"x\":3.57228E10,\"y\":1.8},{\"x\":3.62412E10,\"y\":1.92},{\"x\":3.69324E10,\"y\":2.49},{\"x\":3.75372E10,\"y\":2.79},{\"x\":3.78828E10,\"y\":2.73},{\"x\":3.87468E10,\"y\":2.61},{\"x\":3.9438E10,\"y\":2.76},{\"x\":3.97836E10,\"y\":2.82},{\"x\":4.03884E10,\"y\":2.8},{\"x\":4.21164E10,\"y\":2.1},{\"x\":4.41036E10,\"y\":1.1},{\"x\":4.53132E10,\"y\":0.25},{\"x\":4.55724E10,\"y\":0.0}],\"name\":\"Winter 2007-2008\"},{\"data\":[{\"x\":2.50956E10,\"y\":0.0},{\"x\":2.57868E10,\"y\":0.2},{\"x\":2.88972E10,\"y\":0.47},{\"x\":2.97612E10,\"y\":0.55},{\"x\":3.09708E10,\"y\":1.38},{\"x\":3.21804E10,\"y\":1.38},{\"x\":3.27852E10,\"y\":1.38},{\"x\":3.4254E10,\"y\":1.38},{\"x\":3.48588E10,\"y\":1.48},{\"x\":3.5982E10,\"y\":1.5},{\"x\":3.76236E10,\"y\":1.89},{\"x\":3.87468E10,\"y\":2.0},{\"x\":3.96108E10,\"y\":1.94},{\"x\":4.00428E10,\"y\":1.91},{\"x\":4.03884E10,\"y\":1.75},{\"x\":4.09068E10,\"y\":1.6},{\"x\":4.40172E10,\"y\":0.6},{\"x\":4.45356E10,\"y\":0.35},{\"x\":4.51404E10,\"y\":0.0}],\"name\":\"Winter 2008-2009\"},{\"data\":[{\"x\":2.4318E10,\"y\":0.0},{\"x\":2.475E10,\"y\":0.15},{\"x\":2.8638E10,\"y\":0.35},{\"x\":2.98476E10,\"y\":0.46},{\"x\":3.15756E10,\"y\":0.59},{\"x\":3.35628E10,\"y\":0.58},{\"x\":3.4254E10,\"y\":0.62},{\"x\":3.47724E10,\"y\":0.65},{\"x\":3.61548E10,\"y\":0.77},{\"x\":3.7278E10,\"y\":0.77},{\"x\":3.77964E10,\"y\":0.79},{\"x\":3.86604E10,\"y\":0.86},{\"x\":3.96108E10,\"y\":0.8},{\"x\":4.08204E10,\"y\":0.94},{\"x\":4.13388E10,\"y\":0.9},{\"x\":4.32396E10,\"y\":0.39},{\"x\":4.36716E10,\"y\":0.0}],\"name\":\"Winter 2009-2010\"}],\"title\":{\"text\":\"Snow depth in the Vikjafjellet mountain, Norway\"},\"subtitle\":{\"text\":\"An example of irregular time data in Highcharts JS\"},\"xAxis\":{\"type\":\"datetime\",\"dateTimeLabelFormats\":{\"month\":\"%e. %b\",\"year\":\"%b\"}},\"yAxis\":{\"min\":0.0,\"title\":{\"text\":\"Snow depth (m)\"}}}"; - @Ignore @Test public void testSplineIrregularTime() { // http://highcharts.com/demo/spline-irregular-time From 0c1dc005096c6308a6f5a9aa505ef20793c3ecf5 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 20:22:13 +0200 Subject: [PATCH 27/55] Fixed Double notations in JSON --- .../highchart/api/base/GsonHelper.java | 57 +++++++++++-------- .../pvanassen/highchart/TestColumnBasic.java | 2 +- .../nl/pvanassen/highchart/TestPieChart.java | 3 +- .../highchart/TestSplineIrregularTime.java | 2 +- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java b/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java index c0598c4..e299a47 100644 --- a/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java +++ b/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java @@ -1,43 +1,52 @@ package nl.pvanassen.highchart.api.base; +import java.lang.reflect.Type; +import java.math.BigDecimal; + import nl.pvanassen.highchart.api.format.DateTimeLabelFormats; import nl.pvanassen.highchart.api.serializer.DateTimeLabelFormatsSerializer; import nl.pvanassen.highchart.api.serializer.StyleSerializer; -import com.google.gson.ExclusionStrategy; -import com.google.gson.FieldAttributes; -import com.google.gson.GsonBuilder; +import com.google.gson.*; public final class GsonHelper { - private static final String DATE_FORMAT = "yyyyMMdd"; + private static final String DATE_FORMAT = "yyyyMMdd"; - private static final String USER_OBJECT = "userObject"; + private static final String USER_OBJECT = "userObject"; - private static final GsonHelper INSTANCE = new GsonHelper(); + private static final GsonHelper INSTANCE = new GsonHelper(); - static String toJson( Object object ) { - return INSTANCE.gsonBuilder.create().toJson( object ); + static String toJson(Object object) { + return INSTANCE.gsonBuilder.create().toJson(object); } private final GsonBuilder gsonBuilder; private GsonHelper() { - gsonBuilder = new GsonBuilder().registerTypeAdapter( DateTimeLabelFormats.class, new DateTimeLabelFormatsSerializer() ) // - .registerTypeAdapter( Style.class, new StyleSerializer() )// - .setDateFormat( DATE_FORMAT )// - .setExclusionStrategies( new ExclusionStrategy() { - - @Override - public boolean shouldSkipClass( Class arg0 ) { - return false; - } - - @Override - public boolean shouldSkipField( FieldAttributes attributes ) { - return attributes.getName().equals( USER_OBJECT ); - } - - } ); + gsonBuilder = new GsonBuilder() + .registerTypeAdapter(DateTimeLabelFormats.class, new DateTimeLabelFormatsSerializer()) // + .registerTypeAdapter(Style.class, new StyleSerializer())// + .setDateFormat(DATE_FORMAT)// + .setExclusionStrategies(new ExclusionStrategy() { + + @Override + public boolean shouldSkipClass(Class arg0) { + return false; + } + + @Override + public boolean shouldSkipField(FieldAttributes attributes) { + return attributes.getName().equals(USER_OBJECT); + } + + }).registerTypeAdapter(Double.class, new JsonSerializer() { + @Override + public JsonElement serialize(Double originalValue, Type typeOf, JsonSerializationContext context) { + BigDecimal bigValue = BigDecimal.valueOf(originalValue); + + return new JsonPrimitive(bigValue.toPlainString()); + } + }); } } diff --git a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java index 36648e4..6f694c3 100644 --- a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java +++ b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java @@ -11,7 +11,7 @@ import org.junit.Test; public class TestColumnBasic { - private static final String columnBasicJson = "{\"chart\":{\"width\":800,\"height\":400,\"defaultSeriesType\":\"column\",\"marginLeft\":70,\"marginTop\":80},\"legend\":{\"align\":\"left\",\"layout\":\"vertical\",\"verticalAlign\":\"top\",\"x\":100,\"y\":70},\"plotOptions\":{\"column\":{\"borderWidth\":0}},\"series\":[{\"data\":[{\"y\":49.9},{\"y\":71.5},{\"y\":106.4},{\"y\":129.2},{\"y\":144.0},{\"y\":176.0},{\"y\":135.6},{\"y\":148.5},{\"y\":216.4},{\"y\":194.1},{\"y\":95.6},{\"y\":54.4}],\"name\":\"Tokyo\"},{\"data\":[{\"y\":83.6},{\"y\":78.8},{\"y\":98.5},{\"y\":93.4},{\"y\":106.0},{\"y\":84.5},{\"y\":105.0},{\"y\":104.3},{\"y\":91.2},{\"y\":83.5},{\"y\":106.6},{\"y\":92.3}],\"name\":\"New York\"},{\"data\":[{\"y\":48.9},{\"y\":38.8},{\"y\":39.3},{\"y\":41.4},{\"y\":47.0},{\"y\":48.3},{\"y\":59.0},{\"y\":59.6},{\"y\":52.4},{\"y\":65.2},{\"y\":59.3},{\"y\":51.2}],\"name\":\"London\"},{\"data\":[{\"y\":42.4},{\"y\":33.2},{\"y\":34.5},{\"y\":39.7},{\"y\":52.6},{\"y\":75.5},{\"y\":57.4},{\"y\":60.4},{\"y\":47.6},{\"y\":39.1},{\"y\":46.8},{\"y\":51.1}],\"name\":\"Berlin\"}],\"title\":{\"text\":\"Monthly Average Rainfall\"},\"subtitle\":{\"text\":\"Source: WorldClimate.com\"},\"xAxis\":{\"categories\":[\"Jan\",\"Feb\",\"Mar\",\"Apr\",\"May\",\"Jun\",\"Jul\",\"Aug\",\"Sep\",\"Oct\",\"Nov\",\"Dec\"]},\"yAxis\":{\"min\":0.0,\"title\":{\"text\":\"Rainfall (mm)\"}}}"; + private static final String columnBasicJson = "{\"chart\":{\"width\":800,\"height\":400,\"defaultSeriesType\":\"column\",\"marginLeft\":70,\"marginTop\":80},\"legend\":{\"align\":\"left\",\"layout\":\"vertical\",\"verticalAlign\":\"top\",\"x\":100,\"y\":70},\"plotOptions\":{\"column\":{\"borderWidth\":0}},\"series\":[{\"data\":[{\"y\":\"49.9\"},{\"y\":\"71.5\"},{\"y\":\"106.4\"},{\"y\":\"129.2\"},{\"y\":\"144.0\"},{\"y\":\"176.0\"},{\"y\":\"135.6\"},{\"y\":\"148.5\"},{\"y\":\"216.4\"},{\"y\":\"194.1\"},{\"y\":\"95.6\"},{\"y\":\"54.4\"}],\"name\":\"Tokyo\"},{\"data\":[{\"y\":\"83.6\"},{\"y\":\"78.8\"},{\"y\":\"98.5\"},{\"y\":\"93.4\"},{\"y\":\"106.0\"},{\"y\":\"84.5\"},{\"y\":\"105.0\"},{\"y\":\"104.3\"},{\"y\":\"91.2\"},{\"y\":\"83.5\"},{\"y\":\"106.6\"},{\"y\":\"92.3\"}],\"name\":\"New York\"},{\"data\":[{\"y\":\"48.9\"},{\"y\":\"38.8\"},{\"y\":\"39.3\"},{\"y\":\"41.4\"},{\"y\":\"47.0\"},{\"y\":\"48.3\"},{\"y\":\"59.0\"},{\"y\":\"59.6\"},{\"y\":\"52.4\"},{\"y\":\"65.2\"},{\"y\":\"59.3\"},{\"y\":\"51.2\"}],\"name\":\"London\"},{\"data\":[{\"y\":\"42.4\"},{\"y\":\"33.2\"},{\"y\":\"34.5\"},{\"y\":\"39.7\"},{\"y\":\"52.6\"},{\"y\":\"75.5\"},{\"y\":\"57.4\"},{\"y\":\"60.4\"},{\"y\":\"47.6\"},{\"y\":\"39.1\"},{\"y\":\"46.8\"},{\"y\":\"51.1\"}],\"name\":\"Berlin\"}],\"title\":{\"text\":\"Monthly Average Rainfall\"},\"subtitle\":{\"text\":\"Source: WorldClimate.com\"},\"xAxis\":{\"categories\":[\"Jan\",\"Feb\",\"Mar\",\"Apr\",\"May\",\"Jun\",\"Jul\",\"Aug\",\"Sep\",\"Oct\",\"Nov\",\"Dec\"]},\"yAxis\":{\"min\":\"0.0\",\"title\":{\"text\":\"Rainfall (mm)\"}}}"; @Test public void createColumnBasic() { diff --git a/src/test/java/nl/pvanassen/highchart/TestPieChart.java b/src/test/java/nl/pvanassen/highchart/TestPieChart.java index d179c52..2829460 100644 --- a/src/test/java/nl/pvanassen/highchart/TestPieChart.java +++ b/src/test/java/nl/pvanassen/highchart/TestPieChart.java @@ -5,11 +5,10 @@ import nl.pvanassen.highchart.api.Series; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; public class TestPieChart { - private static final String pieJson = "{\"chart\":{\"width\":800,\"height\":600,\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":0.0},\"allowPointSelect\":true}},\"series\":[{\"data\":[{\"y\":45.0,\"name\":\"Firefox\"},{\"y\":26.8,\"name\":\"IE\"},{\"y\":12.8,\"selected\":true,\"sliced\":true,\"name\":\"Chrome\"},{\"y\":8.5,\"name\":\"Safari\"},{\"y\":6.2,\"name\":\"Opera\"},{\"y\":0.7,\"name\":\"Others\"}],\"name\":\"Browser share\",\"type\":\"pie\"}],\"title\":{\"text\":\"Browser market shares at a specific website, 2010\"}}"; + private static final String pieJson = "{\"chart\":{\"width\":800,\"height\":600,\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":\"0.0\"},\"allowPointSelect\":true}},\"series\":[{\"data\":[{\"y\":\"45.0\",\"name\":\"Firefox\"},{\"y\":\"26.8\",\"name\":\"IE\"},{\"y\":\"12.8\",\"selected\":true,\"sliced\":true,\"name\":\"Chrome\"},{\"y\":\"8.5\",\"name\":\"Safari\"},{\"y\":\"6.2\",\"name\":\"Opera\"},{\"y\":\"0.7\",\"name\":\"Others\"}],\"name\":\"Browser share\",\"type\":\"pie\"}],\"title\":{\"text\":\"Browser market shares at a specific website, 2010\"}}"; @Test public void createPieChart() { diff --git a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java index 32a3859..7558a98 100644 --- a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java +++ b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java @@ -14,7 +14,7 @@ import org.junit.Ignore; public class TestSplineIrregularTime { - private static final String splineJson = "{\"chart\":{\"width\":800,\"height\":600,\"defaultSeriesType\":\"spline\",\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":0.0},\"allowPointSelect\":true}},\"series\":[{\"data\":[{\"x\":2.58732E10,\"y\":0.0},{\"x\":2.70828E10,\"y\":0.6},{\"x\":2.7774E10,\"y\":0.7},{\"x\":2.89836E10,\"y\":0.8},{\"x\":2.95884E10,\"y\":0.6},{\"x\":3.01932E10,\"y\":0.6},{\"x\":3.123E10,\"y\":0.67},{\"x\":3.15756E10,\"y\":0.81},{\"x\":3.21804E10,\"y\":0.78},{\"x\":3.2526E10,\"y\":0.98},{\"x\":3.3822E10,\"y\":1.84},{\"x\":3.50316E10,\"y\":1.8},{\"x\":3.57228E10,\"y\":1.8},{\"x\":3.62412E10,\"y\":1.92},{\"x\":3.69324E10,\"y\":2.49},{\"x\":3.75372E10,\"y\":2.79},{\"x\":3.78828E10,\"y\":2.73},{\"x\":3.87468E10,\"y\":2.61},{\"x\":3.9438E10,\"y\":2.76},{\"x\":3.97836E10,\"y\":2.82},{\"x\":4.03884E10,\"y\":2.8},{\"x\":4.21164E10,\"y\":2.1},{\"x\":4.41036E10,\"y\":1.1},{\"x\":4.53132E10,\"y\":0.25},{\"x\":4.55724E10,\"y\":0.0}],\"name\":\"Winter 2007-2008\"},{\"data\":[{\"x\":2.50956E10,\"y\":0.0},{\"x\":2.57868E10,\"y\":0.2},{\"x\":2.88972E10,\"y\":0.47},{\"x\":2.97612E10,\"y\":0.55},{\"x\":3.09708E10,\"y\":1.38},{\"x\":3.21804E10,\"y\":1.38},{\"x\":3.27852E10,\"y\":1.38},{\"x\":3.4254E10,\"y\":1.38},{\"x\":3.48588E10,\"y\":1.48},{\"x\":3.5982E10,\"y\":1.5},{\"x\":3.76236E10,\"y\":1.89},{\"x\":3.87468E10,\"y\":2.0},{\"x\":3.96108E10,\"y\":1.94},{\"x\":4.00428E10,\"y\":1.91},{\"x\":4.03884E10,\"y\":1.75},{\"x\":4.09068E10,\"y\":1.6},{\"x\":4.40172E10,\"y\":0.6},{\"x\":4.45356E10,\"y\":0.35},{\"x\":4.51404E10,\"y\":0.0}],\"name\":\"Winter 2008-2009\"},{\"data\":[{\"x\":2.4318E10,\"y\":0.0},{\"x\":2.475E10,\"y\":0.15},{\"x\":2.8638E10,\"y\":0.35},{\"x\":2.98476E10,\"y\":0.46},{\"x\":3.15756E10,\"y\":0.59},{\"x\":3.35628E10,\"y\":0.58},{\"x\":3.4254E10,\"y\":0.62},{\"x\":3.47724E10,\"y\":0.65},{\"x\":3.61548E10,\"y\":0.77},{\"x\":3.7278E10,\"y\":0.77},{\"x\":3.77964E10,\"y\":0.79},{\"x\":3.86604E10,\"y\":0.86},{\"x\":3.96108E10,\"y\":0.8},{\"x\":4.08204E10,\"y\":0.94},{\"x\":4.13388E10,\"y\":0.9},{\"x\":4.32396E10,\"y\":0.39},{\"x\":4.36716E10,\"y\":0.0}],\"name\":\"Winter 2009-2010\"}],\"title\":{\"text\":\"Snow depth in the Vikjafjellet mountain, Norway\"},\"subtitle\":{\"text\":\"An example of irregular time data in Highcharts JS\"},\"xAxis\":{\"type\":\"datetime\",\"dateTimeLabelFormats\":{\"month\":\"%e. %b\",\"year\":\"%b\"}},\"yAxis\":{\"min\":0.0,\"title\":{\"text\":\"Snow depth (m)\"}}}"; + private static final String splineJson = "{\"chart\":{\"width\":800,\"height\":600,\"defaultSeriesType\":\"spline\",\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":\"0.0\"},\"allowPointSelect\":true}},\"series\":[{\"data\":[{\"x\":\"25873200000\",\"y\":\"0.0\"},{\"x\":\"27082800000\",\"y\":\"0.6\"},{\"x\":\"27774000000\",\"y\":\"0.7\"},{\"x\":\"28983600000\",\"y\":\"0.8\"},{\"x\":\"29588400000\",\"y\":\"0.6\"},{\"x\":\"30193200000\",\"y\":\"0.6\"},{\"x\":\"31230000000\",\"y\":\"0.67\"},{\"x\":\"31575600000\",\"y\":\"0.81\"},{\"x\":\"32180400000\",\"y\":\"0.78\"},{\"x\":\"32526000000\",\"y\":\"0.98\"},{\"x\":\"33822000000\",\"y\":\"1.84\"},{\"x\":\"35031600000\",\"y\":\"1.8\"},{\"x\":\"35722800000\",\"y\":\"1.8\"},{\"x\":\"36241200000\",\"y\":\"1.92\"},{\"x\":\"36932400000\",\"y\":\"2.49\"},{\"x\":\"37537200000\",\"y\":\"2.79\"},{\"x\":\"37882800000\",\"y\":\"2.73\"},{\"x\":\"38746800000\",\"y\":\"2.61\"},{\"x\":\"39438000000\",\"y\":\"2.76\"},{\"x\":\"39783600000\",\"y\":\"2.82\"},{\"x\":\"40388400000\",\"y\":\"2.8\"},{\"x\":\"42116400000\",\"y\":\"2.1\"},{\"x\":\"44103600000\",\"y\":\"1.1\"},{\"x\":\"45313200000\",\"y\":\"0.25\"},{\"x\":\"45572400000\",\"y\":\"0.0\"}],\"name\":\"Winter 2007-2008\"},{\"data\":[{\"x\":\"25095600000\",\"y\":\"0.0\"},{\"x\":\"25786800000\",\"y\":\"0.2\"},{\"x\":\"28897200000\",\"y\":\"0.47\"},{\"x\":\"29761200000\",\"y\":\"0.55\"},{\"x\":\"30970800000\",\"y\":\"1.38\"},{\"x\":\"32180400000\",\"y\":\"1.38\"},{\"x\":\"32785200000\",\"y\":\"1.38\"},{\"x\":\"34254000000\",\"y\":\"1.38\"},{\"x\":\"34858800000\",\"y\":\"1.48\"},{\"x\":\"35982000000\",\"y\":\"1.5\"},{\"x\":\"37623600000\",\"y\":\"1.89\"},{\"x\":\"38746800000\",\"y\":\"2.0\"},{\"x\":\"39610800000\",\"y\":\"1.94\"},{\"x\":\"40042800000\",\"y\":\"1.91\"},{\"x\":\"40388400000\",\"y\":\"1.75\"},{\"x\":\"40906800000\",\"y\":\"1.6\"},{\"x\":\"44017200000\",\"y\":\"0.6\"},{\"x\":\"44535600000\",\"y\":\"0.35\"},{\"x\":\"45140400000\",\"y\":\"0.0\"}],\"name\":\"Winter 2008-2009\"},{\"data\":[{\"x\":\"24318000000\",\"y\":\"0.0\"},{\"x\":\"24750000000\",\"y\":\"0.15\"},{\"x\":\"28638000000\",\"y\":\"0.35\"},{\"x\":\"29847600000\",\"y\":\"0.46\"},{\"x\":\"31575600000\",\"y\":\"0.59\"},{\"x\":\"33562800000\",\"y\":\"0.58\"},{\"x\":\"34254000000\",\"y\":\"0.62\"},{\"x\":\"34772400000\",\"y\":\"0.65\"},{\"x\":\"36154800000\",\"y\":\"0.77\"},{\"x\":\"37278000000\",\"y\":\"0.77\"},{\"x\":\"37796400000\",\"y\":\"0.79\"},{\"x\":\"38660400000\",\"y\":\"0.86\"},{\"x\":\"39610800000\",\"y\":\"0.8\"},{\"x\":\"40820400000\",\"y\":\"0.94\"},{\"x\":\"41338800000\",\"y\":\"0.9\"},{\"x\":\"43239600000\",\"y\":\"0.39\"},{\"x\":\"43671600000\",\"y\":\"0.0\"}],\"name\":\"Winter 2009-2010\"}],\"title\":{\"text\":\"Snow depth in the Vikjafjellet mountain, Norway\"},\"subtitle\":{\"text\":\"An example of irregular time data in Highcharts JS\"},\"xAxis\":{\"type\":\"datetime\",\"dateTimeLabelFormats\":{\"month\":\"%e. %b\",\"year\":\"%b\"}},\"yAxis\":{\"min\":\"0.0\",\"title\":{\"text\":\"Snow depth (m)\"}}}"; @Test public void testSplineIrregularTime() { From f16a902bec4461e3827271dbc9076d6ea053e22d Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 20:26:03 +0200 Subject: [PATCH 28/55] Fixed spline test by setting the timezone --- .../java/nl/pvanassen/highchart/TestSplineIrregularTime.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java index 7558a98..0c7003c 100644 --- a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java +++ b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java @@ -1,6 +1,7 @@ package nl.pvanassen.highchart; import java.util.Calendar; +import java.util.TimeZone; import nl.pvanassen.highchart.api.ChartOptions; import nl.pvanassen.highchart.api.Point; @@ -18,6 +19,7 @@ public class TestSplineIrregularTime { @Test public void testSplineIrregularTime() { + TimeZone.setDefault(TimeZone.getTimeZone("GMT+1")); // http://highcharts.com/demo/spline-irregular-time ChartOptions chartOptions = new ChartOptions(); chartOptions.getChart().setWidth( 800 ).setHeight( 600 ).setDefaultSeriesType( SeriesType.SPLINE ).setMarginLeft( 70 ).setMarginTop( 80 ); From 7cdbf5619ec1cdd723b2b082e95bfe1196b5cc60 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 20:26:11 +0200 Subject: [PATCH 29/55] Fixed imports --- .../java/nl/pvanassen/highchart/TestSplineIrregularTime.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java index 0c7003c..47cd80b 100644 --- a/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java +++ b/src/test/java/nl/pvanassen/highchart/TestSplineIrregularTime.java @@ -9,10 +9,8 @@ import nl.pvanassen.highchart.api.format.DateTimeLabelFormats.TimeUnit; import nl.pvanassen.highchart.api.shared.SeriesType; -import org.junit.Ignore; -import org.junit.Test; import org.junit.Assert; -import org.junit.Ignore; +import org.junit.Test; public class TestSplineIrregularTime { private static final String splineJson = "{\"chart\":{\"width\":800,\"height\":600,\"defaultSeriesType\":\"spline\",\"marginLeft\":70,\"marginTop\":80},\"plotOptions\":{\"pie\":{\"dataLabels\":{\"color\":\"#000000\",\"enabled\":true,\"formatter\":\"function() {return \\u0027\\u003cb\\u003e\\u0027+ this.point.name +\\u0027\\u003c/b\\u003e: \\u0027+ this.y +\\u0027 %\\u0027;}\",\"align\":\"center\",\"rotation\":\"0.0\"},\"allowPointSelect\":true}},\"series\":[{\"data\":[{\"x\":\"25873200000\",\"y\":\"0.0\"},{\"x\":\"27082800000\",\"y\":\"0.6\"},{\"x\":\"27774000000\",\"y\":\"0.7\"},{\"x\":\"28983600000\",\"y\":\"0.8\"},{\"x\":\"29588400000\",\"y\":\"0.6\"},{\"x\":\"30193200000\",\"y\":\"0.6\"},{\"x\":\"31230000000\",\"y\":\"0.67\"},{\"x\":\"31575600000\",\"y\":\"0.81\"},{\"x\":\"32180400000\",\"y\":\"0.78\"},{\"x\":\"32526000000\",\"y\":\"0.98\"},{\"x\":\"33822000000\",\"y\":\"1.84\"},{\"x\":\"35031600000\",\"y\":\"1.8\"},{\"x\":\"35722800000\",\"y\":\"1.8\"},{\"x\":\"36241200000\",\"y\":\"1.92\"},{\"x\":\"36932400000\",\"y\":\"2.49\"},{\"x\":\"37537200000\",\"y\":\"2.79\"},{\"x\":\"37882800000\",\"y\":\"2.73\"},{\"x\":\"38746800000\",\"y\":\"2.61\"},{\"x\":\"39438000000\",\"y\":\"2.76\"},{\"x\":\"39783600000\",\"y\":\"2.82\"},{\"x\":\"40388400000\",\"y\":\"2.8\"},{\"x\":\"42116400000\",\"y\":\"2.1\"},{\"x\":\"44103600000\",\"y\":\"1.1\"},{\"x\":\"45313200000\",\"y\":\"0.25\"},{\"x\":\"45572400000\",\"y\":\"0.0\"}],\"name\":\"Winter 2007-2008\"},{\"data\":[{\"x\":\"25095600000\",\"y\":\"0.0\"},{\"x\":\"25786800000\",\"y\":\"0.2\"},{\"x\":\"28897200000\",\"y\":\"0.47\"},{\"x\":\"29761200000\",\"y\":\"0.55\"},{\"x\":\"30970800000\",\"y\":\"1.38\"},{\"x\":\"32180400000\",\"y\":\"1.38\"},{\"x\":\"32785200000\",\"y\":\"1.38\"},{\"x\":\"34254000000\",\"y\":\"1.38\"},{\"x\":\"34858800000\",\"y\":\"1.48\"},{\"x\":\"35982000000\",\"y\":\"1.5\"},{\"x\":\"37623600000\",\"y\":\"1.89\"},{\"x\":\"38746800000\",\"y\":\"2.0\"},{\"x\":\"39610800000\",\"y\":\"1.94\"},{\"x\":\"40042800000\",\"y\":\"1.91\"},{\"x\":\"40388400000\",\"y\":\"1.75\"},{\"x\":\"40906800000\",\"y\":\"1.6\"},{\"x\":\"44017200000\",\"y\":\"0.6\"},{\"x\":\"44535600000\",\"y\":\"0.35\"},{\"x\":\"45140400000\",\"y\":\"0.0\"}],\"name\":\"Winter 2008-2009\"},{\"data\":[{\"x\":\"24318000000\",\"y\":\"0.0\"},{\"x\":\"24750000000\",\"y\":\"0.15\"},{\"x\":\"28638000000\",\"y\":\"0.35\"},{\"x\":\"29847600000\",\"y\":\"0.46\"},{\"x\":\"31575600000\",\"y\":\"0.59\"},{\"x\":\"33562800000\",\"y\":\"0.58\"},{\"x\":\"34254000000\",\"y\":\"0.62\"},{\"x\":\"34772400000\",\"y\":\"0.65\"},{\"x\":\"36154800000\",\"y\":\"0.77\"},{\"x\":\"37278000000\",\"y\":\"0.77\"},{\"x\":\"37796400000\",\"y\":\"0.79\"},{\"x\":\"38660400000\",\"y\":\"0.86\"},{\"x\":\"39610800000\",\"y\":\"0.8\"},{\"x\":\"40820400000\",\"y\":\"0.94\"},{\"x\":\"41338800000\",\"y\":\"0.9\"},{\"x\":\"43239600000\",\"y\":\"0.39\"},{\"x\":\"43671600000\",\"y\":\"0.0\"}],\"name\":\"Winter 2009-2010\"}],\"title\":{\"text\":\"Snow depth in the Vikjafjellet mountain, Norway\"},\"subtitle\":{\"text\":\"An example of irregular time data in Highcharts JS\"},\"xAxis\":{\"type\":\"datetime\",\"dateTimeLabelFormats\":{\"month\":\"%e. %b\",\"year\":\"%b\"}},\"yAxis\":{\"min\":\"0.0\",\"title\":{\"text\":\"Snow depth (m)\"}}}"; From 4d47016637c94edf6741724c493091e68c0fb636 Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 20:43:00 +0200 Subject: [PATCH 30/55] Organised imports --- src/main/java/nl/pvanassen/highchart/api/Axis.java | 5 +---- src/main/java/nl/pvanassen/highchart/api/ChartOptions.java | 7 +------ src/main/java/nl/pvanassen/highchart/api/Labels.java | 5 +---- src/main/java/nl/pvanassen/highchart/api/Series.java | 7 +------ .../java/nl/pvanassen/highchart/api/axis/AxisLabels.java | 5 +---- .../pvanassen/highchart/api/plotoption/PlotGradient.java | 1 - .../highchart/api/plotoption/PlotOptionsSeries.java | 5 +---- .../highchart/api/serializer/CenterSerializer.java | 6 +----- .../nl/pvanassen/highchart/api/serializer/Serializer.java | 6 +----- src/test/java/nl/pvanassen/highchart/TestColumnBasic.java | 1 - 10 files changed, 8 insertions(+), 40 deletions(-) diff --git a/src/main/java/nl/pvanassen/highchart/api/Axis.java b/src/main/java/nl/pvanassen/highchart/api/Axis.java index dafda8d..425e7cf 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Axis.java +++ b/src/main/java/nl/pvanassen/highchart/api/Axis.java @@ -1,9 +1,6 @@ package nl.pvanassen.highchart.api; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.*; import nl.pvanassen.highchart.api.axis.AxisLabels; import nl.pvanassen.highchart.api.axis.AxisPlotLines; diff --git a/src/main/java/nl/pvanassen/highchart/api/ChartOptions.java b/src/main/java/nl/pvanassen/highchart/api/ChartOptions.java index 597f534..c3766be 100644 --- a/src/main/java/nl/pvanassen/highchart/api/ChartOptions.java +++ b/src/main/java/nl/pvanassen/highchart/api/ChartOptions.java @@ -1,11 +1,6 @@ package nl.pvanassen.highchart.api; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import javax.xml.bind.annotation.*; import nl.pvanassen.highchart.api.base.BaseObject; import nl.pvanassen.highchart.api.utils.JsonArray; diff --git a/src/main/java/nl/pvanassen/highchart/api/Labels.java b/src/main/java/nl/pvanassen/highchart/api/Labels.java index e450346..b4c811f 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Labels.java +++ b/src/main/java/nl/pvanassen/highchart/api/Labels.java @@ -1,9 +1,6 @@ package nl.pvanassen.highchart.api; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.*; import nl.pvanassen.highchart.api.base.BaseObject; import nl.pvanassen.highchart.api.label.LabelsItems; diff --git a/src/main/java/nl/pvanassen/highchart/api/Series.java b/src/main/java/nl/pvanassen/highchart/api/Series.java index 1f9b065..b28fbf5 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Series.java +++ b/src/main/java/nl/pvanassen/highchart/api/Series.java @@ -1,11 +1,6 @@ package nl.pvanassen.highchart.api; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.*; import nl.pvanassen.highchart.api.base.BaseObject; import nl.pvanassen.highchart.api.plotoption.PlotMarkerStates; diff --git a/src/main/java/nl/pvanassen/highchart/api/axis/AxisLabels.java b/src/main/java/nl/pvanassen/highchart/api/axis/AxisLabels.java index 7fb7009..cecec38 100644 --- a/src/main/java/nl/pvanassen/highchart/api/axis/AxisLabels.java +++ b/src/main/java/nl/pvanassen/highchart/api/axis/AxisLabels.java @@ -1,9 +1,6 @@ package nl.pvanassen.highchart.api.axis; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.*; import nl.pvanassen.highchart.api.base.BaseObject; diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java index c513ddb..de40b0c 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java @@ -1,6 +1,5 @@ package nl.pvanassen.highchart.api.plotoption; -import javax.xml.bind.annotation.*; public class PlotGradient { private int x1; diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java index 60e78fe..a8f3210 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java @@ -1,9 +1,6 @@ package nl.pvanassen.highchart.api.plotoption; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.*; import nl.pvanassen.highchart.api.base.BaseObject; diff --git a/src/main/java/nl/pvanassen/highchart/api/serializer/CenterSerializer.java b/src/main/java/nl/pvanassen/highchart/api/serializer/CenterSerializer.java index f471f15..464b40b 100644 --- a/src/main/java/nl/pvanassen/highchart/api/serializer/CenterSerializer.java +++ b/src/main/java/nl/pvanassen/highchart/api/serializer/CenterSerializer.java @@ -4,11 +4,7 @@ import nl.pvanassen.highchart.api.serie.SeriesCenter; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; +import com.google.gson.*; public class CenterSerializer implements JsonSerializer { diff --git a/src/main/java/nl/pvanassen/highchart/api/serializer/Serializer.java b/src/main/java/nl/pvanassen/highchart/api/serializer/Serializer.java index bab44a3..e44c156 100644 --- a/src/main/java/nl/pvanassen/highchart/api/serializer/Serializer.java +++ b/src/main/java/nl/pvanassen/highchart/api/serializer/Serializer.java @@ -4,11 +4,7 @@ import java.util.Map; import java.util.Map.Entry; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; +import com.google.gson.*; public abstract class Serializer implements JsonSerializer { diff --git a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java index 9d7a6a3..06b984c 100644 --- a/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java +++ b/src/test/java/nl/pvanassen/highchart/TestColumnBasic.java @@ -7,7 +7,6 @@ import nl.pvanassen.highchart.api.utils.JsonArray; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; public class TestColumnBasic { From ec766c7ceeb30a7942de2b43abb44017cf836cfb Mon Sep 17 00:00:00 2001 From: Paul van Assen Date: Thu, 10 Jul 2014 20:48:33 +0200 Subject: [PATCH 31/55] Applied correct formatting --- .../java/nl/pvanassen/highchart/api/Axis.java | 52 ++++---- .../nl/pvanassen/highchart/api/Chart.java | 25 ++-- .../pvanassen/highchart/api/ChartOptions.java | 48 ++++---- .../nl/pvanassen/highchart/api/Credits.java | 2 +- .../highchart/api/HighchartsFactory.java | 1 - .../nl/pvanassen/highchart/api/Labels.java | 6 +- .../nl/pvanassen/highchart/api/Legend.java | 22 ++-- .../pvanassen/highchart/api/PlotOptions.java | 9 +- .../nl/pvanassen/highchart/api/Point.java | 18 +-- .../nl/pvanassen/highchart/api/Series.java | 52 ++++---- .../nl/pvanassen/highchart/api/Title.java | 12 +- .../nl/pvanassen/highchart/api/Tooltip.java | 6 +- .../highchart/api/axis/AxisLabels.java | 8 +- .../highchart/api/axis/AxisPlotLineLabel.java | 18 +-- .../highchart/api/axis/AxisPlotLines.java | 26 ++-- .../highchart/api/base/BaseObject.java | 5 +- .../highchart/api/base/GsonHelper.java | 39 +++--- .../pvanassen/highchart/api/base/Style.java | 10 +- .../highchart/api/export/Renderer.java | 14 +-- .../api/format/DateTimeLabelFormats.java | 11 +- .../highchart/api/label/LabelsItems.java | 14 +-- .../highchart/api/plotoption/PlotColor.java | 11 +- .../api/plotoption/PlotGradient.java | 5 +- .../api/plotoption/PlotMarkerHover.java | 2 +- .../api/plotoption/PlotMarkerSelect.java | 8 +- .../api/plotoption/PlotMarkerStates.java | 4 +- .../api/plotoption/PlotOptionsDataLabels.java | 24 ++-- .../api/plotoption/PlotOptionsMarker.java | 10 +- .../api/plotoption/PlotOptionsSeries.java | 8 +- .../api/plotoption/PlotOptionsStates.java | 4 +- .../api/plotoption/PlotStatesSelect.java | 13 +- .../highchart/api/plotoption/PlotStop.java | 2 + .../api/serializer/CenterSerializer.java | 10 +- .../DateTimeLabelFormatsSerializer.java | 6 +- .../highchart/api/serializer/Serializer.java | 14 +-- .../api/serializer/StyleSerializer.java | 2 +- .../highchart/api/serie/SeriesCenter.java | 12 +- .../highchart/api/shared/SeriesType.java | 47 +++++--- .../api/shared/SeriesTypeVisitor.java | 18 +-- .../highchart/api/utils/ArrayString.java | 34 +++--- .../highchart/api/utils/JsonArray.java | 34 +++--- .../pvanassen/highchart/TestColumnBasic.java | 47 +++++--- .../nl/pvanassen/highchart/TestPieChart.java | 24 ++-- .../highchart/TestSplineIrregularTime.java | 111 ++++++++++++++---- 44 files changed, 478 insertions(+), 370 deletions(-) diff --git a/src/main/java/nl/pvanassen/highchart/api/Axis.java b/src/main/java/nl/pvanassen/highchart/api/Axis.java index 425e7cf..e66b71b 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Axis.java +++ b/src/main/java/nl/pvanassen/highchart/api/Axis.java @@ -9,41 +9,41 @@ import nl.pvanassen.highchart.api.utils.ArrayString; import nl.pvanassen.highchart.api.utils.JsonArray; -@XmlAccessorType( XmlAccessType.NONE ) +@XmlAccessorType(XmlAccessType.NONE) public class Axis extends BaseObject { @XmlElement - private Integer maxZoom; + private Integer maxZoom; @XmlElement - private Boolean startOnTick; + private Boolean startOnTick; @XmlElement - private Double tickInterval; + private Double tickInterval; @XmlElement - private Boolean showFirstLabel; + private Boolean showFirstLabel; @XmlElement - private Double min; + private Double min; @XmlElement - private Double max; + private Double max; @XmlElement - private String type; + private String type; - @XmlElement( type = AxisLabels.class ) - private AxisLabels labels; + @XmlElement(type = AxisLabels.class) + private AxisLabels labels; - private DateTimeLabelFormats dateTimeLabelFormats; + private DateTimeLabelFormats dateTimeLabelFormats; @XmlTransient - private ArrayString categories; + private ArrayString categories; private JsonArray plotLines; - private Title title; + private Title title; public Axis() { labels = null; @@ -54,25 +54,25 @@ public Axis() { @XmlTransient public ArrayString getCategories() { - if ( categories == null ) { + if (categories == null) { categories = new ArrayString(); } return categories; } public int getCategoriesLength() { - return ( categories != null ) ? categories.size() : 0; + return categories != null ? categories.size() : 0; } public DateTimeLabelFormats getDateTimeLabelFormats() { - if ( dateTimeLabelFormats == null ) { + if (dateTimeLabelFormats == null) { dateTimeLabelFormats = new DateTimeLabelFormats(); } return dateTimeLabelFormats; } public AxisLabels getLabels() { - if ( labels == null ) { + if (labels == null) { labels = new AxisLabels(); } return labels; @@ -99,7 +99,7 @@ public double getTickInterval() { } public Title getTitle() { - if ( title == null ) { + if (title == null) { title = new Title(); } return title; @@ -117,42 +117,42 @@ public boolean isStartOnTick() { return startOnTick; } - public Axis setMax( double max ) { + public Axis setMax(double max) { this.max = max; return this; } - public Axis setMaxZoom( int maxZoom ) { + public Axis setMaxZoom(int maxZoom) { this.maxZoom = maxZoom; return this; } - public Axis setMin( double min ) { + public Axis setMin(double min) { this.min = min; return this; } - public Axis setPlotLines( JsonArray plotLines ) { + public Axis setPlotLines(JsonArray plotLines) { this.plotLines = plotLines; return this; } - public Axis setShowFirstLabel( boolean showFirstLabel ) { + public Axis setShowFirstLabel(boolean showFirstLabel) { this.showFirstLabel = showFirstLabel; return this; } - public Axis setStartOnTick( boolean startOnTick ) { + public Axis setStartOnTick(boolean startOnTick) { this.startOnTick = startOnTick; return this; } - public Axis setTickInterval( double tickInterval ) { + public Axis setTickInterval(double tickInterval) { this.tickInterval = tickInterval; return this; } - public Axis setType( String type ) { + public Axis setType(String type) { this.type = type; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/Chart.java b/src/main/java/nl/pvanassen/highchart/api/Chart.java index bb2031f..896dd9c 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Chart.java +++ b/src/main/java/nl/pvanassen/highchart/api/Chart.java @@ -4,9 +4,10 @@ import nl.pvanassen.highchart.api.shared.SeriesType; public class Chart extends BaseObject { - private String zoomType; - private String backgroundColor; + private String zoomType; + + private String backgroundColor; private Integer marginRight; @@ -16,7 +17,7 @@ public class Chart extends BaseObject { private Integer height; - private String defaultSeriesType; + private String defaultSeriesType; private Integer marginLeft; @@ -58,47 +59,47 @@ public String getZoomType() { return zoomType; } - public Chart setBackgroundColor( String backgroundColor ) { + public Chart setBackgroundColor(String backgroundColor) { this.backgroundColor = backgroundColor; return this; } - public Chart setDefaultSeriesType( SeriesType type ) { + public Chart setDefaultSeriesType(SeriesType type) { defaultSeriesType = type.name().toLowerCase(); return this; } - public Chart setHeight( int height ) { + public Chart setHeight(int height) { this.height = height; return this; } - public Chart setMarginBottom( int marginBottom ) { + public Chart setMarginBottom(int marginBottom) { this.marginBottom = marginBottom; return this; } - public Chart setMarginLeft( int marginLeft ) { + public Chart setMarginLeft(int marginLeft) { this.marginLeft = marginLeft; return this; } - public Chart setMarginRight( int marginRight ) { + public Chart setMarginRight(int marginRight) { this.marginRight = marginRight; return this; } - public Chart setMarginTop( int marginTop ) { + public Chart setMarginTop(int marginTop) { this.marginTop = marginTop; return this; } - public Chart setWidth( int width ) { + public Chart setWidth(int width) { this.width = width; return this; } - public Chart setZoomType( String zoomType ) { + public Chart setZoomType(String zoomType) { this.zoomType = zoomType; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/ChartOptions.java b/src/main/java/nl/pvanassen/highchart/api/ChartOptions.java index c3766be..0616cce 100644 --- a/src/main/java/nl/pvanassen/highchart/api/ChartOptions.java +++ b/src/main/java/nl/pvanassen/highchart/api/ChartOptions.java @@ -5,74 +5,74 @@ import nl.pvanassen.highchart.api.base.BaseObject; import nl.pvanassen.highchart.api.utils.JsonArray; -@XmlRootElement( name = "chartOptions" ) -@XmlAccessorType( XmlAccessType.NONE ) +@XmlRootElement(name = "chartOptions") +@XmlAccessorType(XmlAccessType.NONE) public class ChartOptions extends BaseObject { @XmlTransient - private Chart chart; + private Chart chart; @XmlElement - private Credits credits; + private Credits credits; @XmlElement - private Labels labels; + private Labels labels; @XmlElement - private Legend legend; + private Legend legend; @XmlElement - private PlotOptions plotOptions; + private PlotOptions plotOptions; // @XmlTransient - @XmlElements( @XmlElement( name = "series", type = Series.class ) ) + @XmlElements(@XmlElement(name = "series", type = Series.class)) private JsonArray series; @XmlElement - private Title title; + private Title title; @XmlElement - private Title subtitle; + private Title subtitle; @XmlElement - private Tooltip tooltip; + private Tooltip tooltip; @XmlElement - private Axis xAxis; + private Axis xAxis; @XmlElement - private Axis yAxis; + private Axis yAxis; public Chart getChart() { - if ( chart == null ) { + if (chart == null) { chart = new Chart(); } return chart; } public Credits getCredits() { - if ( credits == null ) { + if (credits == null) { credits = new Credits(); } return credits; } public Labels getLabels() { - if ( labels == null ) { + if (labels == null) { labels = new Labels(); } return labels; } public Legend getLegend() { - if ( legend == null ) { + if (legend == null) { legend = new Legend(); } return legend; } public PlotOptions getPlotOptions() { - if ( plotOptions == null ) { + if (plotOptions == null) { plotOptions = new PlotOptions(); } return plotOptions; @@ -80,42 +80,42 @@ public PlotOptions getPlotOptions() { @XmlTransient public JsonArray getSeries() { - if ( series == null ) { + if (series == null) { series = new JsonArray(); } return series; } public Title getSubtitle() { - if ( subtitle == null ) { + if (subtitle == null) { subtitle = new Title(); } return subtitle; } public Title getTitle() { - if ( title == null ) { + if (title == null) { title = new Title(); } return title; } public Tooltip getTooltip() { - if ( tooltip == null ) { + if (tooltip == null) { tooltip = new Tooltip(); } return tooltip; } public Axis getXAxis() { - if ( xAxis == null ) { + if (xAxis == null) { xAxis = new Axis(); } return xAxis; } public Axis getYAxis() { - if ( yAxis == null ) { + if (yAxis == null) { yAxis = new Axis(); } return yAxis; diff --git a/src/main/java/nl/pvanassen/highchart/api/Credits.java b/src/main/java/nl/pvanassen/highchart/api/Credits.java index 4039936..33029ce 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Credits.java +++ b/src/main/java/nl/pvanassen/highchart/api/Credits.java @@ -10,7 +10,7 @@ public boolean istEnabled() { return enabled; } - public Credits setEnabled( boolean enabled ) { + public Credits setEnabled(boolean enabled) { this.enabled = enabled; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/HighchartsFactory.java b/src/main/java/nl/pvanassen/highchart/api/HighchartsFactory.java index a8def01..f7a120a 100644 --- a/src/main/java/nl/pvanassen/highchart/api/HighchartsFactory.java +++ b/src/main/java/nl/pvanassen/highchart/api/HighchartsFactory.java @@ -1,6 +1,5 @@ package nl.pvanassen.highchart.api; - public class HighchartsFactory { public HighchartsFactory() { diff --git a/src/main/java/nl/pvanassen/highchart/api/Labels.java b/src/main/java/nl/pvanassen/highchart/api/Labels.java index b4c811f..cd90746 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Labels.java +++ b/src/main/java/nl/pvanassen/highchart/api/Labels.java @@ -6,8 +6,8 @@ import nl.pvanassen.highchart.api.label.LabelsItems; import nl.pvanassen.highchart.api.utils.JsonArray; -@XmlAccessorType( XmlAccessType.NONE ) -@XmlType( namespace = "chart-options" ) +@XmlAccessorType(XmlAccessType.NONE) +@XmlType(namespace = "chart-options") public class Labels extends BaseObject { @XmlTransient @@ -18,7 +18,7 @@ public Labels() { @XmlTransient public JsonArray getItems() { - if ( items == null ) { + if (items == null) { items = new JsonArray(); } diff --git a/src/main/java/nl/pvanassen/highchart/api/Legend.java b/src/main/java/nl/pvanassen/highchart/api/Legend.java index 8b29a50..241c3bb 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Legend.java +++ b/src/main/java/nl/pvanassen/highchart/api/Legend.java @@ -6,18 +6,18 @@ import nl.pvanassen.highchart.api.base.BaseObject; -@XmlAccessorType( XmlAccessType.NONE ) +@XmlAccessorType(XmlAccessType.NONE) public class Legend extends BaseObject { private Boolean reversed; private Boolean enabled; - private String align; + private String align; - private String layout; + private String layout; - private String verticalAlign; + private String verticalAlign; @XmlElement private Integer x; @@ -54,39 +54,39 @@ public boolean isReversed() { } @XmlElement - public Legend setAlign( String align ) { + public Legend setAlign(String align) { this.align = align; return this; } - public Legend setEnabled( boolean enabled ) { + public Legend setEnabled(boolean enabled) { this.enabled = enabled; return this; } @XmlElement - public Legend setLayout( String layout ) { + public Legend setLayout(String layout) { this.layout = layout; return this; } - public Legend setReversed( boolean reversed ) { + public Legend setReversed(boolean reversed) { this.reversed = reversed; return this; } @XmlElement - public Legend setVerticalAlign( String verticalAlign ) { + public Legend setVerticalAlign(String verticalAlign) { this.verticalAlign = verticalAlign; return this; } - public Legend setX( int x ) { + public Legend setX(int x) { this.x = x; return this; } - public Legend setY( int y ) { + public Legend setY(int y) { this.y = y; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/PlotOptions.java b/src/main/java/nl/pvanassen/highchart/api/PlotOptions.java index 6ac2d1f..ba78c55 100644 --- a/src/main/java/nl/pvanassen/highchart/api/PlotOptions.java +++ b/src/main/java/nl/pvanassen/highchart/api/PlotOptions.java @@ -7,17 +7,24 @@ import nl.pvanassen.highchart.api.base.BaseObject; import nl.pvanassen.highchart.api.plotoption.PlotOptionsSeries; -@XmlAccessorType( XmlAccessType.NONE ) +@XmlAccessorType(XmlAccessType.NONE) public class PlotOptions extends BaseObject { @XmlElement private PlotOptionsSeries area; + private PlotOptionsSeries areaspline; + private PlotOptionsSeries line; + private PlotOptionsSeries pie; + private PlotOptionsSeries series; + private PlotOptionsSeries spline; + private PlotOptionsSeries column; + private PlotOptionsSeries bar; public PlotOptions() { diff --git a/src/main/java/nl/pvanassen/highchart/api/Point.java b/src/main/java/nl/pvanassen/highchart/api/Point.java index 17d8d71..c95aea2 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Point.java +++ b/src/main/java/nl/pvanassen/highchart/api/Point.java @@ -6,7 +6,7 @@ import nl.pvanassen.highchart.api.base.BaseObject; -@XmlAccessorType( XmlAccessType.NONE ) +@XmlAccessorType(XmlAccessType.NONE) public class Point extends BaseObject { @XmlElement @@ -17,9 +17,9 @@ public class Point extends BaseObject { private Boolean selected, sliced; - private String color; + private String color; - private String name; + private String name; public Point() { } @@ -48,32 +48,32 @@ public boolean isSliced() { return sliced; } - public Point setColor( String color ) { + public Point setColor(String color) { this.color = color; return this; } - public Point setName( String name ) { + public Point setName(String name) { this.name = name; return this; } - public Point setSelected( boolean selected ) { + public Point setSelected(boolean selected) { this.selected = selected; return this; } - public Point setSliced( boolean sliced ) { + public Point setSliced(boolean sliced) { this.sliced = sliced; return this; } - public Point setX( double x ) { + public Point setX(double x) { this.x = x; return this; } - public Point setY( double y ) { + public Point setY(double y) { this.y = y; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/Series.java b/src/main/java/nl/pvanassen/highchart/api/Series.java index b28fbf5..1faf9a6 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Series.java +++ b/src/main/java/nl/pvanassen/highchart/api/Series.java @@ -7,48 +7,48 @@ import nl.pvanassen.highchart.api.serie.SeriesCenter; import nl.pvanassen.highchart.api.utils.JsonArray; -@XmlAccessorType( XmlAccessType.NONE ) -@XmlType( namespace = "chartoptions" ) +@XmlAccessorType(XmlAccessType.NONE) +@XmlType(namespace = "chartoptions") public class Series extends BaseObject { - @XmlElement( type = PlotMarkerStates.class ) + @XmlElement(type = PlotMarkerStates.class) private PlotMarkerStates states; - @XmlElements( @XmlElement( name = "data", type = Point.class ) ) - private Object data; + @XmlElements(@XmlElement(name = "data", type = Point.class)) + private Object data; @XmlElement - private String color; + private String color; @XmlElement - private String name; + private String name; @XmlElement - private String type; + private String type; @XmlElement - private String size; + private String size; - private SeriesCenter center; + private SeriesCenter center; public String getCenterX() { - return ( center != null ) ? center.getX() : null; + return center != null ? center.getX() : null; } public String getCenterY() { - return ( center != null ) ? center.getY() : null; + return center != null ? center.getY() : null; } public String getColor() { return color; } - @SuppressWarnings( "unchecked" ) + @SuppressWarnings("unchecked") public JsonArray getData() { - if ( data == null ) { + if (data == null) { data = new JsonArray(); } - return ( JsonArray ) data; + return (JsonArray) data; } public String getName() { @@ -60,7 +60,7 @@ public String getSize() { } public PlotMarkerStates getStates() { - if ( states == null ) { + if (states == null) { states = new PlotMarkerStates(); } return states; @@ -70,42 +70,42 @@ public String getType() { return type; } - public Series setCenter( String x, String y ) { - if ( center == null ) { + public Series setCenter(String x, String y) { + if (center == null) { center = new SeriesCenter(); } - center.setX( x ); - center.setY( y ); + center.setX(x); + center.setY(y); return this; } - public Series setColor( String color ) { + public Series setColor(String color) { this.color = color; return this; } @XmlTransient - public Series setData( JsonArray data ) { + public Series setData(JsonArray data) { this.data = data; return this; } - public Series setName( String name ) { + public Series setName(String name) { this.name = name; return this; } - public Series setSize( String size ) { + public Series setSize(String size) { this.size = size; return this; } - public Series setStates( PlotMarkerStates states ) { + public Series setStates(PlotMarkerStates states) { this.states = states; return this; } - public Series setType( String type ) { + public Series setType(String type) { this.type = type; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/Title.java b/src/main/java/nl/pvanassen/highchart/api/Title.java index 1706839..40b8aa0 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Title.java +++ b/src/main/java/nl/pvanassen/highchart/api/Title.java @@ -7,13 +7,13 @@ import nl.pvanassen.highchart.api.base.BaseObject; import nl.pvanassen.highchart.api.base.Style; -@XmlAccessorType( XmlAccessType.NONE ) +@XmlAccessorType(XmlAccessType.NONE) public class Title extends BaseObject { @XmlElement - private String text; + private String text; - private Style style; + private Style style; @XmlElement private Integer margin; @@ -28,7 +28,7 @@ public int getMargin() { } public Style getStyle() { - if ( style == null ) { + if (style == null) { style = new Style(); } return style; @@ -38,12 +38,12 @@ public String getText() { return text; } - public Title setMargin( int margin ) { + public Title setMargin(int margin) { this.margin = margin; return this; } - public Title setText( String text ) { + public Title setText(String text) { this.text = text; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/Tooltip.java b/src/main/java/nl/pvanassen/highchart/api/Tooltip.java index 89fc3c2..e9f50af 100644 --- a/src/main/java/nl/pvanassen/highchart/api/Tooltip.java +++ b/src/main/java/nl/pvanassen/highchart/api/Tooltip.java @@ -6,7 +6,7 @@ import nl.pvanassen.highchart.api.base.BaseObject; -@XmlAccessorType( XmlAccessType.NONE ) +@XmlAccessorType(XmlAccessType.NONE) public class Tooltip extends BaseObject { @XmlElement @@ -23,12 +23,12 @@ public boolean isShared() { return shared; } - public Tooltip setCrosshairs( boolean b ) { + public Tooltip setCrosshairs(boolean b) { crosshairs = b; return this; } - public Tooltip setShared( boolean shared ) { + public Tooltip setShared(boolean shared) { this.shared = shared; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/axis/AxisLabels.java b/src/main/java/nl/pvanassen/highchart/api/axis/AxisLabels.java index cecec38..e47876e 100644 --- a/src/main/java/nl/pvanassen/highchart/api/axis/AxisLabels.java +++ b/src/main/java/nl/pvanassen/highchart/api/axis/AxisLabels.java @@ -4,8 +4,8 @@ import nl.pvanassen.highchart.api.base.BaseObject; -@XmlAccessorType( XmlAccessType.NONE ) -@XmlType( namespace = "axis" ) +@XmlAccessorType(XmlAccessType.NONE) +@XmlType(namespace = "axis") public class AxisLabels extends BaseObject { @XmlElement @@ -22,12 +22,12 @@ public Double getRotation() { return rotation; } - public AxisLabels setAlign( String align ) { + public AxisLabels setAlign(String align) { this.align = align; return this; } - public AxisLabels setRotation( double rotation ) { + public AxisLabels setRotation(double rotation) { this.rotation = rotation; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/axis/AxisPlotLineLabel.java b/src/main/java/nl/pvanassen/highchart/api/axis/AxisPlotLineLabel.java index b5f16a4..ca2dc6c 100644 --- a/src/main/java/nl/pvanassen/highchart/api/axis/AxisPlotLineLabel.java +++ b/src/main/java/nl/pvanassen/highchart/api/axis/AxisPlotLineLabel.java @@ -19,7 +19,7 @@ public class AxisPlotLineLabel extends BaseObject { private double y; - private Style style; + private Style style; public AxisPlotLineLabel() { style = new Style(); @@ -57,42 +57,42 @@ public double getY() { return y; } - public AxisPlotLineLabel setAlign( String align ) { + public AxisPlotLineLabel setAlign(String align) { this.align = align; return this; } - public AxisPlotLineLabel setRotation( double rotation ) { + public AxisPlotLineLabel setRotation(double rotation) { this.rotation = rotation; return this; } - public AxisPlotLineLabel setStyle( Style style ) { + public AxisPlotLineLabel setStyle(Style style) { this.style = style; return this; } - public AxisPlotLineLabel setText( String text ) { + public AxisPlotLineLabel setText(String text) { this.text = text; return this; } - public AxisPlotLineLabel setTextAlign( String textAlign ) { + public AxisPlotLineLabel setTextAlign(String textAlign) { this.textAlign = textAlign; return this; } - public AxisPlotLineLabel setVerticalAlign( String verticalAlign ) { + public AxisPlotLineLabel setVerticalAlign(String verticalAlign) { this.verticalAlign = verticalAlign; return this; } - public AxisPlotLineLabel setX( double x ) { + public AxisPlotLineLabel setX(double x) { this.x = x; return this; } - public AxisPlotLineLabel setY( double y ) { + public AxisPlotLineLabel setY(double y) { this.y = y; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/axis/AxisPlotLines.java b/src/main/java/nl/pvanassen/highchart/api/axis/AxisPlotLines.java index b6bc507..1e4abb1 100644 --- a/src/main/java/nl/pvanassen/highchart/api/axis/AxisPlotLines.java +++ b/src/main/java/nl/pvanassen/highchart/api/axis/AxisPlotLines.java @@ -4,17 +4,17 @@ public class AxisPlotLines extends BaseObject { - private int zindex; + private int zindex; - private int width; + private int width; - private double value; + private double value; - private String id; + private String id; - private String color; + private String color; - private String dashStyle; + private String dashStyle; private AxisPlotLineLabel label; @@ -50,37 +50,37 @@ public int getZIndex() { return zindex; } - public AxisPlotLines setColor( String color ) { + public AxisPlotLines setColor(String color) { this.color = color; return this; } - public AxisPlotLines setDashStyle( String dashStyle ) { + public AxisPlotLines setDashStyle(String dashStyle) { this.dashStyle = dashStyle; return this; } - public AxisPlotLines setId( String id ) { + public AxisPlotLines setId(String id) { this.id = id; return this; } - public AxisPlotLines setLabel( AxisPlotLineLabel label ) { + public AxisPlotLines setLabel(AxisPlotLineLabel label) { this.label = label; return this; } - public AxisPlotLines setValue( double value ) { + public AxisPlotLines setValue(double value) { this.value = value; return this; } - public AxisPlotLines setWidth( int width ) { + public AxisPlotLines setWidth(int width) { this.width = width; return this; } - public AxisPlotLines setZIndex( int zindex ) { + public AxisPlotLines setZIndex(int zindex) { this.zindex = zindex; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/base/BaseObject.java b/src/main/java/nl/pvanassen/highchart/api/base/BaseObject.java index 9f0599c..ed4bb9f 100644 --- a/src/main/java/nl/pvanassen/highchart/api/base/BaseObject.java +++ b/src/main/java/nl/pvanassen/highchart/api/base/BaseObject.java @@ -5,15 +5,16 @@ import nl.pvanassen.highchart.api.shared.Jsonify; -@XmlAccessorType( XmlAccessType.NONE ) +@XmlAccessorType(XmlAccessType.NONE) public class BaseObject implements Jsonify { + public BaseObject() { super(); } @Override public String toJson() { - return GsonHelper.toJson( this ); + return GsonHelper.toJson(this); } } \ No newline at end of file diff --git a/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java b/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java index e299a47..99ef2a7 100644 --- a/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java +++ b/src/main/java/nl/pvanassen/highchart/api/base/GsonHelper.java @@ -18,35 +18,36 @@ public final class GsonHelper { private static final GsonHelper INSTANCE = new GsonHelper(); static String toJson(Object object) { - return INSTANCE.gsonBuilder.create().toJson(object); + return GsonHelper.INSTANCE.gsonBuilder.create().toJson(object); } private final GsonBuilder gsonBuilder; private GsonHelper() { gsonBuilder = new GsonBuilder() - .registerTypeAdapter(DateTimeLabelFormats.class, new DateTimeLabelFormatsSerializer()) // - .registerTypeAdapter(Style.class, new StyleSerializer())// - .setDateFormat(DATE_FORMAT)// - .setExclusionStrategies(new ExclusionStrategy() { + .registerTypeAdapter(DateTimeLabelFormats.class, new DateTimeLabelFormatsSerializer()) // + .registerTypeAdapter(Style.class, new StyleSerializer())// + .setDateFormat(GsonHelper.DATE_FORMAT)// + .setExclusionStrategies(new ExclusionStrategy() { - @Override - public boolean shouldSkipClass(Class arg0) { - return false; - } + @Override + public boolean shouldSkipClass(Class arg0) { + return false; + } - @Override - public boolean shouldSkipField(FieldAttributes attributes) { - return attributes.getName().equals(USER_OBJECT); - } + @Override + public boolean shouldSkipField(FieldAttributes attributes) { + return attributes.getName().equals(GsonHelper.USER_OBJECT); + } + + }).registerTypeAdapter(Double.class, new JsonSerializer() { - }).registerTypeAdapter(Double.class, new JsonSerializer() { @Override - public JsonElement serialize(Double originalValue, Type typeOf, JsonSerializationContext context) { - BigDecimal bigValue = BigDecimal.valueOf(originalValue); + public JsonElement serialize(Double originalValue, Type typeOf, JsonSerializationContext context) { + BigDecimal bigValue = BigDecimal.valueOf(originalValue); - return new JsonPrimitive(bigValue.toPlainString()); - } - }); + return new JsonPrimitive(bigValue.toPlainString()); + } + }); } } diff --git a/src/main/java/nl/pvanassen/highchart/api/base/Style.java b/src/main/java/nl/pvanassen/highchart/api/base/Style.java index b6919a1..5c71e03 100644 --- a/src/main/java/nl/pvanassen/highchart/api/base/Style.java +++ b/src/main/java/nl/pvanassen/highchart/api/base/Style.java @@ -15,15 +15,15 @@ public Map getProperties() { return properties; } - public String getProperty( String property ) { - return ( properties != null ) ? properties.get( property ) : null; + public String getProperty(String property) { + return properties != null ? properties.get(property) : null; } - public Style setProperty( String property, String value ) { - if ( properties == null ) { + public Style setProperty(String property, String value) { + if (properties == null) { properties = new HashMap(); } - properties.put( property, value ); + properties.put(property, value); return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/export/Renderer.java b/src/main/java/nl/pvanassen/highchart/api/export/Renderer.java index 6a3de29..2b43023 100644 --- a/src/main/java/nl/pvanassen/highchart/api/export/Renderer.java +++ b/src/main/java/nl/pvanassen/highchart/api/export/Renderer.java @@ -6,7 +6,7 @@ public interface Renderer { public static abstract class PojoRenderer implements Renderer { - private T options, globalOptions; + private T options, globalOptions; private OutputStream output; @@ -23,19 +23,19 @@ protected OutputStream getOutputStream() { } @Override - public Renderer setChartOptions( T options ) { + public Renderer setChartOptions(T options) { this.options = options; return this; } @Override - public Renderer setGlobalOptions( T options ) { + public Renderer setGlobalOptions(T options) { this.globalOptions = options; return this; } @Override - public Renderer setOutputStream( OutputStream output ) { + public Renderer setOutputStream(OutputStream output) { this.output = output; return this; } @@ -44,10 +44,10 @@ public Renderer setOutputStream( OutputStream output ) { void render(); - Renderer setChartOptions( T options ); + Renderer setChartOptions(T options); - Renderer setGlobalOptions( T options ); + Renderer setGlobalOptions(T options); - Renderer setOutputStream( OutputStream outputStream ); + Renderer setOutputStream(OutputStream outputStream); } \ No newline at end of file diff --git a/src/main/java/nl/pvanassen/highchart/api/format/DateTimeLabelFormats.java b/src/main/java/nl/pvanassen/highchart/api/format/DateTimeLabelFormats.java index 5a7cc55..9f81649 100644 --- a/src/main/java/nl/pvanassen/highchart/api/format/DateTimeLabelFormats.java +++ b/src/main/java/nl/pvanassen/highchart/api/format/DateTimeLabelFormats.java @@ -6,6 +6,7 @@ import nl.pvanassen.highchart.api.base.BaseObject; public class DateTimeLabelFormats extends BaseObject { + public enum TimeUnit { SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, YEAR; } @@ -16,19 +17,19 @@ public DateTimeLabelFormats() { formats = null; } - public String getFormat( TimeUnit unit ) { - return ( formats != null ) ? formats.get( unit ) : null; + public String getFormat(TimeUnit unit) { + return formats != null ? formats.get(unit) : null; } public Map getFormats() { return formats; } - public DateTimeLabelFormats set( TimeUnit unit, String format ) { - if ( formats == null ) { + public DateTimeLabelFormats set(TimeUnit unit, String format) { + if (formats == null) { formats = new HashMap(); } - formats.put( unit, format ); + formats.put(unit, format); return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/label/LabelsItems.java b/src/main/java/nl/pvanassen/highchart/api/label/LabelsItems.java index b20fa94..68848e8 100644 --- a/src/main/java/nl/pvanassen/highchart/api/label/LabelsItems.java +++ b/src/main/java/nl/pvanassen/highchart/api/label/LabelsItems.java @@ -6,21 +6,21 @@ import nl.pvanassen.highchart.api.base.Style; -@XmlAccessorType( XmlAccessType.NONE ) -@XmlType( namespace = "labels" ) +@XmlAccessorType(XmlAccessType.NONE) +@XmlType(namespace = "labels") public class LabelsItems { private String html; - private Style style; + private final Style style; public LabelsItems() { style = new Style(); } - public LabelsItems center( int centerPosition, double top ) { - getStyle().setProperty( "left", ( centerPosition - ( ( getHtml().length() * 6 ) / 2 ) ) + "px" ); - getStyle().setProperty( "top", top + "px" ); + public LabelsItems center(int centerPosition, double top) { + getStyle().setProperty("left", centerPosition - getHtml().length() * 6 / 2 + "px"); + getStyle().setProperty("top", top + "px"); return this; } @@ -32,7 +32,7 @@ public Style getStyle() { return style; } - public LabelsItems setHtml( String html ) { + public LabelsItems setHtml(String html) { this.html = html; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java index 8978e41..73ed913 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotColor.java @@ -5,24 +5,27 @@ import java.util.List; public class PlotColor { + private PlotGradient linearGradient; + private List stops; - + public PlotGradient getLinearGradient() { if (linearGradient == null) { linearGradient = new PlotGradient(); } return linearGradient; } - + public void addPlotStop(int stop, Color color) { if (stops == null) { stops = new LinkedList(); } Object[] objs = new Object[2]; objs[0] = stops.size(); - objs[1] = Integer.toHexString(color.getRGB());; + objs[1] = Integer.toHexString(color.getRGB()); + ; stops.add(objs); } - + } diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java index de40b0c..c3a30c7 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotGradient.java @@ -1,10 +1,13 @@ package nl.pvanassen.highchart.api.plotoption; - public class PlotGradient { + private int x1; + private int y1; + private int x2; + private int y2; public int getX1() { diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerHover.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerHover.java index f0e3b01..1b0aba1 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerHover.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerHover.java @@ -10,7 +10,7 @@ public boolean isEnabled() { return enabled; } - public PlotMarkerHover setEnabled( boolean enabled ) { + public PlotMarkerHover setEnabled(boolean enabled) { this.enabled = enabled; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerSelect.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerSelect.java index 81be405..4c7a6ab 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerSelect.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerSelect.java @@ -6,7 +6,7 @@ public class PlotMarkerSelect extends BaseObject { private String fillColor, lineColor; - private int lineWidth; + private int lineWidth; public String getFillColor() { return fillColor; @@ -20,17 +20,17 @@ public int getLineWidth() { return lineWidth; } - public PlotMarkerSelect setFillColor( String fillColor ) { + public PlotMarkerSelect setFillColor(String fillColor) { this.fillColor = fillColor; return this; } - public PlotMarkerSelect setLineColor( String lineColor ) { + public PlotMarkerSelect setLineColor(String lineColor) { this.lineColor = lineColor; return this; } - public PlotMarkerSelect setLineWidth( int lineWidth ) { + public PlotMarkerSelect setLineWidth(int lineWidth) { this.lineWidth = lineWidth; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerStates.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerStates.java index de9680d..ef6f8b5 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerStates.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotMarkerStates.java @@ -4,9 +4,9 @@ public class PlotMarkerStates extends BaseObject { - private PlotMarkerSelect select; + private final PlotMarkerSelect select; - private PlotMarkerHover hover; + private final PlotMarkerHover hover; public PlotMarkerStates() { select = new PlotMarkerSelect(); diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsDataLabels.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsDataLabels.java index 0ac7d20..751169c 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsDataLabels.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsDataLabels.java @@ -4,17 +4,17 @@ public class PlotOptionsDataLabels extends BaseObject { - private String color; + private String color; private boolean enabled; - private Object formatter; + private Object formatter; private Integer x, y, distance; - private String align = "center"; + private String align = "center"; - private double rotation; + private double rotation; public String getAlign() { return align; @@ -48,42 +48,42 @@ public boolean isEnabled() { return enabled; } - public PlotOptionsDataLabels setAlign( String align ) { + public PlotOptionsDataLabels setAlign(String align) { this.align = align; return this; } - public PlotOptionsDataLabels setColor( String color ) { + public PlotOptionsDataLabels setColor(String color) { this.color = color; return this; } - public PlotOptionsDataLabels setDistance( int distance ) { + public PlotOptionsDataLabels setDistance(int distance) { this.distance = distance; return this; } - public PlotOptionsDataLabels setEnabled( boolean enabled ) { + public PlotOptionsDataLabels setEnabled(boolean enabled) { this.enabled = enabled; return this; } - public PlotOptionsDataLabels setFormatter( Object formatter ) { + public PlotOptionsDataLabels setFormatter(Object formatter) { this.formatter = formatter; return this; } - public PlotOptionsDataLabels setRotation( double rotation ) { + public PlotOptionsDataLabels setRotation(double rotation) { this.rotation = rotation; return this; } - public PlotOptionsDataLabels setX( int x ) { + public PlotOptionsDataLabels setX(int x) { this.x = x; return this; } - public PlotOptionsDataLabels setY( int y ) { + public PlotOptionsDataLabels setY(int y) { this.y = y; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsMarker.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsMarker.java index 50bac8f..e5bb639 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsMarker.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsMarker.java @@ -4,9 +4,9 @@ public class PlotOptionsMarker extends BaseObject { - private String symbol; + private String symbol; - private boolean enabled; + private boolean enabled; private PlotMarkerStates states; @@ -14,7 +14,7 @@ public PlotOptionsMarker() { } public PlotMarkerStates getStates() { - if ( states == null ) { + if (states == null) { states = new PlotMarkerStates(); } return states; @@ -28,12 +28,12 @@ public boolean isEnabled() { return enabled; } - public PlotOptionsMarker setEnabled( boolean enabled ) { + public PlotOptionsMarker setEnabled(boolean enabled) { this.enabled = enabled; return this; } - public PlotOptionsMarker setSymbol( String symbol ) { + public PlotOptionsMarker setSymbol(String symbol) { this.symbol = symbol; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java index a8f3210..0164bf4 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsSeries.java @@ -30,7 +30,7 @@ public class PlotOptionsSeries extends BaseObject { private Double fillOpacity; private Integer borderWidth; - + @XmlElement private PlotColor fillColor; @@ -114,12 +114,12 @@ public PlotOptionsSeries setStates(PlotOptionsStates states) { this.states = states; return this; } - + public PlotColor getFillColor() { if (fillColor == null) { - fillColor = new PlotColor(); + fillColor = new PlotColor(); } return fillColor; } - + } \ No newline at end of file diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsStates.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsStates.java index 9d7fe15..4792349 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsStates.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotOptionsStates.java @@ -6,11 +6,11 @@ public class PlotOptionsStates extends BaseObject { - @XmlElement( type = PlotStatesSelect.class ) + @XmlElement(type = PlotStatesSelect.class) private PlotStatesSelect select; public PlotStatesSelect getSelect() { - if ( select == null ) { + if (select == null) { select = new PlotStatesSelect(); } return select; diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStatesSelect.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStatesSelect.java index cc24e61..aa1434e 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStatesSelect.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStatesSelect.java @@ -6,11 +6,12 @@ import nl.pvanassen.highchart.api.base.BaseObject; -@XmlAccessorType( XmlAccessType.NONE ) +@XmlAccessorType(XmlAccessType.NONE) public class PlotStatesSelect extends BaseObject { - private String color; - private String borderColor; + private String color; + + private String borderColor; @XmlElement private Integer borderWidth; @@ -27,17 +28,17 @@ public String getColor() { return color; } - public PlotStatesSelect setBorderColor( String borderColor ) { + public PlotStatesSelect setBorderColor(String borderColor) { this.borderColor = borderColor; return this; } - public PlotStatesSelect setBorderWidth( int borderWidth ) { + public PlotStatesSelect setBorderWidth(int borderWidth) { this.borderWidth = borderWidth; return this; } - public PlotStatesSelect setColor( String color ) { + public PlotStatesSelect setColor(String color) { this.color = color; return this; } diff --git a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStop.java b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStop.java index e00468f..451b272 100644 --- a/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStop.java +++ b/src/main/java/nl/pvanassen/highchart/api/plotoption/PlotStop.java @@ -3,7 +3,9 @@ import java.awt.Color; public class PlotStop { + private final int pos; + private final Color color; PlotStop(int pos, Color color) { diff --git a/src/main/java/nl/pvanassen/highchart/api/serializer/CenterSerializer.java b/src/main/java/nl/pvanassen/highchart/api/serializer/CenterSerializer.java index 464b40b..34488f7 100644 --- a/src/main/java/nl/pvanassen/highchart/api/serializer/CenterSerializer.java +++ b/src/main/java/nl/pvanassen/highchart/api/serializer/CenterSerializer.java @@ -9,13 +9,13 @@ public class CenterSerializer implements JsonSerializer { @Override - public JsonElement serialize( SeriesCenter center, Type arg1, JsonSerializationContext arg2 ) { - if ( ( center.getX() == null ) || ( center.getY() == null ) ) { - return new JsonPrimitive( "" ); + public JsonElement serialize(SeriesCenter center, Type arg1, JsonSerializationContext arg2) { + if (center.getX() == null || center.getY() == null) { + return new JsonPrimitive(""); } JsonArray r = new JsonArray(); - r.add( new JsonPrimitive( center.getX() ) ); - r.add( new JsonPrimitive( center.getY() ) ); + r.add(new JsonPrimitive(center.getX())); + r.add(new JsonPrimitive(center.getY())); return r; } diff --git a/src/main/java/nl/pvanassen/highchart/api/serializer/DateTimeLabelFormatsSerializer.java b/src/main/java/nl/pvanassen/highchart/api/serializer/DateTimeLabelFormatsSerializer.java index da1aabe..9c48c50 100644 --- a/src/main/java/nl/pvanassen/highchart/api/serializer/DateTimeLabelFormatsSerializer.java +++ b/src/main/java/nl/pvanassen/highchart/api/serializer/DateTimeLabelFormatsSerializer.java @@ -10,11 +10,11 @@ public class DateTimeLabelFormatsSerializer extends Serializer { @Override - public Map getProperties( DateTimeLabelFormats instance ) { + public Map getProperties(DateTimeLabelFormats instance) { Map map = instance.getFormats(); Map r = new HashMap(); - for ( Entry e : map.entrySet() ) { - r.put( e.getKey().name().toLowerCase(), e.getValue() ); + for (Entry e : map.entrySet()) { + r.put(e.getKey().name().toLowerCase(), e.getValue()); } return r; } diff --git a/src/main/java/nl/pvanassen/highchart/api/serializer/Serializer.java b/src/main/java/nl/pvanassen/highchart/api/serializer/Serializer.java index e44c156..85d3518 100644 --- a/src/main/java/nl/pvanassen/highchart/api/serializer/Serializer.java +++ b/src/main/java/nl/pvanassen/highchart/api/serializer/Serializer.java @@ -12,18 +12,18 @@ public Serializer() { super(); } - public abstract Map getProperties( K instance ); + public abstract Map getProperties(K instance); @Override - public JsonElement serialize( K instance, Type arg1, JsonSerializationContext arg2 ) { - Map map = getProperties( instance ); - if ( map == null ) { - return new JsonPrimitive( "" ); + public JsonElement serialize(K instance, Type arg1, JsonSerializationContext arg2) { + Map map = getProperties(instance); + if (map == null) { + return new JsonPrimitive(""); } JsonObject r = new JsonObject(); - for ( Entry e : map.entrySet() ) { - r.addProperty( e.getKey(), e.getValue() ); + for (Entry e : map.entrySet()) { + r.addProperty(e.getKey(), e.getValue()); } return r; diff --git a/src/main/java/nl/pvanassen/highchart/api/serializer/StyleSerializer.java b/src/main/java/nl/pvanassen/highchart/api/serializer/StyleSerializer.java index 1cf60f7..2c1ebc2 100644 --- a/src/main/java/nl/pvanassen/highchart/api/serializer/StyleSerializer.java +++ b/src/main/java/nl/pvanassen/highchart/api/serializer/StyleSerializer.java @@ -7,7 +7,7 @@ public class StyleSerializer extends Serializer