From 39376fe7a7539fa83b5cd2cce48026113998a777 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Fri, 27 Jul 2018 13:43:29 +0200 Subject: [PATCH 01/38] changed version to 3.2.0-SNAPSHOT --- README.md | 24 ++++++++++++++++++++++++ build.gradle | 2 +- showcase/build.gradle | 4 ++-- showcase/gradle.properties | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 29100dec..ece36f3c 100644 --- a/README.md +++ b/README.md @@ -209,3 +209,27 @@ Maven: ``` + +Latest snapshot release +----------------------- +Gradle: +```groovy +repositories { + jcenter() +} + +dependencies { + compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.2.0-SNAPSHOT' +} +``` + +Maven: +```xml + + de.adesso.wicked-charts + wicked-charts-wicket8 + 3.2.0-SNAPSHOT + pom + +``` + diff --git a/build.gradle b/build.gradle index 76394e70..7c3ae848 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ subprojects { } // run gradle with "-Dsnapshot=true" to automatically append "-SNAPSHOT" to the version - version = '3.1.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "") + version = '3.2.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "") sourceCompatibility = 1.8 ext { diff --git a/showcase/build.gradle b/showcase/build.gradle index 6c57891c..db9d77f3 100644 --- a/showcase/build.gradle +++ b/showcase/build.gradle @@ -35,7 +35,7 @@ dependencies { } // run gradle with "-Dsnapshot=true" to automatically append "-SNAPSHOT" to the version -version = '3.1.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "") +version = '3.2.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "") sourceCompatibility = 1.8 ext { @@ -98,7 +98,7 @@ publishing { } groupId 'de.adesso.wicked-charts' artifactId 'wicked-charts-showcase-options' - version '3.1.0' + version '3.2.0-SNAPSHOT' pom.withXml { def root = asNode() root.appendNode('description', 'Beautiful Charts for Java-based Web Applications') diff --git a/showcase/gradle.properties b/showcase/gradle.properties index 78be58da..05912116 100644 --- a/showcase/gradle.properties +++ b/showcase/gradle.properties @@ -1,4 +1,4 @@ spring_boot_version = 1.5.2.RELEASE springloaded_version = 1.2.5.RELEASE spring_version = 4.3.6.RELEASE -wicketcharts_version = 3.1.0 \ No newline at end of file +wicketcharts_version = 3.2.0-SNAPSHOT \ No newline at end of file From 3c63b3927a45939c90c303364ab219a318d7b243 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Fri, 27 Jul 2018 14:22:57 +0200 Subject: [PATCH 02/38] adjusted showcase snapshot dependancy --- README.md | 2 +- showcase/build.gradle | 3 ++- showcase/wicked-charts-showcase-wicket14/build.gradle | 3 ++- showcase/wicked-charts-showcase-wicket15/build.gradle | 3 ++- showcase/wicked-charts-showcase-wicket6/build.gradle | 3 ++- showcase/wicked-charts-showcase-wicket7/build.gradle | 3 ++- showcase/wicked-charts-showcase-wicket8/build.gradle | 3 ++- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ece36f3c..5d4a7bda 100644 --- a/README.md +++ b/README.md @@ -215,7 +215,7 @@ Latest snapshot release Gradle: ```groovy repositories { - jcenter() + maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } } dependencies { diff --git a/showcase/build.gradle b/showcase/build.gradle index db9d77f3..6d1504db 100644 --- a/showcase/build.gradle +++ b/showcase/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - mavenLocal() + mavenLocal() jcenter() maven { url "https://plugins.gradle.org/m2/" @@ -23,6 +23,7 @@ repositories { mavenLocal() mavenCentral() jcenter() + maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } } processResources { diff --git a/showcase/wicked-charts-showcase-wicket14/build.gradle b/showcase/wicked-charts-showcase-wicket14/build.gradle index b32209ba..a97373c6 100644 --- a/showcase/wicked-charts-showcase-wicket14/build.gradle +++ b/showcase/wicked-charts-showcase-wicket14/build.gradle @@ -17,10 +17,11 @@ dependencies { buildscript { repositories { mavenLocal() - jcenter() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } + jcenter() } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" diff --git a/showcase/wicked-charts-showcase-wicket15/build.gradle b/showcase/wicked-charts-showcase-wicket15/build.gradle index 03eac9bf..99a9ee1b 100644 --- a/showcase/wicked-charts-showcase-wicket15/build.gradle +++ b/showcase/wicked-charts-showcase-wicket15/build.gradle @@ -18,10 +18,11 @@ dependencies { buildscript { repositories { mavenLocal() - jcenter() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } + jcenter() } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" diff --git a/showcase/wicked-charts-showcase-wicket6/build.gradle b/showcase/wicked-charts-showcase-wicket6/build.gradle index 68af7aca..68bbd5f4 100644 --- a/showcase/wicked-charts-showcase-wicket6/build.gradle +++ b/showcase/wicked-charts-showcase-wicket6/build.gradle @@ -19,10 +19,11 @@ dependencies { buildscript { repositories { mavenLocal() - jcenter() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } + jcenter() } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" diff --git a/showcase/wicked-charts-showcase-wicket7/build.gradle b/showcase/wicked-charts-showcase-wicket7/build.gradle index d326d3c1..8b3fbd87 100644 --- a/showcase/wicked-charts-showcase-wicket7/build.gradle +++ b/showcase/wicked-charts-showcase-wicket7/build.gradle @@ -18,10 +18,11 @@ dependencies { buildscript { repositories { mavenLocal() - jcenter() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } + jcenter() } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" diff --git a/showcase/wicked-charts-showcase-wicket8/build.gradle b/showcase/wicked-charts-showcase-wicket8/build.gradle index 251a4b40..69d57a2b 100644 --- a/showcase/wicked-charts-showcase-wicket8/build.gradle +++ b/showcase/wicked-charts-showcase-wicket8/build.gradle @@ -3,10 +3,11 @@ import org.apache.tools.ant.filters.ReplaceTokens buildscript { repositories { mavenLocal() - jcenter() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } + jcenter() } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" From 9856eb78188759624cf20f2aa13eccf8be2ff1d5 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Fri, 27 Jul 2018 14:53:41 +0200 Subject: [PATCH 03/38] ChartConfiguration now implements Serializable --- .../de/adesso/wickedcharts/chartjs/ChartConfiguration.java | 3 ++- .../showcase/configurations/base/ShowcaseConfiguration.java | 2 +- .../showcase/configurations/base/ShowcaseConfiguration.java | 4 ++-- .../showcase/configurations/base/ShowcaseConfiguration.java | 2 +- .../showcase/configurations/base/ShowcaseConfiguration.java | 4 ++-- .../showcase/configurations/base/ShowcaseConfiguration.java | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/ChartConfiguration.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/ChartConfiguration.java index 533a7fba..b24210d6 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/ChartConfiguration.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/ChartConfiguration.java @@ -6,6 +6,7 @@ import de.adesso.wickedcharts.chartjs.chartoptions.Options; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.List; /** @@ -13,7 +14,7 @@ */ @Accessors(chain = true) @lombok.Data -public class ChartConfiguration { +public class ChartConfiguration implements Serializable { private ChartType type; private Data data; private Options options; diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java index b15b4d9f..f990f07a 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java @@ -15,7 +15,7 @@ * The base class for all chart configurations for the showcase */ @SuppressWarnings("serial") -public abstract class ShowcaseConfiguration extends ChartConfiguration implements Serializable { +public abstract class ShowcaseConfiguration extends ChartConfiguration { protected List randomIntegerList(int size) { List dataList = new ArrayList(); diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java index b15b4d9f..57aa0636 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java @@ -15,10 +15,10 @@ * The base class for all chart configurations for the showcase */ @SuppressWarnings("serial") -public abstract class ShowcaseConfiguration extends ChartConfiguration implements Serializable { +public abstract class ShowcaseConfiguration extends ChartConfiguration{ protected List randomIntegerList(int size) { - List dataList = new ArrayList(); + List dataList = new ArrayList<>(); Random rng = new Random(); for (int i = 0; i < size; i++) { dataList.add(rng.nextInt(60) + 1); diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java index 4cc80e54..09b2224c 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java @@ -16,7 +16,7 @@ * The base class for all chart configurations for the showcase */ @SuppressWarnings("serial") -public abstract class ShowcaseConfiguration extends ChartConfiguration implements Serializable { +public abstract class ShowcaseConfiguration extends ChartConfiguration { protected List randomIntegerList(int size) { List dataList = new ArrayList(); diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java index b15b4d9f..57aa0636 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java @@ -15,10 +15,10 @@ * The base class for all chart configurations for the showcase */ @SuppressWarnings("serial") -public abstract class ShowcaseConfiguration extends ChartConfiguration implements Serializable { +public abstract class ShowcaseConfiguration extends ChartConfiguration{ protected List randomIntegerList(int size) { - List dataList = new ArrayList(); + List dataList = new ArrayList<>(); Random rng = new Random(); for (int i = 0; i < size; i++) { dataList.add(rng.nextInt(60) + 1); diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java index b15b4d9f..b0875e54 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java @@ -15,10 +15,10 @@ * The base class for all chart configurations for the showcase */ @SuppressWarnings("serial") -public abstract class ShowcaseConfiguration extends ChartConfiguration implements Serializable { +public abstract class ShowcaseConfiguration extends ChartConfiguration { protected List randomIntegerList(int size) { - List dataList = new ArrayList(); + List dataList = new ArrayList<>(); Random rng = new Random(); for (int i = 0; i < size; i++) { dataList.add(rng.nextInt(60) + 1); From ce8198d70665c9187d6964ef0691b11acaf23cfa Mon Sep 17 00:00:00 2001 From: max Date: Sat, 28 Jul 2018 13:47:23 +0200 Subject: [PATCH 04/38] switched showcases to spring boot 2 as well as some serialization errors --- .../wickedcharts/chartjs/chartoptions/BorderCapStyle.java | 4 +++- .../wickedcharts/chartjs/chartoptions/BorderJoinStyle.java | 4 +++- .../adesso/wickedcharts/chartjs/chartoptions/BoundsType.java | 4 +++- .../adesso/wickedcharts/chartjs/chartoptions/ChartType.java | 4 +++- .../chartjs/chartoptions/CubicInterpolationMode.java | 4 +++- .../wickedcharts/chartjs/chartoptions/DistributionType.java | 4 +++- .../adesso/wickedcharts/chartjs/chartoptions/EventType.java | 4 +++- .../adesso/wickedcharts/chartjs/chartoptions/FontStyle.java | 4 +++- .../adesso/wickedcharts/chartjs/chartoptions/HoverMode.java | 4 +++- .../de/adesso/wickedcharts/chartjs/chartoptions/Layout.java | 4 +++- .../de/adesso/wickedcharts/chartjs/chartoptions/Padding.java | 4 +++- .../adesso/wickedcharts/chartjs/chartoptions/PointStyle.java | 4 +++- .../adesso/wickedcharts/chartjs/chartoptions/TickSource.java | 4 +++- .../wickedcharts/chartjs/chartoptions/TimeFormatRound.java | 4 +++- .../wickedcharts/chartjs/chartoptions/colors/Color.java | 4 +++- .../wickedcharts/chartjs/chartoptions/colors/RgbColor.java | 5 +++-- .../chartjs/chartoptions/colors/SimpleColor.java | 2 ++ .../chartjs/chartoptions/fillingmodes/AbsoluteIndex.java | 4 +++- .../chartoptions/fillingmodes/BooleanFillingMode.java | 4 +++- .../chartoptions/fillingmodes/BoundaryFillingMode.java | 4 +++- .../chartjs/chartoptions/fillingmodes/FillingMode.java | 2 ++ .../chartoptions/fillingmodes/LocationFillingMode.java | 4 +++- .../chartjs/chartoptions/fillingmodes/RelativeIndex.java | 4 +++- .../wickedcharts/chartjs/chartoptions/label/Label.java | 4 +++- .../chartjs/chartoptions/valueType/DateTimeValue.java | 2 +- .../chartjs/chartoptions/valueType/ValueType.java | 4 +++- showcase/gradle.properties | 5 ++--- showcase/gradle/wrapper/gradle-wrapper.properties | 2 +- showcase/wicked-charts-showcase-wicket14/build.gradle | 1 - .../de/adesso/wickedcharts/showcase/boot/WarInitializer.java | 2 +- showcase/wicked-charts-showcase-wicket15/build.gradle | 1 - .../de/adesso/wickedcharts/showcase/boot/WarInitializer.java | 2 +- showcase/wicked-charts-showcase-wicket6/build.gradle | 1 - .../de/adesso/wickedcharts/showcase/boot/WarInitializer.java | 2 +- showcase/wicked-charts-showcase-wicket7/build.gradle | 3 ++- .../de/adesso/wickedcharts/showcase/boot/WarInitializer.java | 2 +- showcase/wicked-charts-showcase-wicket8/build.gradle | 4 ++-- .../de/adesso/wickedcharts/showcase/boot/WarInitializer.java | 2 +- 38 files changed, 86 insertions(+), 40 deletions(-) diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderCapStyle.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderCapStyle.java index 382ec34e..8d498e22 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderCapStyle.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderCapStyle.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Determines how the end points of every element are drawn. * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum BorderCapStyle implements JsonValueEnum { +public enum BorderCapStyle implements JsonValueEnum, Serializable { BUTT("butt"), ROUND("round"), SQUARE("square"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderJoinStyle.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderJoinStyle.java index 0c396d04..b94ca024 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderJoinStyle.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BorderJoinStyle.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Determines how two connecting segments (of lines, arcs or curves) with non-zero lengths in a shape are joined together. * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum BorderJoinStyle implements JsonValueEnum { +public enum BorderJoinStyle implements JsonValueEnum, Serializable { BEVEL("bevel"), ROUND("round"), MITER("miter"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BoundsType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BoundsType.java index 2cb547de..e406316d 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BoundsType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/BoundsType.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Defines the bounds property which controls the scale boundary strategy. * @@ -9,7 +11,7 @@ * * @author SvenWirz */ -public enum BoundsType implements JsonValueEnum{ +public enum BoundsType implements JsonValueEnum, Serializable { DATA("data"), TICKS("ticks"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java index 56fd8e0a..261d0cae 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Defines the type of the chart. * @@ -11,7 +13,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum ChartType implements JsonValueEnum { +public enum ChartType implements JsonValueEnum, Serializable { LINE("line"), BAR("bar"), HORIZONTAL_BAR("horizontalBar"), diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CubicInterpolationMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CubicInterpolationMode.java index 0a618b33..4309f662 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CubicInterpolationMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CubicInterpolationMode.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * 'default' : Uses a custom weighted cubic interpolation, which produces pleasant curves for all types of datasets. * 'monotone' : More suited to y = f(x) datasets : it preserves monotonicity (or piecewise monotonicity) of the dataset being interpolated, and ensures local extremums (if any) stay at input data points. @@ -12,7 +14,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum CubicInterpolationMode implements JsonValueEnum { +public enum CubicInterpolationMode implements JsonValueEnum, Serializable { DEFAULT("default"), MONOTONE("monotone"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/DistributionType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/DistributionType.java index 12bb0fee..08c0d5b4 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/DistributionType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/DistributionType.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Controls the data distribution along the scale. * @@ -9,7 +11,7 @@ * * @author SvenWirz */ -public enum DistributionType implements LowercaseEnum { +public enum DistributionType implements LowercaseEnum, Serializable { SERIES, LINEAR; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EventType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EventType.java index 0c96632e..5d3b37ac 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EventType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EventType.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Defines the different event types. * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum EventType implements JsonValueEnum{ +public enum EventType implements JsonValueEnum, Serializable { MOUSEMOVE("mousemove"), MOUSEOUT("mouseout"), CLICK("click"), diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/FontStyle.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/FontStyle.java index 96a358c0..43f86bb1 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/FontStyle.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/FontStyle.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Defines the different font styles. * @@ -10,6 +12,6 @@ * * @author SvenWirz */ -public enum FontStyle implements LowercaseEnum { +public enum FontStyle implements LowercaseEnum, Serializable { NORMAL,BOLD, ITALIC, OBLIQUE, INITIAL, INHERIT; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/HoverMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/HoverMode.java index 042f8f73..0cd4c767 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/HoverMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/HoverMode.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Defines the different hover event types. * @@ -10,6 +12,6 @@ * @author anedomansky * @author maximAtanasov */ -public enum HoverMode implements LowercaseEnum { +public enum HoverMode implements LowercaseEnum, Serializable { INDEX,DATASET,POINT,X,Y,NEAREST; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Layout.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Layout.java index 207b25d0..8ea17ca2 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Layout.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Layout.java @@ -2,6 +2,8 @@ import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the padding for the layout. * @@ -11,6 +13,6 @@ */ @Accessors(chain = true) @lombok.Data -public class Layout { +public class Layout implements Serializable { private Padding padding; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Padding.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Padding.java index 91e8007f..70722c90 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Padding.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Padding.java @@ -2,6 +2,8 @@ import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Generate space around a chart. * @@ -12,7 +14,7 @@ */ @Accessors(chain = true) @lombok.Data -public class Padding { +public class Padding implements Serializable { private Integer left; private Integer right; private Integer top; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/PointStyle.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/PointStyle.java index 205a6748..4d8d7839 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/PointStyle.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/PointStyle.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * An enum defining all point styles * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum PointStyle implements JsonValueEnum { +public enum PointStyle implements JsonValueEnum, Serializable { CIRCLE("circle"), CROSS("cross"), CROSS_ROT("crossRot"), diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TickSource.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TickSource.java index e72e182f..2283ca38 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TickSource.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TickSource.java @@ -2,11 +2,13 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Defines an enum to specify the source for the ticks. * * @author SvenWirz */ -public enum TickSource implements LowercaseEnum { +public enum TickSource implements LowercaseEnum, Serializable { LABELS; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TimeFormatRound.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TimeFormatRound.java index ac20c724..a9df8fc7 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TimeFormatRound.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TimeFormatRound.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Defines the time display formats. * @@ -9,6 +11,6 @@ * * @author SvenWirz */ -public enum TimeFormatRound implements LowercaseEnum { +public enum TimeFormatRound implements LowercaseEnum, Serializable { DAY, MILLISECOND, SECOND, MINUTE, HOUR, WEEK, MONTH, QUARTER, YEAR; } \ No newline at end of file diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/Color.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/Color.java index 90f8bf9c..87478413 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/Color.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/Color.java @@ -1,5 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; +import java.io.Serializable; + /**  * Defines the base class for colors.  * @@ -7,6 +9,6 @@ * * @author SvenWirz  */ -public class Color { +public class Color implements Serializable { } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java index 128ba6d0..bd2ca106 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java @@ -1,6 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; /** @@ -11,8 +12,8 @@ * @author SvenWirz */ @AllArgsConstructor -@lombok.Data -@EqualsAndHashCode(callSuper=false) +@Data +@EqualsAndHashCode(callSuper=true) public class RgbColor extends Color { private int red; private int green; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java index b67fa7a1..5731e3c2 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java @@ -1,5 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; +import java.io.Serializable; + /** * Defines colors with predefined values. * diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/AbsoluteIndex.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/AbsoluteIndex.java index 0b444e03..0a2ab1b4 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/AbsoluteIndex.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/AbsoluteIndex.java @@ -2,6 +2,8 @@ import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the filling mode as an absolute Integer. * @@ -10,7 +12,7 @@ */ @Accessors(chain = true) @lombok.Data -public class AbsoluteIndex implements FillingMode { +public class AbsoluteIndex implements FillingMode, Serializable { private Integer index; public AbsoluteIndex(Integer index) { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BooleanFillingMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BooleanFillingMode.java index 56b3c3aa..061baece 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BooleanFillingMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BooleanFillingMode.java @@ -1,12 +1,14 @@ package de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes; +import java.io.Serializable; + /** * Defines the filling mode as a Boolean. * * @see http://www.chartjs.org/docs/latest/charts/area.html * @author SvenWirz */ -public enum BooleanFillingMode implements FillingMode, FillingModeLine { +public enum BooleanFillingMode implements FillingMode, FillingModeLine, Serializable { FALSE(false), TRUE(true) ; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BoundaryFillingMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BoundaryFillingMode.java index 1a760db6..bc038361 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BoundaryFillingMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/BoundaryFillingMode.java @@ -1,5 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes; +import java.io.Serializable; + /**  * Defines the additional filling modes as Strings. * @@ -8,7 +10,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum BoundaryFillingMode implements FillingMode { +public enum BoundaryFillingMode implements FillingMode, Serializable { START("start"), END("end"), ORIGIN("origin"), diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/FillingMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/FillingMode.java index 74a20f23..7209ce37 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/FillingMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/FillingMode.java @@ -1,5 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes; +import java.io.Serializable; + /** * Defines the interface for the filling mode. * diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/LocationFillingMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/LocationFillingMode.java index 126197c3..1d3347ae 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/LocationFillingMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/LocationFillingMode.java @@ -1,12 +1,14 @@ package de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes; +import java.io.Serializable; + /** * Defines the the filling mode in the line element. * * @see http://www.chartjs.org/docs/latest/charts/area.html * @author SvenWirz */ -public enum LocationFillingMode implements FillingModeLine { +public enum LocationFillingMode implements FillingModeLine, Serializable { ZERO("zero"), TOP("top"), BOTTOM("bottom"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/RelativeIndex.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/RelativeIndex.java index 08567384..9599851e 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/RelativeIndex.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/RelativeIndex.java @@ -2,6 +2,8 @@ import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the Filling mode as a relative value. * @see http://www.chartjs.org/docs/latest/charts/area.html @@ -9,7 +11,7 @@ */ @Accessors(chain = true) @lombok.Data -public class RelativeIndex implements FillingMode { +public class RelativeIndex implements FillingMode, Serializable { private String index; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/Label.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/Label.java index 15cf3ea8..71f542e8 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/Label.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/Label.java @@ -1,5 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; -public abstract class Label { +import java.io.Serializable; + +public abstract class Label implements Serializable { } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java index 06208bfa..593a7dbb 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java @@ -16,7 +16,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class DateTimeValue extends ValueType implements Serializable { +public class DateTimeValue extends ValueType{ private LocalDateTime value; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ValueType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ValueType.java index 00489c5f..1ac5f6f8 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ValueType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ValueType.java @@ -1,9 +1,11 @@ package de.adesso.wickedcharts.chartjs.chartoptions.valueType; +import java.io.Serializable; + /** * Base class for all value types * @author SvenWirz */ -public class ValueType { +public class ValueType implements Serializable { } diff --git a/showcase/gradle.properties b/showcase/gradle.properties index 05912116..3ff4faaa 100644 --- a/showcase/gradle.properties +++ b/showcase/gradle.properties @@ -1,4 +1,3 @@ -spring_boot_version = 1.5.2.RELEASE -springloaded_version = 1.2.5.RELEASE -spring_version = 4.3.6.RELEASE +spring_boot_version = 2.0.3.RELEASE +spring_version = 5.0.7.RELEASE wicketcharts_version = 3.2.0-SNAPSHOT \ No newline at end of file diff --git a/showcase/gradle/wrapper/gradle-wrapper.properties b/showcase/gradle/wrapper/gradle-wrapper.properties index a18a9e65..238101c8 100644 --- a/showcase/gradle/wrapper/gradle-wrapper.properties +++ b/showcase/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket14/build.gradle b/showcase/wicked-charts-showcase-wicket14/build.gradle index a97373c6..de02fcab 100644 --- a/showcase/wicked-charts-showcase-wicket14/build.gradle +++ b/showcase/wicked-charts-showcase-wicket14/build.gradle @@ -25,7 +25,6 @@ buildscript { } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" - classpath group: 'org.springframework', name: 'springloaded', version: "${springloaded_version}" } } diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java index 88afcbe8..e52ee9f6 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java @@ -1,7 +1,7 @@ package de.adesso.wickedcharts.showcase.boot; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; /** * This class is needed for deployment on an application server. diff --git a/showcase/wicked-charts-showcase-wicket15/build.gradle b/showcase/wicked-charts-showcase-wicket15/build.gradle index 99a9ee1b..468a159e 100644 --- a/showcase/wicked-charts-showcase-wicket15/build.gradle +++ b/showcase/wicked-charts-showcase-wicket15/build.gradle @@ -26,7 +26,6 @@ buildscript { } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" - classpath group: 'org.springframework', name: 'springloaded', version: "${springloaded_version}" } } diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java index 88afcbe8..e52ee9f6 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java @@ -1,7 +1,7 @@ package de.adesso.wickedcharts.showcase.boot; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; /** * This class is needed for deployment on an application server. diff --git a/showcase/wicked-charts-showcase-wicket6/build.gradle b/showcase/wicked-charts-showcase-wicket6/build.gradle index 68bbd5f4..5544cb02 100644 --- a/showcase/wicked-charts-showcase-wicket6/build.gradle +++ b/showcase/wicked-charts-showcase-wicket6/build.gradle @@ -27,7 +27,6 @@ buildscript { } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" - classpath group: 'org.springframework', name: 'springloaded', version: "${springloaded_version}" } } diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java index 88afcbe8..e52ee9f6 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java @@ -1,7 +1,7 @@ package de.adesso.wickedcharts.showcase.boot; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; /** * This class is needed for deployment on an application server. diff --git a/showcase/wicked-charts-showcase-wicket7/build.gradle b/showcase/wicked-charts-showcase-wicket7/build.gradle index 8b3fbd87..d6842bba 100644 --- a/showcase/wicked-charts-showcase-wicket7/build.gradle +++ b/showcase/wicked-charts-showcase-wicket7/build.gradle @@ -7,10 +7,12 @@ dependencies { compile 'commons-io:commons-io:2.4' compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_spring_version}" compile( + [group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'], [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_spring_version}"], [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket7', version: "${wicketcharts_version}"], ) compile( + [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${spring_boot_version}"], ) } @@ -26,7 +28,6 @@ buildscript { } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" - classpath group: 'org.springframework', name: 'springloaded', version: "${springloaded_version}" } } diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java index 88afcbe8..e52ee9f6 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java @@ -1,7 +1,7 @@ package de.adesso.wickedcharts.showcase.boot; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; /** * This class is needed for deployment on an application server. diff --git a/showcase/wicked-charts-showcase-wicket8/build.gradle b/showcase/wicked-charts-showcase-wicket8/build.gradle index 69d57a2b..0b3ca46a 100644 --- a/showcase/wicked-charts-showcase-wicket8/build.gradle +++ b/showcase/wicked-charts-showcase-wicket8/build.gradle @@ -11,8 +11,7 @@ buildscript { } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" - classpath group: 'org.springframework', name: 'springloaded', version: "${springloaded_version}" - classpath 'com.google.cloud.tools:appengine-gradle-plugin:+' + classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.5' } } @@ -24,6 +23,7 @@ dependencies { compile 'com.google.appengine:appengine-api-1.0-sdk:+' compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_spring_version}" compile( + [group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'], [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_spring_version}"], [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket8', version: "${wicketcharts_version}"], ) diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java index 88afcbe8..e52ee9f6 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/boot/WarInitializer.java @@ -1,7 +1,7 @@ package de.adesso.wickedcharts.showcase.boot; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; /** * This class is needed for deployment on an application server. From 4d68252e128c1d2cb7ba364d5ef6e7358d3fd366 Mon Sep 17 00:00:00 2001 From: max Date: Sat, 28 Jul 2018 13:50:28 +0200 Subject: [PATCH 05/38] optimized imports --- .../chartjs/chartoptions/colors/SimpleColor.java | 2 -- .../chartjs/chartoptions/fillingmodes/FillingMode.java | 2 -- .../chartjs/chartoptions/valueType/DateTimeValue.java | 1 - .../de/adesso/wickedcharts/showcase/HomepageChartJs.java | 1 - .../adesso/wickedcharts/showcase/ShowcaseApplication.java | 7 ------- .../configurations/base/ShowcaseConfiguration.java | 1 - .../adesso/wickedcharts/showcase/ShowcaseApplication.java | 1 - .../configurations/base/ShowcaseConfiguration.java | 1 - .../adesso/wickedcharts/showcase/HomepageHighcharts.java | 1 - .../configurations/base/ShowcaseConfiguration.java | 1 - .../adesso/wickedcharts/showcase/HomepageHighcharts.java | 1 - .../configurations/base/ShowcaseConfiguration.java | 1 - .../adesso/wickedcharts/showcase/HomepageHighcharts.java | 1 - .../configurations/base/ShowcaseConfiguration.java | 1 - .../wickedcharts/showcase/links/UpdateChartJsLink.java | 2 -- .../wickedcharts/showcase/links/UpdateHighchartLink.java | 2 -- .../wickedcharts/showcase/links/UpdateThemeLink.java | 2 -- 17 files changed, 28 deletions(-) diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java index 5731e3c2..b67fa7a1 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java @@ -1,7 +1,5 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; -import java.io.Serializable; - /** * Defines colors with predefined values. * diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/FillingMode.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/FillingMode.java index 7209ce37..74a20f23 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/FillingMode.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/fillingmodes/FillingMode.java @@ -1,7 +1,5 @@ package de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes; -import java.io.Serializable; - /** * Defines the interface for the filling mode. * diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java index 593a7dbb..533cb481 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java @@ -3,7 +3,6 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.io.Serializable; import java.time.LocalDateTime; /** diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index c0fd62c2..d13121ed 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -25,7 +25,6 @@ import de.adesso.wickedcharts.showcase.links.ChartjsShowcaseLink; import de.adesso.wickedcharts.showcase.links.HighchartsShowcaseLink; import de.adesso.wickedcharts.showcase.links.UpdateChartJsLink; -import de.adesso.wickedcharts.wicket14.JavaScriptResourceRegistry; import de.adesso.wickedcharts.wicket14.chartjs.Chart; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java index c63ba88f..7a8fd183 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java @@ -15,20 +15,13 @@ package de.adesso.wickedcharts.showcase; -import de.adesso.wickedcharts.wicket14.JavaScriptResourceRegistry; import org.apache.wicket.Request; import org.apache.wicket.Response; import org.apache.wicket.Session; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.request.target.coding.HybridUrlCodingStrategy; -import org.apache.wicket.request.target.coding.IndexedHybridUrlCodingStrategy; -import org.apache.wicket.request.target.coding.IndexedParamUrlCodingStrategy; import org.apache.wicket.request.target.coding.MixedParamHybridUrlCodingStrategy; import org.springframework.stereotype.Component; -import java.lang.reflect.Array; -import java.util.Arrays; - @Component public class ShowcaseApplication extends WebApplication { /** diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java index f990f07a..0a9bcc75 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java @@ -5,7 +5,6 @@ import java.io.File; import java.io.IOException; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Random; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java index 06bf238f..d2c2f3cf 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java @@ -19,7 +19,6 @@ import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; -import org.apache.wicket.request.mapper.MountedMapper; import org.springframework.stereotype.Component; @Component diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java index 57aa0636..64d68d36 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java @@ -5,7 +5,6 @@ import java.io.File; import java.io.IOException; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Random; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index 2985ef89..4218e58c 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -28,7 +28,6 @@ import org.apache.wicket.request.mapper.parameter.INamedParameters; import org.apache.wicket.request.mapper.parameter.PageParameters; -import java.util.ArrayList; import java.util.List; /** diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java index 09b2224c..1ac0c322 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java @@ -6,7 +6,6 @@ import java.io.File; import java.io.IOException; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Random; diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index 0b1b3e33..57420a4e 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -28,7 +28,6 @@ import org.apache.wicket.request.mapper.parameter.INamedParameters; import org.apache.wicket.request.mapper.parameter.PageParameters; -import java.util.ArrayList; import java.util.List; /** diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java index 57aa0636..64d68d36 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java @@ -5,7 +5,6 @@ import java.io.File; import java.io.IOException; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Random; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index 65df137d..ab6a4dbe 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -28,7 +28,6 @@ import org.apache.wicket.request.mapper.parameter.INamedParameters; import org.apache.wicket.request.mapper.parameter.PageParameters; -import java.util.ArrayList; import java.util.List; /** diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java index b0875e54..c0f36337 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java @@ -5,7 +5,6 @@ import java.io.File; import java.io.IOException; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Random; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java index 2738eed5..e3413d75 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java @@ -15,8 +15,6 @@ package de.adesso.wickedcharts.showcase.links; import de.adesso.wickedcharts.showcase.HomepageChartJs; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.request.mapper.parameter.PageParameters; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java index 1f69099b..cf9d82c9 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java @@ -15,8 +15,6 @@ package de.adesso.wickedcharts.showcase.links; import de.adesso.wickedcharts.showcase.HomepageHighcharts; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.request.mapper.parameter.PageParameters; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java index 77465817..b86794c8 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java @@ -15,8 +15,6 @@ package de.adesso.wickedcharts.showcase.links; import de.adesso.wickedcharts.showcase.HomepageHighcharts; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.request.mapper.parameter.PageParameters; From 80ce2f7c25eb3b753fdda4032c2f6001087d72f1 Mon Sep 17 00:00:00 2001 From: max Date: Sat, 28 Jul 2018 15:41:09 +0200 Subject: [PATCH 06/38] updated wicket versions --- showcase/wicked-charts-showcase-wicket15/gradle.properties | 2 +- showcase/wicked-charts-showcase-wicket6/gradle.properties | 2 +- showcase/wicked-charts-showcase-wicket7/gradle.properties | 2 +- wicket/wicked-charts-wicket14/build.gradle | 2 +- .../wickedcharts/wicket14/chartjs/JsonRendererFactory.java | 4 ++-- .../wicket14/highcharts/JsonRendererFactory.java | 4 ++-- wicket/wicked-charts-wicket15/build.gradle | 2 +- .../wickedcharts/wicket15/JavaScriptResourceRegistry.java | 2 +- .../wickedcharts/wicket15/chartjs/JsonRendererFactory.java | 6 +++--- wicket/wicked-charts-wicket6/build.gradle | 2 +- wicket/wicked-charts-wicket7/build.gradle | 2 +- .../wickedcharts/wicket7/chartjs/JsonRendererFactory.java | 6 +++--- .../wickedcharts/wicket8/chartjs/JsonRendererFactory.java | 6 +++--- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/showcase/wicked-charts-showcase-wicket15/gradle.properties b/showcase/wicked-charts-showcase-wicket15/gradle.properties index e915a560..c1024d52 100644 --- a/showcase/wicked-charts-showcase-wicket15/gradle.properties +++ b/showcase/wicked-charts-showcase-wicket15/gradle.properties @@ -1 +1 @@ -wicket_spring_version=1.5.10 \ No newline at end of file +wicket_spring_version=1.5.17 \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket6/gradle.properties b/showcase/wicked-charts-showcase-wicket6/gradle.properties index 62efb007..0904dd79 100644 --- a/showcase/wicked-charts-showcase-wicket6/gradle.properties +++ b/showcase/wicked-charts-showcase-wicket6/gradle.properties @@ -1 +1 @@ -wicket_spring_version=6.21.0 \ No newline at end of file +wicket_spring_version=6.29.0 \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket7/gradle.properties b/showcase/wicked-charts-showcase-wicket7/gradle.properties index a80749c2..c59e4089 100644 --- a/showcase/wicked-charts-showcase-wicket7/gradle.properties +++ b/showcase/wicked-charts-showcase-wicket7/gradle.properties @@ -1 +1 @@ -wicket_spring_version=7.1.0 \ No newline at end of file +wicket_spring_version=7.9.0 \ No newline at end of file diff --git a/wicket/wicked-charts-wicket14/build.gradle b/wicket/wicked-charts-wicket14/build.gradle index 43b48954..b9e3a5a7 100644 --- a/wicket/wicked-charts-wicket14/build.gradle +++ b/wicket/wicked-charts-wicket14/build.gradle @@ -1,6 +1,6 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') - compile 'org.apache.wicket:wicket:1.4.22' + compile 'org.apache.wicket:wicket:1.4.23' testCompile 'junit:junit:4.12' //we had a mistake here too } \ No newline at end of file diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/JsonRendererFactory.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/JsonRendererFactory.java index 809be993..e7ba2f12 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/JsonRendererFactory.java @@ -18,7 +18,7 @@ /** * Factory class responsible for creating a {@link JsonRenderer} instance that - * matches the needs of wicked-charts-wicket6. + * matches the needs of wicked-charts-wicket14. * * @author Tom Hombergs (tom.hombergs@gmail.com) */ @@ -37,7 +37,7 @@ private JsonRendererFactory() { /** * Returns the singleton instance of the {@link JsonRenderer} that is - * configured for Wicket 6.x. + * configured for Wicket 1.4.x. * * @return the singleton {@link JsonRenderer} */ diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/JsonRendererFactory.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/JsonRendererFactory.java index d46a0232..bed25dc2 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/JsonRendererFactory.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,7 +32,7 @@ private JsonRendererFactory() { /** * Returns the singleton instance of the {@link JsonRenderer} that is - * configured for Wicket 1.5.x. + * configured for Wicket 1.4.x. * * @return the singleton {@link JsonRenderer} */ diff --git a/wicket/wicked-charts-wicket15/build.gradle b/wicket/wicked-charts-wicket15/build.gradle index edd36237..fbaa04c4 100644 --- a/wicket/wicked-charts-wicket15/build.gradle +++ b/wicket/wicked-charts-wicket15/build.gradle @@ -1,6 +1,6 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') - compile 'org.apache.wicket:wicket-core:1.5.13' + compile 'org.apache.wicket:wicket-core:1.5.17' testCompile 'junit:junit:4.12' } \ No newline at end of file diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/JavaScriptResourceRegistry.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/JavaScriptResourceRegistry.java index 44c974f3..23ab6f95 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/JavaScriptResourceRegistry.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/JavaScriptResourceRegistry.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/JsonRendererFactory.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/JsonRendererFactory.java index 8c1e1333..782d03b1 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/JsonRendererFactory.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,7 @@ /** * Factory class responsible for creating a {@link JsonRenderer} instance that - * matches the needs of wicked-charts-wicket6. + * matches the needs of wicked-charts-wicket15. * * @author Tom Hombergs (tom.hombergs@gmail.com) */ @@ -37,7 +37,7 @@ private JsonRendererFactory() { /** * Returns the singleton instance of the {@link JsonRenderer} that is - * configured for Wicket 6.x. + * configured for Wicket 1.5.x. * * @return the singleton {@link JsonRenderer} */ diff --git a/wicket/wicked-charts-wicket6/build.gradle b/wicket/wicked-charts-wicket6/build.gradle index cf314b38..edc2b07c 100644 --- a/wicket/wicked-charts-wicket6/build.gradle +++ b/wicket/wicked-charts-wicket6/build.gradle @@ -1,7 +1,7 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') - compile 'org.apache.wicket:wicket-core:6.21.0' + compile 'org.apache.wicket:wicket-core:6.29.0' testCompile 'junit:junit:4.12' compile 'javax.servlet:servlet-api:2.5' } \ No newline at end of file diff --git a/wicket/wicked-charts-wicket7/build.gradle b/wicket/wicked-charts-wicket7/build.gradle index cc3ceefa..59b08b91 100644 --- a/wicket/wicked-charts-wicket7/build.gradle +++ b/wicket/wicked-charts-wicket7/build.gradle @@ -1,7 +1,7 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') - compile 'org.apache.wicket:wicket-core:7.1.0' + compile 'org.apache.wicket:wicket-core:7.9.0' testCompile 'junit:junit:4.12' compile 'javax.servlet:javax.servlet-api:3.0.1' } diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/JsonRendererFactory.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/JsonRendererFactory.java index 201e9dee..68105dc2 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/JsonRendererFactory.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,7 @@ /** * Factory class responsible for creating a {@link JsonRenderer} instance that - * matches the needs of wicked-charts-wicket6. + * matches the needs of wicked-charts-wicket7. * * @author Tom Hombergs (tom.hombergs@gmail.com) */ @@ -37,7 +37,7 @@ private JsonRendererFactory() { /** * Returns the singleton instance of the {@link JsonRenderer} that is - * configured for Wicket 6.x. + * configured for Wicket 7.x. * * @return the singleton {@link JsonRenderer} */ diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/JsonRendererFactory.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/JsonRendererFactory.java index 11b3b216..5877dd7a 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/JsonRendererFactory.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,7 @@ /** * Factory class responsible for creating a {@link JsonRenderer} instance that - * matches the needs of wicked-charts-wicket6. + * matches the needs of wicked-charts-wicket8. * * @author Tom Hombergs (tom.hombergs@gmail.com) */ @@ -37,7 +37,7 @@ private JsonRendererFactory() { /** * Returns the singleton instance of the {@link JsonRenderer} that is - * configured for Wicket 6.x. + * configured for Wicket 8.x. * * @return the singleton {@link JsonRenderer} */ From 0189e4baaca5776e23cf779f0929e45cece87ad4 Mon Sep 17 00:00:00 2001 From: max Date: Sat, 28 Jul 2018 15:50:44 +0200 Subject: [PATCH 07/38] minor formatting improvements --- .../wickedcharts/showcase/options/AreaInvertedAxisOptions.java | 2 +- .../wickedcharts/showcase/options/AreaMissingOptions.java | 2 +- .../adesso/wickedcharts/showcase/options/AreaSplineOptions.java | 2 +- .../showcase/options/AreaWithNegativeValuesOptions.java | 2 +- .../showcase/options/BarWithNegativeStackOptions.java | 2 +- .../adesso/wickedcharts/showcase/options/BasicAreaOptions.java | 2 +- .../adesso/wickedcharts/showcase/options/BasicBarOptions.java | 2 +- .../wickedcharts/showcase/options/BasicColumnOptions.java | 2 +- .../adesso/wickedcharts/showcase/options/BasicLineOptions.java | 2 +- .../adesso/wickedcharts/showcase/options/BasicPieOptions.java | 2 +- .../wickedcharts/showcase/options/BubbleChart3DOptions.java | 2 +- .../wickedcharts/showcase/options/BubbleChartOptions.java | 2 +- .../showcase/options/ColumnWithDrilldownOptions.java | 2 +- .../showcase/options/ColumnWithNegativeValuesOptions.java | 2 +- .../showcase/options/ColumnWithRotatedLabelsOptions.java | 2 +- .../de/adesso/wickedcharts/showcase/options/ComboOptions.java | 2 +- .../de/adesso/wickedcharts/showcase/options/DonutOptions.java | 2 +- .../wickedcharts/showcase/options/InteractionOptions.java | 2 +- .../showcase/options/LineWithDataLabelsOptions.java | 2 +- .../wickedcharts/showcase/options/LogarithmicAxisOptions.java | 2 +- .../wickedcharts/showcase/options/PercentageAreaOptions.java | 2 +- .../wickedcharts/showcase/options/PieWithGradientOptions.java | 2 +- .../wickedcharts/showcase/options/PieWithLegendOptions.java | 2 +- .../de/adesso/wickedcharts/showcase/options/PolarOptions.java | 2 +- .../wickedcharts/showcase/options/SplineUpdatingOptions.java | 2 +- .../showcase/options/SplineWithInvertedAxisOptions.java | 2 +- .../showcase/options/SplineWithPlotBandsOptions.java | 2 +- .../wickedcharts/showcase/options/SplineWithSymbolsOptions.java | 2 +- .../showcase/options/StackedAndGroupedColumnOptions.java | 2 +- .../wickedcharts/showcase/options/StackedAreaOptions.java | 2 +- .../adesso/wickedcharts/showcase/options/StackedBarOptions.java | 2 +- .../wickedcharts/showcase/options/StackedColumnOptions.java | 2 +- .../wickedcharts/showcase/options/StackedPercentageOptions.java | 2 +- .../showcase/options/TimeDataWithIrregularIntervalsOptions.java | 2 +- .../showcase/options/ZoomableTimeSeriesOptions.java | 2 +- .../de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.html | 2 +- .../wickedcharts/showcase/modalwindow/ModalWindowPage.html | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaInvertedAxisOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaInvertedAxisOptions.java index d146b7ea..825eb9c6 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaInvertedAxisOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaInvertedAxisOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaMissingOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaMissingOptions.java index 624c19ec..d25e6b60 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaMissingOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaMissingOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaSplineOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaSplineOptions.java index 159337b8..1437a2e2 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaSplineOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaSplineOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaWithNegativeValuesOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaWithNegativeValuesOptions.java index 3665c421..c802eb14 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaWithNegativeValuesOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaWithNegativeValuesOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BarWithNegativeStackOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BarWithNegativeStackOptions.java index 41bbfc65..0b631f59 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BarWithNegativeStackOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BarWithNegativeStackOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicAreaOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicAreaOptions.java index c06f44fc..5d80b78c 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicAreaOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicAreaOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicBarOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicBarOptions.java index 1a9abf49..79b3a1ca 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicBarOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicBarOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicColumnOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicColumnOptions.java index 0e715d5b..75064867 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicColumnOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicColumnOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicLineOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicLineOptions.java index fbd70d18..0ea342e0 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicLineOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicLineOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicPieOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicPieOptions.java index 20c8b315..d75cfd9c 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicPieOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicPieOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChart3DOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChart3DOptions.java index 010fdc7a..2948e4f2 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChart3DOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChart3DOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChartOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChartOptions.java index e0501d64..38514abb 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChartOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChartOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithDrilldownOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithDrilldownOptions.java index b7cdefd2..c6dfeae2 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithDrilldownOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithDrilldownOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithNegativeValuesOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithNegativeValuesOptions.java index d57ebd0d..37203c57 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithNegativeValuesOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithNegativeValuesOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithRotatedLabelsOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithRotatedLabelsOptions.java index a7859356..09f5a216 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithRotatedLabelsOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithRotatedLabelsOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ComboOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ComboOptions.java index 3f45b246..e1f161bc 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ComboOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ComboOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/DonutOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/DonutOptions.java index f33f05dc..40dc9fd0 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/DonutOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/DonutOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/InteractionOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/InteractionOptions.java index be22a523..e3848c8d 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/InteractionOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/InteractionOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LineWithDataLabelsOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LineWithDataLabelsOptions.java index ba0b8be1..5c0bfcf5 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LineWithDataLabelsOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LineWithDataLabelsOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LogarithmicAxisOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LogarithmicAxisOptions.java index baaa7bcb..6c41cf3c 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LogarithmicAxisOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LogarithmicAxisOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PercentageAreaOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PercentageAreaOptions.java index 921dca18..306afe51 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PercentageAreaOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PercentageAreaOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithGradientOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithGradientOptions.java index 68b8b965..142bbabb 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithGradientOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithGradientOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithLegendOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithLegendOptions.java index aa4bc191..5f0d4f90 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithLegendOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithLegendOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PolarOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PolarOptions.java index 2d72440f..a943adb9 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PolarOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PolarOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineUpdatingOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineUpdatingOptions.java index de430130..d12c3aa8 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineUpdatingOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineUpdatingOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithInvertedAxisOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithInvertedAxisOptions.java index f53e2100..cd6e3a60 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithInvertedAxisOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithInvertedAxisOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithPlotBandsOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithPlotBandsOptions.java index 682b408f..78167dd3 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithPlotBandsOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithPlotBandsOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithSymbolsOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithSymbolsOptions.java index f283f29c..af9f22e7 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithSymbolsOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithSymbolsOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedAndGroupedColumnOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedAndGroupedColumnOptions.java index 029977b2..816fa342 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedAndGroupedColumnOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedAndGroupedColumnOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedAreaOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedAreaOptions.java index ea8cbfe7..9e3d1211 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedAreaOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedAreaOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedBarOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedBarOptions.java index a8e91f3b..592aed49 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedBarOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedBarOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedColumnOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedColumnOptions.java index 2c890e3d..b78abf2f 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedColumnOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedColumnOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedPercentageOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedPercentageOptions.java index f444e5aa..e86768ac 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedPercentageOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/StackedPercentageOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/TimeDataWithIrregularIntervalsOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/TimeDataWithIrregularIntervalsOptions.java index 0ae0bd43..23c0a9d1 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/TimeDataWithIrregularIntervalsOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/TimeDataWithIrregularIntervalsOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ZoomableTimeSeriesOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ZoomableTimeSeriesOptions.java index aad27bb9..8201877a 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ZoomableTimeSeriesOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ZoomableTimeSeriesOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.html b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.html index 2d4f3ff2..27687714 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.html +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.html @@ -1,3 +1,3 @@ - +
\ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ModalWindowPage.html b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ModalWindowPage.html index fc4c8b4c..c1866e22 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ModalWindowPage.html +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ModalWindowPage.html @@ -1,4 +1,4 @@ - +
MODAL WINDOW
From 48214cf5f4f7c5c0381edf2396352196bceb1d46 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Sat, 28 Jul 2018 16:52:01 +0200 Subject: [PATCH 08/38] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d4a7bda..4417b427 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Beautiful and interactive JavaScript charts for Java-based web applications. * Check out the [Changelog](https://github.com/adessoAG/wicked-charts/wiki/Changelog) * Check out the [Feature Overview](https://github.com/adessoAG/wicked-charts/wiki/Feature-Overview) with coding examples * Browse the [Javadoc](http://adessoAG.github.io/wicked-charts/apidocs) - * Download and run the [Showcase](https://github.com/adessoAG/wicked-charts/wiki/Developer-Info:-Starting-the-Showcase-Application) application for your web framework + * [Browse](https://wicked-charts-showcase.appspot.com/) or download and run the [Showcase](https://github.com/adessoAG/wicked-charts/wiki/Developer-Info:-Starting-the-Showcase-Application) application for your web framework * Check out the [FAQ](https://github.com/adessoAG/wicked-charts/wiki/FAQ) [![Build Status](https://travis-ci.org/adessoAG/wicked-charts.png?branch=master)](https://travis-ci.org/adessoAG/wicked-charts) From ae2238d8bcab7ca9f31324111b7f92500d6bcaf7 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Tue, 7 Aug 2018 11:04:24 +0200 Subject: [PATCH 09/38] fixed javaScirpt packaging in jar --- build.gradle | 3 +-- .../wickedcharts/chartjs/chartoptions/Arc.java | 6 ++++-- .../chartjs/chartoptions/CallbackFunction.java | 6 ++++-- .../chartjs/chartoptions/Data.java | 2 +- .../chartjs/chartoptions/EasingType.java | 4 +++- .../chartjs/chartoptions/Position.java | 4 +++- .../chartjs/chartoptions/Rectangle.java | 4 +++- .../chartjs/chartoptions/SteppedLineValue.java | 4 +++- .../chartjs/chartoptions/TooltipPosition.java | 4 +++- .../chartjs/chartoptions/colors/HexColor.java | 6 ++++-- .../chartjs/chartoptions/colors/RgbColor.java | 4 +++- .../chartjs/chartoptions/colors/RgbaColor.java | 6 ++++-- .../chartoptions/colors/SimpleColor.java | 4 +++- .../chartoptions/colors/StringValueColor.java | 4 +++- .../chartjs/chartoptions/label/ConstLabel.java | 3 ++- .../chartoptions/label/DateTimeLabel.java | 3 ++- .../chartjs/chartoptions/label/TextLabel.java | 18 ++++++++---------- .../chartoptions/label/TextListLabel.java | 3 ++- .../chartoptions/valueType/BubbleValue.java | 6 ++++-- .../chartoptions/valueType/ConstValue.java | 3 ++- .../chartoptions/valueType/DateTimeValue.java | 3 ++- .../chartoptions/valueType/DoubleValue.java | 3 ++- .../chartoptions/valueType/FloatValue.java | 3 ++- .../chartoptions/valueType/IntegerValue.java | 3 ++- .../chartoptions/valueType/PointValue.java | 4 +++- .../chartoptions/valueType/StringValue.java | 3 ++- .../highcharts/options/drilldown/drilldown.js | 0 showcase/gradle.properties | 2 +- .../wicked-charts-showcase-jsf21/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 4 ++-- .../build.gradle | 4 ++-- .../build.gradle | 4 ++-- .../build.gradle | 4 ++-- .../build.gradle | 4 ++-- .../interaction/InteractionBehavior.js | 0 .../features/selection/SelectionBehavior.js | 0 .../interaction/InteractionBehavior.js | 0 .../features/selection/SelectionBehavior.js | 0 .../wicket8/JavaScriptResourceRegistry.java | 2 +- .../interaction/InteractionBehavior.js | 0 .../features/selection/SelectionBehavior.js | 0 42 files changed, 89 insertions(+), 55 deletions(-) rename highcharts-wrapper/src/main/{java => resources}/de/adesso/wickedcharts/highcharts/options/drilldown/drilldown.js (100%) rename wicket/wicked-charts-wicket6/src/main/{java => resources}/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionBehavior.js (100%) rename wicket/wicked-charts-wicket6/src/main/{java => resources}/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionBehavior.js (100%) rename wicket/wicked-charts-wicket7/src/main/{java => resources}/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionBehavior.js (100%) rename wicket/wicked-charts-wicket7/src/main/{java => resources}/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionBehavior.js (100%) rename wicket/wicked-charts-wicket8/src/main/{java => resources}/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionBehavior.js (100%) rename wicket/wicked-charts-wicket8/src/main/{java => resources}/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionBehavior.js (100%) diff --git a/build.gradle b/build.gradle index 7c3ae848..4c1588e1 100644 --- a/build.gradle +++ b/build.gradle @@ -34,8 +34,7 @@ subprojects { bintrayKey = System.getProperty("bintray.key") buildNumber = System.getProperty("build.number") } - - + task sourcesJar(type: Jar, dependsOn: classes) { classifier = 'sources' from sourceSets.main.allSource diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Arc.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Arc.java index cf4aa9c7..c68f7f25 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Arc.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Arc.java @@ -4,6 +4,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the arc for polar area, doughnut and pie charts. * @@ -14,8 +16,8 @@ */ @Accessors(chain = true) @lombok.Data -@EqualsAndHashCode(callSuper=false) -public class Arc extends Element { +@EqualsAndHashCode(callSuper=true) +public class Arc extends Element implements Serializable { private Number borderWidth; private Color backgroundColor; private Color borderColor; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CallbackFunction.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CallbackFunction.java index cebeed66..4a0035d2 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CallbackFunction.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/CallbackFunction.java @@ -3,6 +3,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines a callback function. * @@ -10,8 +12,8 @@ */ @Accessors(chain = true) @lombok.Data -@EqualsAndHashCode(callSuper=false) -public class CallbackFunction extends Callback { +@EqualsAndHashCode(callSuper=true) +public class CallbackFunction extends Callback implements Serializable { private static final long serialVersionUID = 1L; private String text; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Data.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Data.java index 140d8308..e54df3ae 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Data.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Data.java @@ -7,6 +7,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -26,7 +27,6 @@ @lombok.Data public class Data implements Serializable{ - private static final long serialVersionUID = 1L; @JsonProperty("labels") private List labels; @JsonProperty("datasets") diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EasingType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EasingType.java index 5575019f..4016d73d 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EasingType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/EasingType.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * Defines the type of easing for animations. * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum EasingType implements JsonValueEnum{ +public enum EasingType implements JsonValueEnum, Serializable { EASE_IN_QUAD("easeInQuad"), EASE_OUT_QUAD("easeOutQuad"), EASE_IN_OUT_QUAD("easeInOutQuad"), diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Position.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Position.java index 729070f1..7e6cab3b 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Position.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Position.java @@ -2,11 +2,13 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * An enum used for expressing position in different options. * * @author SvenWirz */ -public enum Position implements LowercaseEnum { +public enum Position implements LowercaseEnum, Serializable { TOP, RIGHT, BOTTOM, LEFT; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Rectangle.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Rectangle.java index 29841909..3eb9797f 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Rectangle.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/Rectangle.java @@ -4,6 +4,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the rectangle element that is used in bar charts * @@ -14,7 +16,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class Rectangle extends Element { +public class Rectangle extends Element implements Serializable { private Number borderWidth; private Color backgroundColor; private Color borderColor; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/SteppedLineValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/SteppedLineValue.java index 58e63253..1b6de67e 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/SteppedLineValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/SteppedLineValue.java @@ -2,6 +2,8 @@ import de.adesso.wickedcharts.chartjs.json.JsonValueEnum; +import java.io.Serializable; + /** * An enum to define if a line is stepped or not. * @@ -10,7 +12,7 @@ * @author anedomansky * @author maximAtanasov */ -public enum SteppedLineValue implements JsonValueEnum { +public enum SteppedLineValue implements JsonValueEnum, Serializable { BEFORE("before"), AFTER("after"); diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TooltipPosition.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TooltipPosition.java index 794b5b35..60d419c5 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TooltipPosition.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/TooltipPosition.java @@ -2,11 +2,13 @@ import de.adesso.wickedcharts.chartjs.json.LowercaseEnum; +import java.io.Serializable; + /** * Defines all possible positions for tooltips. * * @see http://www.chartjs.org/docs/latest/configuration/tooltip.html#position-modes */ -public enum TooltipPosition implements LowercaseEnum { +public enum TooltipPosition implements LowercaseEnum, Serializable { NEAREST, AVERAGE; } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/HexColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/HexColor.java index d5008648..d5455724 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/HexColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/HexColor.java @@ -2,6 +2,8 @@ import lombok.EqualsAndHashCode; +import java.io.Serializable; + /**  * Defines the color as a hexadecimal encoded color.  * @see http://www.chartjs.org/docs/latest/general/colors.html @@ -10,8 +12,8 @@ * @author maximAtanasov  */ @lombok.Data -@EqualsAndHashCode(callSuper=false) -public class HexColor extends Color { +@EqualsAndHashCode(callSuper=true) +public class HexColor extends Color implements Serializable { private int red; private int green; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java index bd2ca106..224a60a5 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** * Defines an RGB encoded color * @@ -14,7 +16,7 @@ @AllArgsConstructor @Data @EqualsAndHashCode(callSuper=true) -public class RgbColor extends Color { +public class RgbColor extends Color implements Serializable { private int red; private int green; private int blue; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java index eec2f709..5a6c6a16 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java @@ -2,6 +2,8 @@ import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** * Defines an RGBA encoded color * @see http://www.chartjs.org/docs/latest/general/colors.html @@ -9,8 +11,8 @@ * @author SvenWirz */ @lombok.Data -@EqualsAndHashCode(callSuper=false) -public class RgbaColor extends RgbColor { +@EqualsAndHashCode(callSuper=true) +public class RgbaColor extends RgbColor implements Serializable { private float alpha; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java index b67fa7a1..4537577d 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/SimpleColor.java @@ -1,5 +1,7 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; +import java.io.Serializable; + /** * Defines colors with predefined values. * @@ -7,7 +9,7 @@ * * @author SvenWirz */ -public class SimpleColor extends Color { +public class SimpleColor extends Color implements Serializable { private Color color; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/StringValueColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/StringValueColor.java index 761d6e0b..654cb407 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/StringValueColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/StringValueColor.java @@ -1,6 +1,8 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; +import java.io.Serializable; + /** * Defines the color as a string. * @@ -8,7 +10,7 @@ * * @author SvenWirz */ -public class StringValueColor extends Color { +public class StringValueColor extends Color implements Serializable { private String colorname; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/ConstLabel.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/ConstLabel.java index 6bcc2b60..00d887ee 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/ConstLabel.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/ConstLabel.java @@ -1,5 +1,6 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -9,7 +10,7 @@ * * @author SvenWirz */ -public class ConstLabel extends Label { +public class ConstLabel extends Label implements Serializable { private final String text; public ConstLabel(final String text) { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/DateTimeLabel.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/DateTimeLabel.java index c304400c..e86dd215 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/DateTimeLabel.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/DateTimeLabel.java @@ -1,5 +1,6 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; +import java.io.Serializable; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; @@ -10,7 +11,7 @@ * * @author SvenWirz */ -public class DateTimeLabel extends Label { +public class DateTimeLabel extends Label implements Serializable { private LocalDateTime date; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextLabel.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextLabel.java index a9f7b596..5cded944 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextLabel.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextLabel.java @@ -1,6 +1,9 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; +import java.io.Serializable; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -10,7 +13,7 @@ * * @author SvenWirz */ -public class TextLabel extends Label { +public class TextLabel extends Label implements Serializable { private String text; public TextLabel(String text) { @@ -19,11 +22,11 @@ public TextLabel(String text) { } public static List of(String... texts) { - return Arrays.stream(texts).map(textLabel -> new TextLabel(textLabel)).collect(Collectors.toList()); + return Arrays.stream(texts).map(TextLabel::new).collect(Collectors.toList()); } public static List of(List textList) { - return textList.stream().map(textLabel -> new TextLabel(textLabel)).collect(Collectors.toList()); + return textList.stream().map(TextLabel::new).collect(Collectors.toList()); } public String getText() { @@ -57,12 +60,7 @@ public boolean equals(Object obj) { return false; TextLabel other = (TextLabel) obj; if (text == null) { - if (other.text != null) - return false; - } else if (!text.equals(other.text)) - return false; - return true; + return other.text == null; + } else return text.equals(other.text); } - - } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextListLabel.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextListLabel.java index 4832be3d..6d09b1e7 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextListLabel.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/label/TextListLabel.java @@ -1,5 +1,6 @@ package de.adesso.wickedcharts.chartjs.chartoptions.label; +import java.io.Serializable; import java.util.Arrays; import java.util.List; @@ -8,7 +9,7 @@ * * @author SvenWirz */ -public class TextListLabel extends Label { +public class TextListLabel extends Label implements Serializable { private List textList; public TextListLabel(String...texts) { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/BubbleValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/BubbleValue.java index c4cfaeae..c16647cf 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/BubbleValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/BubbleValue.java @@ -3,6 +3,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines the value type for use in the bubble chart (x and y coordinates and a radius for the bubbles) * Using this class you can create BubbleValues from any other ValueType or primitive types like Double and Integer. @@ -12,8 +14,8 @@ */ @Accessors(chain = true) @lombok.Data -@EqualsAndHashCode(callSuper=false) -public class BubbleValue extends ValueType { +@EqualsAndHashCode(callSuper=true) +public class BubbleValue extends ValueType implements Serializable { private ValueType x; private ValueType y; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ConstValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ConstValue.java index aebb1c1a..59cdb588 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ConstValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/ConstValue.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -17,7 +18,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class ConstValue extends ValueType { +public class ConstValue extends ValueType implements Serializable { private final String value; public ConstValue(final String value) { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java index 533cb481..06208bfa 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DateTimeValue.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.time.LocalDateTime; /** @@ -15,7 +16,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class DateTimeValue extends ValueType{ +public class DateTimeValue extends ValueType implements Serializable { private LocalDateTime value; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DoubleValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DoubleValue.java index 821210ef..a31d826f 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DoubleValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/DoubleValue.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -26,7 +27,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class DoubleValue extends ValueType { +public class DoubleValue extends ValueType implements Serializable { private Double value; public DoubleValue() { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/FloatValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/FloatValue.java index 577f1cd5..5ef6d38a 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/FloatValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/FloatValue.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -25,7 +26,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class FloatValue extends ValueType { +public class FloatValue extends ValueType implements Serializable { private Float value; public FloatValue() { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/IntegerValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/IntegerValue.java index 4e18f315..248f902d 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/IntegerValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/IntegerValue.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -25,7 +26,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class IntegerValue extends ValueType { +public class IntegerValue extends ValueType implements Serializable { private Integer value; public IntegerValue() { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/PointValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/PointValue.java index a6ccfa57..a15a4a65 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/PointValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/PointValue.java @@ -3,6 +3,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** * Defines a ValueType to represent the x and y coordinates in, for example, a scatter chart. * X and y can be any other ValueType or primitive types (Integer, Double). @@ -13,7 +15,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class PointValue extends ValueType { +public class PointValue extends ValueType implements Serializable { private ValueType x; private ValueType y; diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java index 6f93d7e1..cbd19cc5 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java @@ -3,6 +3,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -17,7 +18,7 @@ @Accessors(chain = true) @lombok.Data @EqualsAndHashCode(callSuper = false) -public class StringValue extends ValueType { +public class StringValue extends ValueType implements Serializable { private String value; public StringValue() {} diff --git a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/drilldown/drilldown.js b/highcharts-wrapper/src/main/resources/de/adesso/wickedcharts/highcharts/options/drilldown/drilldown.js similarity index 100% rename from highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/drilldown/drilldown.js rename to highcharts-wrapper/src/main/resources/de/adesso/wickedcharts/highcharts/options/drilldown/drilldown.js diff --git a/showcase/gradle.properties b/showcase/gradle.properties index 3ff4faaa..4177773d 100644 --- a/showcase/gradle.properties +++ b/showcase/gradle.properties @@ -1,3 +1,3 @@ spring_boot_version = 2.0.3.RELEASE spring_version = 5.0.7.RELEASE -wicketcharts_version = 3.2.0-SNAPSHOT \ No newline at end of file +wickedcharts_version = 3.2.0-SNAPSHOT \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-jsf21/build.gradle b/showcase/wicked-charts-showcase-jsf21/build.gradle index c2bd083c..7400342c 100644 --- a/showcase/wicked-charts-showcase-jsf21/build.gradle +++ b/showcase/wicked-charts-showcase-jsf21/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile group: 'de.adesso.wicked-charts', name: 'wicked-charts-jsf21', version: "${wicketcharts_version}" + compile group: 'de.adesso.wicked-charts', name: 'wicked-charts-jsf21', version: "${wickedcharts_version}" compile project(':wicked-charts-showcase-options') compile 'org.slf4j:slf4j-log4j12:1.6.2' compile 'log4j:log4j:1.2.17' diff --git a/showcase/wicked-charts-showcase-options/build.gradle b/showcase/wicked-charts-showcase-options/build.gradle index 45351ca2..712f3b3d 100644 --- a/showcase/wicked-charts-showcase-options/build.gradle +++ b/showcase/wicked-charts-showcase-options/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile group: 'de.adesso.wicked-charts', name: 'highcharts-wrapper', version: "${wicketcharts_version}" + compile group: 'de.adesso.wicked-charts', name: 'highcharts-wrapper', version: "${wickedcharts_version}" testCompile 'junit:junit:4.12' compile 'junit:junit:4.12' } \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket14/build.gradle b/showcase/wicked-charts-showcase-wicket14/build.gradle index de02fcab..c05523d9 100644 --- a/showcase/wicked-charts-showcase-wicket14/build.gradle +++ b/showcase/wicked-charts-showcase-wicket14/build.gradle @@ -7,7 +7,7 @@ dependencies { compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_spring_version}" compile( [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_spring_version}"], - [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket14', version: "${wicketcharts_version}"], + [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket14', version: "${wickedcharts_version}"], ) compile( [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${spring_boot_version}"], @@ -34,7 +34,7 @@ apply plugin: 'org.springframework.boot' processResources { from 'src/main/java' from 'src/main/resources' - filter(ReplaceTokens, tokens: [projectVersion : wicketcharts_version]) + filter(ReplaceTokens, tokens: [projectVersion : wickedcharts_version]) filter(ReplaceTokens, tokens: [wicketVersion : wicket_spring_version]) } diff --git a/showcase/wicked-charts-showcase-wicket15/build.gradle b/showcase/wicked-charts-showcase-wicket15/build.gradle index 468a159e..3fce9730 100644 --- a/showcase/wicked-charts-showcase-wicket15/build.gradle +++ b/showcase/wicked-charts-showcase-wicket15/build.gradle @@ -8,7 +8,7 @@ dependencies { compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_spring_version}" compile( [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_spring_version}"], - [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket15', version: "${wicketcharts_version}"], + [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket15', version: "${wickedcharts_version}"], ) compile( [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${spring_boot_version}"], @@ -35,7 +35,7 @@ apply plugin: 'org.springframework.boot' processResources { from 'src/main/java' from 'src/main/resources' - filter(ReplaceTokens, tokens: [projectVersion : wicketcharts_version]) + filter(ReplaceTokens, tokens: [projectVersion : wickedcharts_version]) filter(ReplaceTokens, tokens: [wicketVersion : wicket_spring_version]) } diff --git a/showcase/wicked-charts-showcase-wicket6/build.gradle b/showcase/wicked-charts-showcase-wicket6/build.gradle index 5544cb02..23f6d68f 100644 --- a/showcase/wicked-charts-showcase-wicket6/build.gradle +++ b/showcase/wicked-charts-showcase-wicket6/build.gradle @@ -9,7 +9,7 @@ dependencies { compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_spring_version}" compile( [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_spring_version}"], - [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket6', version: "${wicketcharts_version}"], + [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket6', version: "${wickedcharts_version}"], ) compile( [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${spring_boot_version}"], @@ -36,7 +36,7 @@ apply plugin: 'org.springframework.boot' processResources { from 'src/main/java' from 'src/main/resources' - filter(ReplaceTokens, tokens: [projectVersion : wicketcharts_version]) + filter(ReplaceTokens, tokens: [projectVersion : wickedcharts_version]) filter(ReplaceTokens, tokens: [wicketVersion : wicket_spring_version]) } diff --git a/showcase/wicked-charts-showcase-wicket7/build.gradle b/showcase/wicked-charts-showcase-wicket7/build.gradle index d6842bba..663374c4 100644 --- a/showcase/wicked-charts-showcase-wicket7/build.gradle +++ b/showcase/wicked-charts-showcase-wicket7/build.gradle @@ -9,7 +9,7 @@ dependencies { compile( [group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'], [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_spring_version}"], - [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket7', version: "${wicketcharts_version}"], + [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket7', version: "${wickedcharts_version}"], ) compile( @@ -37,7 +37,7 @@ apply plugin: 'org.springframework.boot' processResources { from 'src/main/java' from 'src/main/resources' - filter(ReplaceTokens, tokens: [projectVersion : wicketcharts_version]) + filter(ReplaceTokens, tokens: [projectVersion : wickedcharts_version]) filter(ReplaceTokens, tokens: [wicketVersion : wicket_spring_version]) } diff --git a/showcase/wicked-charts-showcase-wicket8/build.gradle b/showcase/wicked-charts-showcase-wicket8/build.gradle index 0b3ca46a..6e0f324a 100644 --- a/showcase/wicked-charts-showcase-wicket8/build.gradle +++ b/showcase/wicked-charts-showcase-wicket8/build.gradle @@ -25,7 +25,7 @@ dependencies { compile( [group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'], [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_spring_version}"], - [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket8', version: "${wicketcharts_version}"], + [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket8', version: "${wickedcharts_version}"], ) compile( [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${spring_boot_version}"], @@ -49,7 +49,7 @@ appengine { // App Engine tasks configuration processResources { from 'src/main/java' from 'src/main/resources' - filter(ReplaceTokens, tokens: [projectVersion : wicketcharts_version]) + filter(ReplaceTokens, tokens: [projectVersion : wickedcharts_version]) filter(ReplaceTokens, tokens: [wicketVersion : wicket_spring_version]) } diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionBehavior.js b/wicket/wicked-charts-wicket6/src/main/resources/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionBehavior.js similarity index 100% rename from wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionBehavior.js rename to wicket/wicked-charts-wicket6/src/main/resources/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionBehavior.js diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionBehavior.js b/wicket/wicked-charts-wicket6/src/main/resources/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionBehavior.js similarity index 100% rename from wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionBehavior.js rename to wicket/wicked-charts-wicket6/src/main/resources/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionBehavior.js diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionBehavior.js b/wicket/wicked-charts-wicket7/src/main/resources/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionBehavior.js similarity index 100% rename from wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionBehavior.js rename to wicket/wicked-charts-wicket7/src/main/resources/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionBehavior.js diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionBehavior.js b/wicket/wicked-charts-wicket7/src/main/resources/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionBehavior.js similarity index 100% rename from wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionBehavior.js rename to wicket/wicked-charts-wicket7/src/main/resources/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionBehavior.js diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptResourceRegistry.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptResourceRegistry.java index 036cd946..2a5b2a8d 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptResourceRegistry.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptResourceRegistry.java @@ -78,7 +78,7 @@ public static JavaScriptResourceRegistry getInstance() { return INSTANCE; } - private RegistryEntry jqueryEntry = new RegistryEntry(JQueryResourceReference.get()); + private RegistryEntry jqueryEntry = new RegistryEntry(JQueryResourceReference.getV2()); private RegistryEntry highchartsEntry = new RegistryEntry(DEFAULT_HIGHCHARTS_URL); diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionBehavior.js b/wicket/wicked-charts-wicket8/src/main/resources/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionBehavior.js similarity index 100% rename from wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionBehavior.js rename to wicket/wicked-charts-wicket8/src/main/resources/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionBehavior.js diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionBehavior.js b/wicket/wicked-charts-wicket8/src/main/resources/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionBehavior.js similarity index 100% rename from wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionBehavior.js rename to wicket/wicked-charts-wicket8/src/main/resources/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionBehavior.js From afa047be15c6161f3676c5b1f0d86595807cb217 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Tue, 7 Aug 2018 15:47:57 +0200 Subject: [PATCH 10/38] app-engine deploy --- .travis.yml | 110 +++++++++++------- ...cked-Charts-Showcase-887cff2298d0.json.enc | Bin 0 -> 2336 bytes 2 files changed, 68 insertions(+), 42 deletions(-) create mode 100644 showcase/Wicked-Charts-Showcase-887cff2298d0.json.enc diff --git a/.travis.yml b/.travis.yml index 1686522b..89af1a75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,54 +1,80 @@ language: java install: true - sudo: false addons: apt: packages: - - oracle-java8-installer - + - oracle-java8-installer before_install: - - chmod +x gradlew +- openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv + -in ./showcase/Wicked-Charts-Showcase-887cff2298d0.json.enc -out ./showcase/Wicked-Charts-Showcase-887cff2298d0.json + -d +- chmod +x ./showcase/gradlew +- chmod +x gradlew +- gcloud version || true +- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi +# Add gcloud to $PATH +- source /home/travis/google-cloud-sdk/path.bash.inc +- gcloud components install app-engine-java +- gcloud config set project wicked-charts-showcase +- gcloud auth activate-service-account --key-file=./showcase/Wicked-Charts-Showcase-887cff2298d0.json +- gcloud version stages: - - name: build - - # only publish snapshots from "master" branch and not in pull requests - - name: snapshot - if: branch = master AND type IN (push) - - # only publish release from "release" branch and not in pull requests - - name: release - if: branch = release AND type IN (push) - +- name: build +- name: snapshot + if: branch = master AND type IN (push) +- name: release + if: branch = release AND type IN (push) +- name: showcase-build +- name: showcase-deploy + if: branch = release OR branch = master AND type IN (push) jobs: include: + - stage: build + script: "./gradlew build" + - stage: snapshot + script: + - "./gradlew chartjs-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew highcharts-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew jsf:wicked-charts-jsf21:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket14:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket15:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket6:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket7:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket8:artifactoryPublish -x test -Dsnapshot=true + -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - stage: release + script: + - "./gradlew chartjs-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew highcharts-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew jsf:wicked-charts-jsf21:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket14:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket15:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket6:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket7:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - "./gradlew wicket:wicked-charts-wicket8:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER + -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER" + - stage: showcase-build + install: skip + script: + - "cd showcase && ./gradlew build" + - stage: showcase-deploy + install: skip + script: + - "cd showcase && ./gradlew appengineDeploy" - # run gradle build - - stage: build - script: ./gradlew build - - # publish snapshot to oss.jfrog.org - - stage: snapshot - script: - - ./gradlew chartjs-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew highcharts-wrapper:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew jsf:wicked-charts-jsf21:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket14:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket15:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket6:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket7:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket8:artifactoryPublish -x test -Dsnapshot=true -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - - # release a new stable version to bintray - - stage: release - script: - - ./gradlew chartjs-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew highcharts-wrapper:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew jsf:wicked-charts-jsf21:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket14:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket15:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket6:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket7:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER - - ./gradlew wicket:wicked-charts-wicket8:bintrayUpload -x test -Dbintray.user=$BINTRAY_USER -Dbintray.key=$BINTRAY_KEY -Dbuild.number=$TRAVIS_BUILD_NUMBER diff --git a/showcase/Wicked-Charts-Showcase-887cff2298d0.json.enc b/showcase/Wicked-Charts-Showcase-887cff2298d0.json.enc new file mode 100644 index 0000000000000000000000000000000000000000..4175d2e42946299a709262e888d41b4019dead72 GIT binary patch literal 2336 zcmV+*3E%ceKDY-^J_fVKyY*4cxnYOdsgMTaMum6XvGN|@_SRNoYyHNjQE^)n%!yV$ zq>khh;n-)b`vTsYWQYI`yfT2nKXZNGYxoHYM{i`I$@3v{?Y&-@nez#sG(biAq_{J3 zmH6cNVM%FYrbK6-*b-bb$wrYDP!9jMnq-q7s|1th(a9Qw;d zH&GauTE>vOF+Y#lHDL6+NprUsiC8*LH9h81;WZoYg#_vuK?*?A-at@}EEj2L()|=y zORkA`<~6KQ6#7JIqA2A&xsX%}5->(tI%gTdkcBi>L||Wsk<8{xIBL>=sVga$AA;_^ zJ0y`Xih5t=!Ib5!NiFYXJKD$%k^SRQoMnu4G_^D0203 zFlyW}E5rzUpk5bF%i~Q616{tRFsH0XbiBmP>UUMpj zFk}YU`}65vSHdU5N@k3P^-wz1nMJ;5U9kUxdymc9f(}E`eq2i4l zK|0%PI5cKsuPq~k(1iOE&`bW*ieJ0ToKE1CkS@cky4)B(l`v!;RP?>-+4!=q)hmn6 zUtKf)tqj^OFLfTWIs|KPP;_>zP!C9W`GmFU0gU#dTa?{sF> z4Hq|POQzTp&4B%kEWi&FFs<_71IG;0tOS+znXW*_??MxOydbP6DcaOR1r(lrAH;P; z`t@S?N7d)txv}xXV?LEs=SYPV=&Yr}z!^x-0KQ6?5#zdSy5spMs(p~5lWt4J0gV9X z*dnAO70yQqfUcQ{)r-tVsEuq<19eT&sI0-$OeT=3?7B!vL;;Y;0+b|RjF?)8ShhGx zkgvwXE52B~$&=yk`8#&49ZrsA>a(meXknDR>~Kl6h0Ul+8;%CLf|$(uFnkF_KnU$@ zL=Zr|qJ>8M&0m3m;|W(r!by*YTEyJuI@?9YF+B@m?{Lv$`sNt{&uoC)S5+Ahap0-Z z@82of$8+AVk@KY>NgBl1+twgKzGmu14!{xf3%*knslP8Y!C`i>D;GidgU~MAjpkR~ zh7M4ZQ)l+4NhDTL@8##hnlf|7BlEgJ zpN2y<+C$##qyPp}slzqb_WB_VowsmCN+nB=JbwaYxz~87n7_djeRoznAWL#;))W*+ zIYX$(`1kHxw-b7hEf?=i_669DCp{S9U8w$mXG~lDR(Nz?8z|Zr&khnf+XL+a?n3W}8MPFK~M%iUk*l8Q{HRBXf~@xz#EXu$TFJ zPPIm0&=MD{KVw4ovwcd6`k6V5p^em*n{Y@ym1GJj6S{%qnz*KunWPL$~I`}{% zc7gs&C6d)puq#=h>%Ah$MWv`U2*mO<6v+U^zn!rq4A@AXtAbW&9Be;jbK?^ED{=@s zs%Tw31i>5)mx&nv3DHCfn&<%My9#U5YMM#Cv-wDUrtvMKjh@S{wUyaS*D__D1=$uq zyGH_ml8`cUb}fWl<-!zaEYvoScv3U9TSc%h$IOtsx%cp8Ru5^>m+4Y9qDbe&q@Q^f zGjUankRuwO%0@Cs9%@Kk90yHsBw+;CY{mla8=rVmyi#{72L_E*MwLM&!|h2(`vIfF zJ>!rb<|OFb7(4-T_ z72f(rQ7Un4-Y^Rf2=FZU3V{ze`JZJ6CG!Wt8Vmid>1TEl8L1TOJJ(!V+f4L|a>jRa zYW`|1LQWJ&nlX>+JLRQxhk zUwb#iem%4zXD`VVg}zQqY6-lu>BgvC>`=J@YeciHd50&Q$fN=G_~I~myvp_g%;7l; znKxl4;jRZZ0T4u+uwEM3v-Iz+1SL||1rbp<5?ct0PQ<#0KY_JJ1Ql)@U)r0=$*gY% zN8!xetXblBmy3?TXl*j?z&}omKKd@dZ$>@K2QNIp)mUJ^l7b8fBLZg_`dj+Ha%@{xq|Jg;^a(rxdRKoqPKbwi z0Qqb{uQY!>9$QFi836v1M6`a)_B}6OIPaGq`*it~mpmf2BiNa{7C;kQS#QiA%rV0L zwq_lH_C3j=iA-jr&a`|HE<2?@o-fCb7*~{_Tp|D*0_56u0;lOJlI6a{0X_ckpt!NC zzSUGsa?$a<*qhkBLK`KDkMisXOlTkmUc%;QpJ5&DYWNSr-n(3+Rn+O?`f>~)kd3-`p8Ti<&_bGG-o%HSXp0+))Wyv GqXpwB-fK?) literal 0 HcmV?d00001 From 1923069fa7df9f3174b27ee18cc40c4d5d811a6c Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Tue, 7 Aug 2018 16:15:28 +0200 Subject: [PATCH 11/38] changed appengine deployed version --- showcase/wicked-charts-showcase-wicket8/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/showcase/wicked-charts-showcase-wicket8/build.gradle b/showcase/wicked-charts-showcase-wicket8/build.gradle index 6e0f324a..903c504c 100644 --- a/showcase/wicked-charts-showcase-wicket8/build.gradle +++ b/showcase/wicked-charts-showcase-wicket8/build.gradle @@ -42,7 +42,9 @@ apply plugin: 'com.google.cloud.tools.appengine' appengine { // App Engine tasks configuration deploy { // deploy configuration - + version = "staging" //replaces the previous version with the current one, so I don't have to remove instances manually + stopPreviousVersion = true + promote = true } } From 5b9f8627294a5c159afcb5090ecb2c7911fbc46e Mon Sep 17 00:00:00 2001 From: Sebastian Trzpiot Date: Thu, 9 Aug 2018 14:33:00 +0200 Subject: [PATCH 12/38] Fix broken links in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4417b427..c47f709f 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Beautiful and interactive JavaScript charts for Java-based web applications. What is Wicked Charts? ====================== -Wicked Charts is a Java wrapper of the [Chart.js](www.chartjs.org) and [Highcharts](www.highcharts.com) JavaScript libraries. +Wicked Charts is a Java wrapper of the [Chart.js](https://www.chartjs.org/) and [Highcharts](https://www.highcharts.com/) JavaScript libraries. The Chart.js and Highcharts libraries provide eye-pleasing charts using HTML5 (see [Highcharts demo](http://www.highcharts.com/demo) and [Chart.js Samples](http://www.chartjs.org/samples/latest/)). With Wicked Charts, you can configure a chart in Java and display it in any web application based on Apache Wicket or JSF. Or you can use the Chart.js or Highcharts Java wrappers to integrate it in web applications built with other java web frameworks. From a3aa2d49fa53f52da310544829e99c287f9a6703 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Thu, 9 Aug 2018 14:48:51 +0200 Subject: [PATCH 13/38] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 89af1a75..a637bab8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ addons: packages: - oracle-java8-installer before_install: -- openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv +- if [ "$TRAVIS_BRANCH" = "master" ] || [ "$TRAVIS_BRANCH" = "release" ]; then openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv -in ./showcase/Wicked-Charts-Showcase-887cff2298d0.json.enc -out ./showcase/Wicked-Charts-Showcase-887cff2298d0.json -d - chmod +x ./showcase/gradlew From 8e15ecf62fe141e971326e2bc9eb1ea78a634c1c Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Thu, 9 Aug 2018 14:51:27 +0200 Subject: [PATCH 14/38] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a637bab8..423c7dd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ before_install: - if [ "$TRAVIS_BRANCH" = "master" ] || [ "$TRAVIS_BRANCH" = "release" ]; then openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv -in ./showcase/Wicked-Charts-Showcase-887cff2298d0.json.enc -out ./showcase/Wicked-Charts-Showcase-887cff2298d0.json -d + fi - chmod +x ./showcase/gradlew - chmod +x gradlew - gcloud version || true From 6bc1b20710047284af210c46136143ee59c14964 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Thu, 9 Aug 2018 14:56:13 +0200 Subject: [PATCH 15/38] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 423c7dd1..ffb5ea65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ addons: before_install: - if [ "$TRAVIS_BRANCH" = "master" ] || [ "$TRAVIS_BRANCH" = "release" ]; then openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv -in ./showcase/Wicked-Charts-Showcase-887cff2298d0.json.enc -out ./showcase/Wicked-Charts-Showcase-887cff2298d0.json - -d + -d; fi - chmod +x ./showcase/gradlew - chmod +x gradlew From d69a7365183efe0e3c25aeec776e8d1393b8955a Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Thu, 9 Aug 2018 15:00:00 +0200 Subject: [PATCH 16/38] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ffb5ea65..277d9ed3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,8 @@ before_install: - source /home/travis/google-cloud-sdk/path.bash.inc - gcloud components install app-engine-java - gcloud config set project wicked-charts-showcase -- gcloud auth activate-service-account --key-file=./showcase/Wicked-Charts-Showcase-887cff2298d0.json +- if [ "$TRAVIS_BRANCH" = "master" ] || [ "$TRAVIS_BRANCH" = "release" ]; then gcloud auth activate-service-account --key-file=./showcase/Wicked-Charts-Showcase-887cff2298d0.json; + fi - gcloud version stages: From 44965e6ca8aaac38977e093746860f7cae61b4d2 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Thu, 9 Aug 2018 15:15:37 +0200 Subject: [PATCH 17/38] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 277d9ed3..1a195de2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ addons: packages: - oracle-java8-installer before_install: -- if [ "$TRAVIS_BRANCH" = "master" ] || [ "$TRAVIS_BRANCH" = "release" ]; then openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv +- if [ ${$TRAVIS_BRANCH} == "master" ] || [ ${$TRAVIS_BRANCH} == "release" ]; then openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv -in ./showcase/Wicked-Charts-Showcase-887cff2298d0.json.enc -out ./showcase/Wicked-Charts-Showcase-887cff2298d0.json -d; fi @@ -18,7 +18,7 @@ before_install: - source /home/travis/google-cloud-sdk/path.bash.inc - gcloud components install app-engine-java - gcloud config set project wicked-charts-showcase -- if [ "$TRAVIS_BRANCH" = "master" ] || [ "$TRAVIS_BRANCH" = "release" ]; then gcloud auth activate-service-account --key-file=./showcase/Wicked-Charts-Showcase-887cff2298d0.json; +- if [ ${$TRAVIS_BRANCH} == "master" ] || [ ${$TRAVIS_BRANCH} == "release" ]; then gcloud auth activate-service-account --key-file=./showcase/Wicked-Charts-Showcase-887cff2298d0.json; fi - gcloud version From bd92642b33b8a19d956b4c4084b3466d66c7f613 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Thu, 9 Aug 2018 15:17:30 +0200 Subject: [PATCH 18/38] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a195de2..64bf35cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ addons: packages: - oracle-java8-installer before_install: -- if [ ${$TRAVIS_BRANCH} == "master" ] || [ ${$TRAVIS_BRANCH} == "release" ]; then openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv +- if [ ${TRAVIS_BRANCH} == "master" ] || [ ${TRAVIS_BRANCH} == "release" ]; then openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv -in ./showcase/Wicked-Charts-Showcase-887cff2298d0.json.enc -out ./showcase/Wicked-Charts-Showcase-887cff2298d0.json -d; fi @@ -18,7 +18,7 @@ before_install: - source /home/travis/google-cloud-sdk/path.bash.inc - gcloud components install app-engine-java - gcloud config set project wicked-charts-showcase -- if [ ${$TRAVIS_BRANCH} == "master" ] || [ ${$TRAVIS_BRANCH} == "release" ]; then gcloud auth activate-service-account --key-file=./showcase/Wicked-Charts-Showcase-887cff2298d0.json; +- if [ ${TRAVIS_BRANCH} == "master" ] || [ ${TRAVIS_BRANCH} == "release" ]; then gcloud auth activate-service-account --key-file=./showcase/Wicked-Charts-Showcase-887cff2298d0.json; fi - gcloud version From 22dc1947dfc7eec9027f4fab7b6757c887c55ee8 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Thu, 9 Aug 2018 15:33:46 +0200 Subject: [PATCH 19/38] fixed travis build --- .travis.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64bf35cc..5e12d0af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,6 @@ addons: packages: - oracle-java8-installer before_install: -- if [ ${TRAVIS_BRANCH} == "master" ] || [ ${TRAVIS_BRANCH} == "release" ]; then openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv - -in ./showcase/Wicked-Charts-Showcase-887cff2298d0.json.enc -out ./showcase/Wicked-Charts-Showcase-887cff2298d0.json - -d; - fi - chmod +x ./showcase/gradlew - chmod +x gradlew - gcloud version || true @@ -18,9 +14,6 @@ before_install: - source /home/travis/google-cloud-sdk/path.bash.inc - gcloud components install app-engine-java - gcloud config set project wicked-charts-showcase -- if [ ${TRAVIS_BRANCH} == "master" ] || [ ${TRAVIS_BRANCH} == "release" ]; then gcloud auth activate-service-account --key-file=./showcase/Wicked-Charts-Showcase-887cff2298d0.json; - fi -- gcloud version stages: - name: build @@ -78,5 +71,5 @@ jobs: - stage: showcase-deploy install: skip script: - - "cd showcase && ./gradlew appengineDeploy" + - "cd showcase && openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv -in Wicked-Charts-Showcase-887cff2298d0.json.enc -out Wicked-Charts-Showcase-887cff2298d0.json -d && gcloud auth activate-service-account --key-file=Wicked-Charts-Showcase-887cff2298d0.json &&./gradlew appengineDeploy" From 5498f9a4ca33e8d668f6a9c0de7ee450ab6857d3 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Thu, 9 Aug 2018 16:15:34 +0200 Subject: [PATCH 20/38] deployed all showcases --- showcase/build.gradle | 9 ++++++++- .../build.gradle | 8 +++++++- .../showcase/HomepageChartJs.html | 18 +++++++++++++---- .../showcase/HomepageHighcharts.html | 18 +++++++++++++---- .../src/main/webapp/WEB-INF/appengine-web.xml | 8 +++++--- .../build.gradle | 8 +++++++- .../showcase/HomepageChartJs.html | 18 +++++++++++++---- .../showcase/HomepageHighcharts.html | 18 +++++++++++++---- .../src/main/webapp/WEB-INF/appengine-web.xml | 8 +++++--- .../build.gradle | 7 +++++++ .../showcase/HomepageChartJs.html | 18 +++++++++++++---- .../showcase/HomepageHighcharts.html | 18 +++++++++++++---- .../src/main/webapp/WEB-INF/appengine-web.xml | 8 +++++--- .../build.gradle | 9 +++++++++ .../showcase/HomepageChartJs.html | 18 +++++++++++++---- .../showcase/HomepageHighcharts.html | 18 +++++++++++++---- .../src/main/webapp/WEB-INF/appengine-web.xml | 8 +++++--- .../build.gradle | 9 ++------- .../showcase/HomepageChartJs.html | 20 ++++++++++++++----- .../showcase/HomepageHighcharts.html | 18 +++++++++++++---- .../src/main/webapp/css/wickedcharts.css | 1 - 21 files changed, 201 insertions(+), 64 deletions(-) diff --git a/showcase/build.gradle b/showcase/build.gradle index 6d1504db..da2cd38b 100644 --- a/showcase/build.gradle +++ b/showcase/build.gradle @@ -7,6 +7,7 @@ buildscript { } } dependencies { + classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.5' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.6.2" } @@ -18,6 +19,7 @@ apply plugin: 'java' apply plugin: 'com.jfrog.artifactory' apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' +apply plugin: 'com.google.cloud.tools.appengine' repositories { mavenLocal() @@ -32,7 +34,12 @@ processResources { } dependencies { - testCompile 'junit:junit:4.12' + compile 'com.google.appengine:appengine-api-1.0-sdk:+' + + testCompile 'junit:junit:4.12' + testCompile 'com.google.appengine:appengine-testing:+' + testCompile 'com.google.appengine:appengine-api-stubs:+' + testCompile 'com.google.appengine:appengine-tools-sdk:+' } // run gradle with "-Dsnapshot=true" to automatically append "-SNAPSHOT" to the version diff --git a/showcase/wicked-charts-showcase-wicket14/build.gradle b/showcase/wicked-charts-showcase-wicket14/build.gradle index c05523d9..f438de23 100644 --- a/showcase/wicked-charts-showcase-wicket14/build.gradle +++ b/showcase/wicked-charts-showcase-wicket14/build.gradle @@ -47,7 +47,13 @@ bootRun { '-Dspring.jpa.hibernate.ddl-auto=update' } - +appengine { // App Engine tasks configuration + deploy { // deploy configuration + version = "staging" //replaces the previous version with the current one, so I don't have to remove instances manually + stopPreviousVersion = true + promote = true + } +} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html index 46342c88..9d64c9ab 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html @@ -116,12 +116,22 @@
-
-
+
+
diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html index 3257617b..9519f658 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html @@ -82,12 +82,22 @@
-
-
+
+
diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/WEB-INF/appengine-web.xml b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/WEB-INF/appengine-web.xml index 2825340e..fcaedaf5 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/WEB-INF/appengine-web.xml +++ b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/WEB-INF/appengine-web.xml @@ -1,14 +1,16 @@ - wicked-charts + wicked-charts-showcase - - 1-3-0-snapshot-20120916 + 3-1-0-snapshot false true + java8 + wicket14 diff --git a/showcase/wicked-charts-showcase-wicket15/build.gradle b/showcase/wicked-charts-showcase-wicket15/build.gradle index 3fce9730..944989f1 100644 --- a/showcase/wicked-charts-showcase-wicket15/build.gradle +++ b/showcase/wicked-charts-showcase-wicket15/build.gradle @@ -48,7 +48,13 @@ bootRun { '-Dspring.jpa.hibernate.ddl-auto=update' } - +appengine { // App Engine tasks configuration + deploy { // deploy configuration + version = "staging" //replaces the previous version with the current one, so I don't have to remove instances manually + stopPreviousVersion = true + promote = true + } +} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html index bb2de483..dd496d59 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html @@ -116,12 +116,22 @@
-
-
+
+
diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html index 8396861c..c3105fe8 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html @@ -82,12 +82,22 @@
-
-
+
+
diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/WEB-INF/appengine-web.xml b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/WEB-INF/appengine-web.xml index 2825340e..b204d370 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/WEB-INF/appengine-web.xml +++ b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/WEB-INF/appengine-web.xml @@ -1,14 +1,16 @@ - wicked-charts + wicked-charts-showcase - - 1-3-0-snapshot-20120916 + 3-1-0-snapshot false true + java8 + wicket15 diff --git a/showcase/wicked-charts-showcase-wicket6/build.gradle b/showcase/wicked-charts-showcase-wicket6/build.gradle index 23f6d68f..59095584 100644 --- a/showcase/wicked-charts-showcase-wicket6/build.gradle +++ b/showcase/wicked-charts-showcase-wicket6/build.gradle @@ -49,6 +49,13 @@ bootRun { '-Dspring.jpa.hibernate.ddl-auto=update' } +appengine { // App Engine tasks configuration + deploy { // deploy configuration + version = "staging-test" //replaces the previous version with the current one, so I don't have to remove instances manually + stopPreviousVersion = true + promote = true + } +} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html index 433facb5..2ae244bb 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html @@ -116,12 +116,22 @@
-
-
+
+
diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html index ce881247..af5a2b25 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html @@ -82,12 +82,22 @@
-
-
+
+
diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/WEB-INF/appengine-web.xml b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/WEB-INF/appengine-web.xml index 0c49ebf1..b03e92d1 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/WEB-INF/appengine-web.xml +++ b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/WEB-INF/appengine-web.xml @@ -1,14 +1,16 @@ - wicked-charts + wicked-charts-showcase - - 1-4-1-snapshot + 3-1-0-snapshot false true + java8 + wicket6 diff --git a/showcase/wicked-charts-showcase-wicket7/build.gradle b/showcase/wicked-charts-showcase-wicket7/build.gradle index 663374c4..b6be567e 100644 --- a/showcase/wicked-charts-showcase-wicket7/build.gradle +++ b/showcase/wicked-charts-showcase-wicket7/build.gradle @@ -52,6 +52,15 @@ bootRun { +appengine { // App Engine tasks configuration + deploy { // deploy configuration + version = "staging-test" //replaces the previous version with the current one, so I don't have to remove instances manually + stopPreviousVersion = true + promote = true + } +} + + diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html index 433facb5..24a8ca35 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html @@ -116,12 +116,22 @@
-
-
+
+
diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html index ce881247..743983ec 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html @@ -82,12 +82,22 @@
-
-
+
+
diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/WEB-INF/appengine-web.xml b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/WEB-INF/appengine-web.xml index 0c49ebf1..b6e39deb 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/WEB-INF/appengine-web.xml +++ b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/WEB-INF/appengine-web.xml @@ -1,14 +1,16 @@ - wicked-charts + wicked-charts-showcase - - 1-4-1-snapshot + 3-1-0-snapshot false true + java8 + wicket7 diff --git a/showcase/wicked-charts-showcase-wicket8/build.gradle b/showcase/wicked-charts-showcase-wicket8/build.gradle index 903c504c..71799f64 100644 --- a/showcase/wicked-charts-showcase-wicket8/build.gradle +++ b/showcase/wicked-charts-showcase-wicket8/build.gradle @@ -11,7 +11,6 @@ buildscript { } dependencies { classpath group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: "${spring_boot_version}" - classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.5' } } @@ -20,7 +19,6 @@ dependencies { compile project(':wicked-charts-showcase-options') testCompile 'junit:junit:4.12' compile 'commons-io:commons-io:2.4' - compile 'com.google.appengine:appengine-api-1.0-sdk:+' compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_spring_version}" compile( [group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'], @@ -31,18 +29,15 @@ dependencies { [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${spring_boot_version}"], ) - testCompile 'com.google.appengine:appengine-testing:+' - testCompile 'com.google.appengine:appengine-api-stubs:+' - testCompile 'com.google.appengine:appengine-tools-sdk:+' + } apply plugin: 'war' apply plugin: 'org.springframework.boot' -apply plugin: 'com.google.cloud.tools.appengine' appengine { // App Engine tasks configuration deploy { // deploy configuration - version = "staging" //replaces the previous version with the current one, so I don't have to remove instances manually + version = "staging-test" //replaces the previous version with the current one, so I don't have to remove instances manually stopPreviousVersion = true promote = true } diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html index 0e36c32d..f1e48d22 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html @@ -68,7 +68,7 @@ width: 10px; height: 10px; margin-right: 10px; - } */ + } @@ -116,12 +116,22 @@
-
-
+
+
diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html index d33f1bff..f8bab1c1 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html @@ -82,12 +82,22 @@
-
-
+
+
diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/wickedcharts.css b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/wickedcharts.css index 2ec8b218..7b0ef58f 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/wickedcharts.css +++ b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/wickedcharts.css @@ -115,4 +115,3 @@ content: "Theme"; } -} \ No newline at end of file From 094caae380304be62aa9621a3642d242af71009d Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Thu, 9 Aug 2018 16:20:50 +0200 Subject: [PATCH 21/38] adjusted travis.yml --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5e12d0af..e79d1d41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,5 +71,12 @@ jobs: - stage: showcase-deploy install: skip script: - - "cd showcase && openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv -in Wicked-Charts-Showcase-887cff2298d0.json.enc -out Wicked-Charts-Showcase-887cff2298d0.json -d && gcloud auth activate-service-account --key-file=Wicked-Charts-Showcase-887cff2298d0.json &&./gradlew appengineDeploy" + - "cd showcase && + openssl aes-256-cbc -K $encrypted_05eb42a9daa3_key -iv $encrypted_05eb42a9daa3_iv -in Wicked-Charts-Showcase-887cff2298d0.json.enc -out Wicked-Charts-Showcase-887cff2298d0.json -d + && gcloud auth activate-service-account --key-file=Wicked-Charts-Showcase-887cff2298d0.json + &&./gradlew wicked-charts-showcase-wicket8:appengineDeploy + &&./gradlew wicked-charts-showcase-wicket7:appengineDeploy + &&./gradlew wicked-charts-showcase-wicket6:appengineDeploy + &&./gradlew wicked-charts-showcase-wicket15:appengineDeploy + &&./gradlew wicked-charts-showcase-wicket14:appengineDeploy" From 065539fb78a1e7201d6147797ceb3fc69d8f7e62 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Thu, 9 Aug 2018 16:57:32 +0200 Subject: [PATCH 22/38] adjusted versions to staging --- showcase/wicked-charts-showcase-wicket6/build.gradle | 2 +- showcase/wicked-charts-showcase-wicket7/build.gradle | 2 +- showcase/wicked-charts-showcase-wicket8/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/showcase/wicked-charts-showcase-wicket6/build.gradle b/showcase/wicked-charts-showcase-wicket6/build.gradle index 59095584..a5bf0503 100644 --- a/showcase/wicked-charts-showcase-wicket6/build.gradle +++ b/showcase/wicked-charts-showcase-wicket6/build.gradle @@ -51,7 +51,7 @@ bootRun { appengine { // App Engine tasks configuration deploy { // deploy configuration - version = "staging-test" //replaces the previous version with the current one, so I don't have to remove instances manually + version = "staging" //replaces the previous version with the current one, so I don't have to remove instances manually stopPreviousVersion = true promote = true } diff --git a/showcase/wicked-charts-showcase-wicket7/build.gradle b/showcase/wicked-charts-showcase-wicket7/build.gradle index b6be567e..a3fafa4f 100644 --- a/showcase/wicked-charts-showcase-wicket7/build.gradle +++ b/showcase/wicked-charts-showcase-wicket7/build.gradle @@ -54,7 +54,7 @@ bootRun { appengine { // App Engine tasks configuration deploy { // deploy configuration - version = "staging-test" //replaces the previous version with the current one, so I don't have to remove instances manually + version = "staging" //replaces the previous version with the current one, so I don't have to remove instances manually stopPreviousVersion = true promote = true } diff --git a/showcase/wicked-charts-showcase-wicket8/build.gradle b/showcase/wicked-charts-showcase-wicket8/build.gradle index 71799f64..fe5cbbdb 100644 --- a/showcase/wicked-charts-showcase-wicket8/build.gradle +++ b/showcase/wicked-charts-showcase-wicket8/build.gradle @@ -37,7 +37,7 @@ apply plugin: 'org.springframework.boot' appengine { // App Engine tasks configuration deploy { // deploy configuration - version = "staging-test" //replaces the previous version with the current one, so I don't have to remove instances manually + version = "staging" //replaces the previous version with the current one, so I don't have to remove instances manually stopPreviousVersion = true promote = true } From e4b0edca7caa873e1cc335e6aaa515327a3075d1 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Mon, 1 Oct 2018 11:31:00 +0200 Subject: [PATCH 23/38] Refactored showcases to reduce amount of duplicate code (#169) * refactored showcases * travis fix * travis fix * travis fix * travis test BROKEN * travis test BROKEN * travis test BROKEN * travis test BROKEN * travis test BROKEN * travis test FIXED --- .travis.yml | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../showcase/jsf/bean/Showcase.java | 2 +- .../build.gradle | 1 + ...eaLineBoundariesChartEndConfiguration.java | 4 +- ...LineBoundariesChartFalseConfiguration.java | 4 +- ...ineBoundariesChartOriginConfiguration.java | 4 +- ...LineBoundariesChartStartConfiguration.java | 5 +- .../BarChartHorizontalConfiguration.java | 4 +- .../BarChartMultiAxisConfiguration.java | 4 +- .../BarChartStackedConfiguration.java | 4 +- .../BarChartStackedGroupConfiguration.java | 4 +- .../BarChartVerticalConfiguration.java | 4 +- .../chartjs}/BubbleChartConfiguration.java | 4 +- .../ComboBarLineChartConfiguration.java | 4 +- .../DataLabellingChartConfiguration.java | 4 +- .../chartjs}/DoughnutChartConfiguration.java | 4 +- .../FilteringLabelsConfiguration.java | 4 +- .../LegendPointStyleConfiguration.java | 4 +- .../LineChartAreaDatasetConfiguration.java | 4 +- .../chartjs}/LineChartBasicConfiguration.java | 5 +- .../LineChartInterpolatedConfiguration.java | 4 +- .../LineChartMultiAxisConfiguration.java | 4 +- .../LineChartProgressBarConfiguration.java | 12 +- .../LineChartStackedConfiguration.java | 4 +- .../LineChartSteppedAfterConfiguration.java | 4 +- .../LineChartSteppedBeforeConfiguration.java | 4 +- ...tWithDifferentPointSizesConfiguration.java | 4 +- .../chartjs}/LineStylesConfiguration.java | 4 +- .../chartjs}/LinearStepSizeConfiguration.java | 4 +- .../LogarithmicLineChartConfiguration.java | 4 +- .../LogarithmicScatterChartConfiguration.java | 4 +- .../options/chartjs}/MinMaxConfiguration.java | 4 +- .../MinMaxSuggestedConfiguration.java | 4 +- .../MultilineLabelsConfiguration.java | 4 +- .../chartjs}/NonNumericConfiguration.java | 4 +- .../OtherRadarChartConfiguration.java | 4 +- .../chartjs}/PieChartConfiguration.java | 4 +- .../chartjs}/PointStylesConfiguration.java | 4 +- .../chartjs}/PolarAreaChartConfiguration.java | 4 +- .../chartjs}/RadarChartConfiguration.java | 4 +- .../chartjs}/ScatterChartConfiguration.java | 4 +- .../ScatterChartMultiAxisConfiguration.java | 4 +- .../chartjs}/TimeComboConfiguration.java | 7 +- .../chartjs}/TimeLineConfiguration.java | 7 +- .../chartjs}/TimePointConfiguration.java | 7 +- .../chartjs}/TimeSeriesConfiguration.java | 9 +- .../chartjs}/TooltipAverageConfiguration.java | 4 +- .../chartjs}/TooltipBorderConfiguration.java | 4 +- .../TooltipCallbacksConfiguration.java | 4 +- .../TooltipHtmlLineConfiguration.java | 4 +- .../chartjs}/TooltipHtmlPieConfiguration.java | 11 +- .../TooltipHtmlPointsConfiguration.java | 11 +- .../chartjs}/TooltipNearestConfiguration.java | 4 +- .../chartjs}/base/ShowcaseConfiguration.java | 19 +- .../GridLineStylesConfiguration.java | 4 +- .../GridLinesBasicConfiguration.java | 4 +- .../GridLinesChartAreaConfiguration.java | 2 +- .../GridLinesDisplayFalseConfiguration.java | 2 +- ...inesDisplayFalseNoBorderConfiguration.java | 2 +- .../GridLinesTicksConfiguration.java | 2 +- .../DatasetIntersectFalseConfiguration.java | 4 +- .../DatasetIntersectTrueConfiguration.java | 5 +- .../IndexIntersectFalseConfiguration.java | 5 +- .../IndexIntersectTrueConfiguration.java | 4 +- .../NearestIntersectFalseConfiguration.java | 5 +- .../NearestIntersectTrueConfiguration.java | 5 +- .../PointIntersectFalseConfiguration.java | 5 +- .../PointIntersectTrueConfiguration.java | 5 +- .../xIntersectFalseConfiguration.java | 6 +- .../xIntersectTrueConfiguration.java | 5 +- .../yIntersectFalseConfiguration.java | 5 +- .../yIntersectTrueConfiguration.java | 4 +- .../LegendPositionBottomConfiguration.java | 2 +- ...LegendPositionChartBasicConfiguration.java | 4 +- .../LegendPositionLeftConfiguration.java | 2 +- .../LegendPositionRightConfiguration.java | 2 +- .../LegendPositionTopConfiguration.java | 2 +- .../base}/AngularGaugeOptions.java | 4 +- .../base}/AreaInvertedAxisOptions.java | 4 +- .../base}/AreaMissingOptions.java | 4 +- .../base}/AreaRangeOptions.java | 4 +- .../base}/AreaSplineOptions.java | 4 +- .../base}/AreaSplineRangeOptions.java | 4 +- .../base}/AreaWithNegativeValuesOptions.java | 4 +- .../base}/BarWithNegativeStackOptions.java | 4 +- .../base}/BasicAreaOptions.java | 4 +- .../base}/BasicBarOptions.java | 4 +- .../base}/BasicColumnOptions.java | 4 +- .../base}/BasicLineOptions.java | 4 +- .../base}/BasicPieOptions.java | 4 +- .../base}/BoxplotChartOptions.java | 4 +- .../base}/BubbleChart3DOptions.java | 4 +- .../base}/BubbleChartOptions.java | 4 +- .../base}/ClickToAddAPointOptions.java | 4 +- .../base}/ColumnRangeOptions.java | 4 +- .../base}/ColumnWithDrilldownOptions.java | 3 +- .../ColumnWithNegativeValuesOptions.java | 4 +- .../base}/ColumnWithRotatedLabelsOptions.java | 4 +- .../{ => highcharts/base}/ComboOptions.java | 4 +- .../{ => highcharts/base}/DonutOptions.java | 4 +- .../base}/DualAxesOptions.java | 4 +- .../base}/ErrorBarOptions.java | 4 +- .../{ => highcharts/base}/FunnelOptions.java | 4 +- .../{ => highcharts/base}/HeatmapOptions.java | 4 +- .../base}/InteractionOptions.java | 4 +- .../base}/LineWithDataLabelsOptions.java | 4 +- .../base}/LogarithmicAxisOptions.java | 4 +- .../base}/MultipleAxesOptions.java | 4 +- .../base}/PercentageAreaOptions.java | 4 +- .../base}/PieWithGradientOptions.java | 4 +- .../base}/PieWithLegendOptions.java | 4 +- .../{ => highcharts/base}/PolarOptions.java | 4 +- .../{ => highcharts/base}/PyramidOptions.java | 4 +- .../base}/ScatterPlotOptions.java | 3 +- .../ScatterWithRegressionLineOptions.java | 4 +- .../base/ShowcaseOptions.java | 2 +- .../base}/SpiderwebOptions.java | 4 +- .../base}/SplineUpdatingOptions.java | 4 +- .../base}/SplineWithInvertedAxisOptions.java | 4 +- .../base}/SplineWithPlotBandsOptions.java | 4 +- .../base}/SplineWithSymbolsOptions.java | 4 +- .../base}/StackedAndGroupedColumnOptions.java | 4 +- .../base}/StackedAreaOptions.java | 4 +- .../base}/StackedBarOptions.java | 4 +- .../base}/StackedColumnOptions.java | 4 +- .../base}/StackedPercentageOptions.java | 4 +- ...TimeDataWithIrregularIntervalsOptions.java | 4 +- .../base}/WindroseOptions.java | 4 +- .../base}/ZoomableTimeSeriesOptions.java | 4 +- .../options/{ => highcharts}/ClassFinder.java | 0 .../{ => highcharts}/OptionsSmokeTest.java | 0 .../wickedcharts/showcase/ChartComponent.java | 2 +- .../showcase/HomepageChartJs.java | 31 +-- .../showcase/HomepageHighcharts.java | 2 +- ...ChartProgressBarConfigurationWicket14.java | 26 +++ .../TimeComboConfigurationWicket14.java | 27 +++ .../TooltipHtmlPieConfigurationWicket14.java | 24 +++ ...ooltipHtmlPointsConfigurationWicket14.java | 24 +++ ...eaLineBoundariesChartEndConfiguration.java | 64 ------ ...LineBoundariesChartFalseConfiguration.java | 62 ------ ...ineBoundariesChartOriginConfiguration.java | 64 ------ ...LineBoundariesChartStartConfiguration.java | 64 ------ .../BarChartHorizontalConfiguration.java | 65 ------- .../BarChartMultiAxisConfiguration.java | 79 -------- .../BarChartStackedConfiguration.java | 87 --------- .../BarChartStackedGroupConfiguration.java | 85 -------- .../BarChartVerticalConfiguration.java | 60 ------ .../BubbleChartConfiguration.java | 102 ---------- .../ComboBarLineChartConfiguration.java | 63 ------ .../DataLabellingChartConfiguration.java | 71 ------- .../DoughnutChartConfiguration.java | 50 ----- .../FilteringLabelsConfiguration.java | 67 ------- .../LegendPointStyleConfiguration.java | 70 ------- .../LineChartAreaDatasetConfiguration.java | 142 -------------- .../LineChartBasicConfiguration.java | 71 ------- .../LineChartInterpolatedConfiguration.java | 83 -------- .../LineChartMultiAxisConfiguration.java | 76 -------- .../LineChartProgressBarConfiguration.java | 94 --------- .../LineChartStackedConfiguration.java | 76 -------- .../LineChartSteppedAfterConfiguration.java | 65 ------- .../LineChartSteppedBeforeConfiguration.java | 64 ------ ...tWithDifferentPointSizesConfiguration.java | 93 --------- .../LineStylesConfiguration.java | 79 -------- .../LinearStepSizeConfiguration.java | 74 ------- .../LogarithmicLineChartConfiguration.java | 71 ------- .../LogarithmicScatterChartConfiguration.java | 84 -------- .../configurations/MinMaxConfiguration.java | 59 ------ .../MinMaxSuggestedConfiguration.java | 59 ------ .../MultilineLabelsConfiguration.java | 68 ------- .../NonNumericConfiguration.java | 66 ------- .../OtherRadarChartConfiguration.java | 64 ------ .../configurations/PieChartConfiguration.java | 44 ----- .../PointStylesConfiguration.java | 181 ----------------- .../PolarAreaChartConfiguration.java | 54 ------ .../RadarChartConfiguration.java | 97 ---------- .../ScatterChartConfiguration.java | 78 -------- .../ScatterChartMultiAxisConfiguration.java | 90 --------- .../TimeComboConfiguration.java | 86 --------- .../TooltipAverageConfiguration.java | 67 ------- .../TooltipBorderConfiguration.java | 61 ------ .../TooltipCallbacksConfiguration.java | 80 -------- .../TooltipHtmlLineConfiguration.java | 63 ------ .../TooltipHtmlPieConfiguration.java | 58 ------ .../TooltipHtmlPointsConfiguration.java | 69 ------- .../TooltipNearestConfiguration.java | 68 ------- .../base/ShowcaseConfiguration.java | 57 ------ .../GridLineStylesConfiguration.java | 74 ------- .../GridLinesChartAreaConfiguration.java | 27 --- .../GridLinesDisplayFalseConfiguration.java | 25 --- ...inesDisplayFalseNoBorderConfiguration.java | 25 --- .../DatasetIntersectTrueConfiguration.java | 66 ------- .../IndexIntersectFalseConfiguration.java | 66 ------- .../NearestIntersectFalseConfiguration.java | 66 ------- .../NearestIntersectTrueConfiguration.java | 66 ------- .../PointIntersectFalseConfiguration.java | 67 ------- .../PointIntersectTrueConfiguration.java | 66 ------- .../xIntersectFalseConfiguration.java | 66 ------- .../xIntersectTrueConfiguration.java | 66 ------- .../yIntersectFalseConfiguration.java | 66 ------- .../LegendPositionLeftConfiguration.java | 28 --- .../LegendPositionRightConfiguration.java | 29 --- .../LegendPositionTopConfiguration.java | 29 --- .../wickedcharts/showcase/ChartComponent.java | 2 +- .../showcase/HomepageChartJs.java | 25 ++- .../showcase/HomepageHighcharts.java | 2 +- ...eaLineBoundariesChartEndConfiguration.java | 65 ------- ...LineBoundariesChartStartConfiguration.java | 65 ------- .../BarChartHorizontalConfiguration.java | 65 ------- .../BarChartMultiAxisConfiguration.java | 80 -------- .../ComboBarLineChartConfiguration.java | 64 ------ .../DataLabellingChartConfiguration.java | 71 ------- .../DoughnutChartConfiguration.java | 50 ----- .../FilteringLabelsConfiguration.java | 68 ------- .../LineChartBasicConfiguration.java | 72 ------- .../LineChartInterpolatedConfiguration.java | 84 -------- .../LineChartMultiAxisConfiguration.java | 76 -------- .../LineChartProgressBarConfiguration.java | 95 --------- .../LineChartStackedConfiguration.java | 77 -------- .../LineChartSteppedBeforeConfiguration.java | 65 ------- ...tWithDifferentPointSizesConfiguration.java | 94 --------- .../LineStylesConfiguration.java | 80 -------- .../LinearStepSizeConfiguration.java | 75 -------- .../LogarithmicScatterChartConfiguration.java | 85 -------- .../configurations/MinMaxConfiguration.java | 60 ------ .../MinMaxSuggestedConfiguration.java | 60 ------ .../MultilineLabelsConfiguration.java | 69 ------- .../OtherRadarChartConfiguration.java | 65 ------- .../PointStylesConfiguration.java | 182 ------------------ .../RadarChartConfiguration.java | 98 ---------- .../ScatterChartConfiguration.java | 79 -------- .../ScatterChartMultiAxisConfiguration.java | 91 --------- .../TimeComboConfiguration.java | 87 --------- .../configurations/TimeLineConfiguration.java | 126 ------------ .../TimePointConfiguration.java | 138 ------------- .../TimeSeriesConfiguration.java | 94 --------- .../TooltipBorderConfiguration.java | 62 ------ .../TooltipCallbacksConfiguration.java | 81 -------- .../TooltipHtmlLineConfiguration.java | 64 ------ .../TooltipHtmlPieConfiguration.java | 59 ------ .../base/ShowcaseConfiguration.java | 57 ------ .../GridLineStylesConfiguration.java | 74 ------- .../GridLinesBasicConfiguration.java | 69 ------- .../GridLinesChartAreaConfiguration.java | 27 --- .../GridLinesDisplayFalseConfiguration.java | 25 --- .../GridLinesTicksConfiguration.java | 28 --- .../DatasetIntersectFalseConfiguration.java | 67 ------- .../DatasetIntersectTrueConfiguration.java | 67 ------- .../IndexIntersectTrueConfiguration.java | 67 ------- .../NearestIntersectTrueConfiguration.java | 67 ------- .../PointIntersectFalseConfiguration.java | 67 ------- .../xIntersectFalseConfiguration.java | 67 ------- .../xIntersectTrueConfiguration.java | 67 ------- .../yIntersectTrueConfiguration.java | 67 ------- .../LegendPositionBottomConfiguration.java | 27 --- ...LegendPositionChartBasicConfiguration.java | 55 ------ .../LegendPositionRightConfiguration.java | 29 --- ...ChartProgressBarConfigurationWicket15.java | 25 +++ .../TimeComboConfigurationWicket15.java | 26 +++ .../TooltipHtmlPieConfigurationWicket15.java | 23 +++ ...ooltipHtmlPointsConfigurationWicket15.java | 23 +++ .../wickedcharts/showcase/ChartComponent.java | 2 +- .../showcase/HomepageChartJs.java | 25 ++- .../showcase/HomepageHighcharts.java | 1 + ...eaLineBoundariesChartEndConfiguration.java | 65 ------- ...LineBoundariesChartFalseConfiguration.java | 63 ------ ...ineBoundariesChartOriginConfiguration.java | 65 ------- .../BarChartHorizontalConfiguration.java | 65 ------- .../BarChartMultiAxisConfiguration.java | 80 -------- .../BarChartStackedConfiguration.java | 88 --------- .../BarChartStackedGroupConfiguration.java | 86 --------- .../BarChartVerticalConfiguration.java | 61 ------ .../BubbleChartConfiguration.java | 103 ---------- .../ComboBarLineChartConfiguration.java | 64 ------ .../LegendPointStyleConfiguration.java | 71 ------- .../LineChartAreaDatasetConfiguration.java | 143 -------------- .../LineChartInterpolatedConfiguration.java | 84 -------- .../LineChartMultiAxisConfiguration.java | 76 -------- .../LineChartProgressBarConfiguration.java | 95 --------- .../LineChartStackedConfiguration.java | 77 -------- .../LineChartSteppedAfterConfiguration.java | 66 ------- .../LinearStepSizeConfiguration.java | 75 -------- .../LogarithmicLineChartConfiguration.java | 72 ------- .../configurations/MinMaxConfiguration.java | 60 ------ .../NonNumericConfiguration.java | 67 ------- .../OtherRadarChartConfiguration.java | 65 ------- .../configurations/PieChartConfiguration.java | 44 ----- .../PointStylesConfiguration.java | 182 ------------------ .../PolarAreaChartConfiguration.java | 55 ------ .../RadarChartConfiguration.java | 98 ---------- .../ScatterChartMultiAxisConfiguration.java | 91 --------- .../configurations/TimeLineConfiguration.java | 126 ------------ .../TimePointConfiguration.java | 138 ------------- .../TimeSeriesConfiguration.java | 94 --------- .../TooltipAverageConfiguration.java | 68 ------- .../TooltipBorderConfiguration.java | 62 ------ .../TooltipHtmlLineConfiguration.java | 64 ------ .../TooltipHtmlPointsConfiguration.java | 69 ------- .../TooltipNearestConfiguration.java | 69 ------- .../GridLinesBasicConfiguration.java | 69 ------- ...inesDisplayFalseNoBorderConfiguration.java | 25 --- .../GridLinesTicksConfiguration.java | 28 --- .../DatasetIntersectFalseConfiguration.java | 67 ------- .../IndexIntersectFalseConfiguration.java | 67 ------- .../IndexIntersectTrueConfiguration.java | 68 ------- .../NearestIntersectFalseConfiguration.java | 67 ------- .../PointIntersectFalseConfiguration.java | 68 ------- .../PointIntersectTrueConfiguration.java | 68 ------- .../yIntersectFalseConfiguration.java | 67 ------- .../yIntersectTrueConfiguration.java | 67 ------- .../LegendPositionBottomConfiguration.java | 27 --- ...LegendPositionChartBasicConfiguration.java | 55 ------ .../LegendPositionLeftConfiguration.java | 28 --- .../LegendPositionTopConfiguration.java | 29 --- .../wickedcharts/showcase/ie/SimplePage.java | 2 +- .../showcase/modalwindow/ChartPanel.java | 2 +- .../options/WicketSplineUpdatingOptions.java | 2 +- ...eChartProgressBarConfigurationWicket6.java | 25 +++ .../TimeComboConfigurationWicket6.java | 37 ++++ .../TooltipHtmlPieConfigurationWicket6.java | 31 +++ ...TooltipHtmlPointsConfigurationWicket6.java | 32 +++ .../wickedcharts/showcase/ChartComponent.java | 2 +- .../showcase/HomepageChartJs.java | 28 ++- .../showcase/HomepageHighcharts.java | 1 + ...eaLineBoundariesChartEndConfiguration.java | 65 ------- ...LineBoundariesChartFalseConfiguration.java | 63 ------ ...ineBoundariesChartOriginConfiguration.java | 65 ------- ...LineBoundariesChartStartConfiguration.java | 65 ------- .../BarChartMultiAxisConfiguration.java | 80 -------- .../BarChartStackedConfiguration.java | 88 --------- .../BarChartStackedGroupConfiguration.java | 86 --------- .../BarChartVerticalConfiguration.java | 61 ------ .../BubbleChartConfiguration.java | 103 ---------- .../ComboBarLineChartConfiguration.java | 64 ------ .../DataLabellingChartConfiguration.java | 71 ------- .../DoughnutChartConfiguration.java | 50 ----- .../FilteringLabelsConfiguration.java | 68 ------- .../LegendPointStyleConfiguration.java | 71 ------- .../LineChartAreaDatasetConfiguration.java | 143 -------------- .../LineChartBasicConfiguration.java | 72 ------- .../LineChartProgressBarConfiguration.java | 95 --------- .../LineChartStackedConfiguration.java | 77 -------- .../LineChartSteppedAfterConfiguration.java | 66 ------- .../LineChartSteppedBeforeConfiguration.java | 65 ------- ...tWithDifferentPointSizesConfiguration.java | 94 --------- .../LineStylesConfiguration.java | 80 -------- .../LinearStepSizeConfiguration.java | 75 -------- .../LogarithmicLineChartConfiguration.java | 72 ------- .../LogarithmicScatterChartConfiguration.java | 85 -------- .../configurations/MinMaxConfiguration.java | 60 ------ .../MinMaxSuggestedConfiguration.java | 60 ------ .../MultilineLabelsConfiguration.java | 69 ------- .../NonNumericConfiguration.java | 67 ------- .../OtherRadarChartConfiguration.java | 65 ------- .../configurations/PieChartConfiguration.java | 44 ----- .../PointStylesConfiguration.java | 182 ------------------ .../PolarAreaChartConfiguration.java | 55 ------ .../RadarChartConfiguration.java | 98 ---------- .../ScatterChartConfiguration.java | 79 -------- .../ScatterChartMultiAxisConfiguration.java | 91 --------- .../TimeComboConfiguration.java | 87 --------- .../configurations/TimeLineConfiguration.java | 126 ------------ .../TimePointConfiguration.java | 138 ------------- .../TimeSeriesConfiguration.java | 94 --------- .../TooltipAverageConfiguration.java | 68 ------- .../TooltipBorderConfiguration.java | 62 ------ .../TooltipCallbacksConfiguration.java | 81 -------- .../TooltipHtmlLineConfiguration.java | 64 ------ .../TooltipHtmlPieConfiguration.java | 59 ------ .../TooltipHtmlPointsConfiguration.java | 69 ------- .../TooltipNearestConfiguration.java | 69 ------- .../base/ShowcaseConfiguration.java | 57 ------ .../GridLineStylesConfiguration.java | 74 ------- .../GridLinesBasicConfiguration.java | 69 ------- .../GridLinesChartAreaConfiguration.java | 27 --- .../GridLinesDisplayFalseConfiguration.java | 25 --- ...inesDisplayFalseNoBorderConfiguration.java | 25 --- .../GridLinesTicksConfiguration.java | 28 --- .../DatasetIntersectFalseConfiguration.java | 68 ------- .../DatasetIntersectTrueConfiguration.java | 68 ------- .../IndexIntersectFalseConfiguration.java | 68 ------- .../IndexIntersectTrueConfiguration.java | 68 ------- .../NearestIntersectFalseConfiguration.java | 68 ------- .../NearestIntersectTrueConfiguration.java | 68 ------- .../PointIntersectTrueConfiguration.java | 68 ------- .../xIntersectFalseConfiguration.java | 68 ------- .../xIntersectTrueConfiguration.java | 68 ------- .../yIntersectFalseConfiguration.java | 68 ------- .../yIntersectTrueConfiguration.java | 68 ------- .../LegendPositionBottomConfiguration.java | 27 --- ...LegendPositionChartBasicConfiguration.java | 55 ------ .../LegendPositionLeftConfiguration.java | 28 --- .../LegendPositionRightConfiguration.java | 29 --- .../LegendPositionTopConfiguration.java | 29 --- .../wickedcharts/showcase/ie/SimplePage.java | 2 +- .../showcase/modalwindow/ChartPanel.java | 2 +- .../options/WicketSplineUpdatingOptions.java | 2 +- ...eChartProgressBarConfigurationWicket7.java | 25 +++ .../TimeComboConfigurationWicket7.java | 26 +++ .../TooltipHtmlPieConfigurationWicket7.java | 23 +++ ...TooltipHtmlPointsConfigurationWicket7.java | 23 +++ .../wickedcharts/showcase/ChartComponent.java | 2 +- .../showcase/HomepageChartJs.java | 27 ++- .../showcase/HomepageHighcharts.java | 1 + ...LineBoundariesChartFalseConfiguration.java | 63 ------ ...ineBoundariesChartOriginConfiguration.java | 65 ------- ...LineBoundariesChartStartConfiguration.java | 65 ------- .../BarChartHorizontalConfiguration.java | 65 ------- .../BarChartStackedConfiguration.java | 88 --------- .../BarChartStackedGroupConfiguration.java | 86 --------- .../BarChartVerticalConfiguration.java | 61 ------ .../BubbleChartConfiguration.java | 103 ---------- .../DataLabellingChartConfiguration.java | 71 ------- .../DoughnutChartConfiguration.java | 50 ----- .../FilteringLabelsConfiguration.java | 68 ------- .../LegendPointStyleConfiguration.java | 71 ------- .../LineChartAreaDatasetConfiguration.java | 143 -------------- .../LineChartBasicConfiguration.java | 72 ------- .../LineChartInterpolatedConfiguration.java | 84 -------- .../LineChartMultiAxisConfiguration.java | 76 -------- .../LineChartSteppedAfterConfiguration.java | 66 ------- .../LineChartSteppedBeforeConfiguration.java | 65 ------- ...tWithDifferentPointSizesConfiguration.java | 94 --------- .../LineStylesConfiguration.java | 80 -------- .../LogarithmicLineChartConfiguration.java | 72 ------- .../LogarithmicScatterChartConfiguration.java | 85 -------- .../MinMaxSuggestedConfiguration.java | 60 ------ .../MultilineLabelsConfiguration.java | 69 ------- .../NonNumericConfiguration.java | 67 ------- .../configurations/PieChartConfiguration.java | 44 ----- .../PolarAreaChartConfiguration.java | 55 ------ .../ScatterChartConfiguration.java | 79 -------- .../TimeComboConfiguration.java | 87 --------- .../configurations/TimeLineConfiguration.java | 126 ------------ .../TimePointConfiguration.java | 138 ------------- .../TimeSeriesConfiguration.java | 94 --------- .../TooltipAverageConfiguration.java | 68 ------- .../TooltipCallbacksConfiguration.java | 81 -------- .../TooltipHtmlPieConfiguration.java | 59 ------ .../TooltipHtmlPointsConfiguration.java | 69 ------- .../TooltipNearestConfiguration.java | 69 ------- .../base/ShowcaseConfiguration.java | 57 ------ .../GridLineStylesConfiguration.java | 74 ------- .../GridLinesBasicConfiguration.java | 69 ------- .../GridLinesChartAreaConfiguration.java | 27 --- .../GridLinesDisplayFalseConfiguration.java | 25 --- ...inesDisplayFalseNoBorderConfiguration.java | 25 --- .../GridLinesTicksConfiguration.java | 28 --- .../DatasetIntersectFalseConfiguration.java | 68 ------- .../DatasetIntersectTrueConfiguration.java | 68 ------- .../IndexIntersectFalseConfiguration.java | 68 ------- .../IndexIntersectTrueConfiguration.java | 68 ------- .../NearestIntersectFalseConfiguration.java | 68 ------- .../NearestIntersectTrueConfiguration.java | 68 ------- .../PointIntersectFalseConfiguration.java | 68 ------- .../PointIntersectTrueConfiguration.java | 68 ------- .../xIntersectFalseConfiguration.java | 68 ------- .../xIntersectTrueConfiguration.java | 68 ------- .../yIntersectFalseConfiguration.java | 68 ------- .../yIntersectTrueConfiguration.java | 68 ------- .../LegendPositionBottomConfiguration.java | 27 --- ...LegendPositionChartBasicConfiguration.java | 55 ------ .../LegendPositionLeftConfiguration.java | 28 --- .../LegendPositionRightConfiguration.java | 29 --- .../LegendPositionTopConfiguration.java | 29 --- .../wickedcharts/showcase/ie/SimplePage.java | 2 +- .../showcase/modalwindow/ChartPanel.java | 2 +- .../options/WicketSplineUpdatingOptions.java | 2 +- ...eChartProgressBarConfigurationWicket8.java | 25 +++ .../TimeComboConfigurationWicket8.java | 26 +++ .../TooltipHtmlPieConfigurationWicket8.java | 23 +++ ...TooltipHtmlPointsConfigurationWicket8.java | 23 +++ 472 files changed, 864 insertions(+), 21209 deletions(-) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/AreaLineBoundariesChartEndConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/AreaLineBoundariesChartFalseConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/AreaLineBoundariesChartOriginConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/AreaLineBoundariesChartStartConfiguration.java (90%) rename showcase/{wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/BarChartHorizontalConfiguration.java (92%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/BarChartMultiAxisConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/BarChartStackedConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/BarChartStackedGroupConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/BarChartVerticalConfiguration.java (92%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/BubbleChartConfiguration.java (96%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/ComboBarLineChartConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/DataLabellingChartConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/DoughnutChartConfiguration.java (91%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/FilteringLabelsConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LegendPointStyleConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LineChartAreaDatasetConfiguration.java (97%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LineChartBasicConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LineChartInterpolatedConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LineChartMultiAxisConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LineChartProgressBarConfiguration.java (88%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LineChartStackedConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LineChartSteppedAfterConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LineChartSteppedBeforeConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LineChartWithDifferentPointSizesConfiguration.java (95%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LineStylesConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LinearStepSizeConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LogarithmicLineChartConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/LogarithmicScatterChartConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/MinMaxConfiguration.java (92%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/MinMaxSuggestedConfiguration.java (92%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/MultilineLabelsConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/NonNumericConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/OtherRadarChartConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/PieChartConfiguration.java (90%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/PointStylesConfiguration.java (97%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/PolarAreaChartConfiguration.java (92%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/RadarChartConfiguration.java (96%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/ScatterChartConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/ScatterChartMultiAxisConfiguration.java (95%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TimeComboConfiguration.java (91%) rename showcase/{wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TimeLineConfiguration.java (95%) rename showcase/{wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TimePointConfiguration.java (95%) rename showcase/{wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TimeSeriesConfiguration.java (90%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TooltipAverageConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TooltipBorderConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TooltipCallbacksConfiguration.java (95%) rename showcase/{wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TooltipHtmlLineConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TooltipHtmlPieConfiguration.java (81%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TooltipHtmlPointsConfiguration.java (83%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/TooltipNearestConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/base/ShowcaseConfiguration.java (71%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/gridlines/GridLineStylesConfiguration.java (93%) rename showcase/{wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/gridlines/GridLinesBasicConfiguration.java (92%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/gridlines/GridLinesChartAreaConfiguration.java (90%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/gridlines/GridLinesDisplayFalseConfiguration.java (90%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java (91%) rename showcase/{wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/gridlines/GridLinesTicksConfiguration.java (91%) rename showcase/{wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/DatasetIntersectFalseConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/DatasetIntersectTrueConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/IndexIntersectFalseConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/IndexIntersectTrueConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/NearestIntersectFalseConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/NearestIntersectTrueConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/PointIntersectFalseConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/PointIntersectTrueConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/xIntersectFalseConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/xIntersectTrueConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/yIntersectFalseConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/interactions/yIntersectTrueConfiguration.java (94%) rename showcase/{wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/legendposition/LegendPositionBottomConfiguration.java (92%) rename showcase/{wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/legendposition/LegendPositionChartBasicConfiguration.java (89%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/legendposition/LegendPositionLeftConfiguration.java (92%) rename showcase/{wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/legendposition/LegendPositionRightConfiguration.java (92%) rename showcase/{wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations => wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs}/legendposition/LegendPositionTopConfiguration.java (92%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/AngularGaugeOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/AreaInvertedAxisOptions.java (94%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/AreaMissingOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/AreaRangeOptions.java (99%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/AreaSplineOptions.java (94%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/AreaSplineRangeOptions.java (93%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/AreaWithNegativeValuesOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/BarWithNegativeStackOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/BasicAreaOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/BasicBarOptions.java (94%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/BasicColumnOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/BasicLineOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/BasicPieOptions.java (94%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/BoxplotChartOptions.java (94%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/BubbleChart3DOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/BubbleChartOptions.java (94%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/ClickToAddAPointOptions.java (92%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/ColumnRangeOptions.java (92%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/ColumnWithDrilldownOptions.java (98%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/ColumnWithNegativeValuesOptions.java (92%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/ColumnWithRotatedLabelsOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/ComboOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/DonutOptions.java (98%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/DualAxesOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/ErrorBarOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/FunnelOptions.java (92%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/HeatmapOptions.java (97%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/InteractionOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/LineWithDataLabelsOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/LogarithmicAxisOptions.java (94%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/MultipleAxesOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/PercentageAreaOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/PieWithGradientOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/PieWithLegendOptions.java (93%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/PolarOptions.java (94%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/PyramidOptions.java (92%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/ScatterPlotOptions.java (99%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/ScatterWithRegressionLineOptions.java (90%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts}/base/ShowcaseOptions.java (86%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/SpiderwebOptions.java (92%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/SplineUpdatingOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/SplineWithInvertedAxisOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/SplineWithPlotBandsOptions.java (97%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/SplineWithSymbolsOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/StackedAndGroupedColumnOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/StackedAreaOptions.java (95%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/StackedBarOptions.java (93%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/StackedColumnOptions.java (94%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/StackedPercentageOptions.java (93%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/TimeDataWithIrregularIntervalsOptions.java (98%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/WindroseOptions.java (96%) rename showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/{ => highcharts/base}/ZoomableTimeSeriesOptions.java (99%) rename showcase/wicked-charts-showcase-options/src/test/java/de/adesso/wickedcharts/showcase/options/{ => highcharts}/ClassFinder.java (100%) rename showcase/wicked-charts-showcase-options/src/test/java/de/adesso/wickedcharts/showcase/options/{ => highcharts}/OptionsSmokeTest.java (100%) create mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/LineChartProgressBarConfigurationWicket14.java create mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TimeComboConfigurationWicket14.java create mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TooltipHtmlPieConfigurationWicket14.java create mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TooltipHtmlPointsConfigurationWicket14.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java create mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket15.java create mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket15.java create mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket15.java create mode 100644 showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket15.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java create mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket6.java create mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket6.java create mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket6.java create mode 100644 showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket6.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java create mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket7.java create mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket7.java create mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket7.java create mode 100644 showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket7.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java create mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket8.java create mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket8.java create mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket8.java create mode 100644 showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket8.java diff --git a/.travis.yml b/.travis.yml index e79d1d41..afc58d73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: - chmod +x ./showcase/gradlew - chmod +x gradlew - gcloud version || true -- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi +- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash > /dev/null; fi # Add gcloud to $PATH - source /home/travis/google-cloud-sdk/path.bash.inc - gcloud components install app-engine-java @@ -67,7 +67,7 @@ jobs: - stage: showcase-build install: skip script: - - "cd showcase && ./gradlew build" + - "./gradlew build publishToMavenLocal -Dsnapshot=true && cd showcase && ./gradlew build" - stage: showcase-deploy install: skip script: diff --git a/showcase/gradle/wrapper/gradle-wrapper.properties b/showcase/gradle/wrapper/gradle-wrapper.properties index 238101c8..5d6532d6 100644 --- a/showcase/gradle/wrapper/gradle-wrapper.properties +++ b/showcase/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/jsf/bean/Showcase.java b/showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/jsf/bean/Showcase.java index a49891f2..3610b2c2 100644 --- a/showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/jsf/bean/Showcase.java +++ b/showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/jsf/bean/Showcase.java @@ -16,7 +16,7 @@ import de.adesso.wickedcharts.highcharts.options.Options; import de.adesso.wickedcharts.highcharts.theme.*; -import de.adesso.wickedcharts.showcase.options.*; +import de.adesso.wickedcharts.showcase.options.highcharts.base.*; import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; diff --git a/showcase/wicked-charts-showcase-options/build.gradle b/showcase/wicked-charts-showcase-options/build.gradle index 712f3b3d..a3a28a63 100644 --- a/showcase/wicked-charts-showcase-options/build.gradle +++ b/showcase/wicked-charts-showcase-options/build.gradle @@ -1,5 +1,6 @@ dependencies { compile group: 'de.adesso.wicked-charts', name: 'highcharts-wrapper', version: "${wickedcharts_version}" + compile group: 'de.adesso.wicked-charts', name: 'chartjs-wrapper', version: "${wickedcharts_version}" testCompile 'junit:junit:4.12' compile 'junit:junit:4.12' } \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartEndConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartEndConfiguration.java index bfcd00db..e2e84e9c 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartEndConfiguration.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartFalseConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartFalseConfiguration.java index 0ac5393a..90a33485 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartFalseConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartOriginConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartOriginConfiguration.java index 7bca9aeb..795c64c8 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartOriginConfiguration.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartStartConfiguration.java similarity index 90% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartStartConfiguration.java index 8905576a..ebd7a081 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/AreaLineBoundariesChartStartConfiguration.java @@ -1,11 +1,12 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartHorizontalConfiguration.java similarity index 92% rename from showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartHorizontalConfiguration.java index 7178325e..a05574af 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartHorizontalConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartMultiAxisConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartMultiAxisConfiguration.java index 1573712e..a7552e3f 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartMultiAxisConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartStackedConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartStackedConfiguration.java index 20a05db5..4410112a 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartStackedConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartStackedGroupConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartStackedGroupConfiguration.java index cd1cea4f..92538e6c 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartStackedGroupConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartVerticalConfiguration.java similarity index 92% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartVerticalConfiguration.java index c0275a09..50a058ec 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BarChartVerticalConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BubbleChartConfiguration.java similarity index 96% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BubbleChartConfiguration.java index ba8c44d3..05922c8e 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/BubbleChartConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.BubbleValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; import java.util.Random; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ComboBarLineChartConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ComboBarLineChartConfiguration.java index 02987aff..68aa1a05 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ComboBarLineChartConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/DataLabellingChartConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/DataLabellingChartConfiguration.java index 999a7bd3..36e4521c 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/DataLabellingChartConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.ArrayList; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/DoughnutChartConfiguration.java similarity index 91% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/DoughnutChartConfiguration.java index 71103554..eb68dd64 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/DoughnutChartConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/FilteringLabelsConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/FilteringLabelsConfiguration.java index bc7a4aa4..b7b619a3 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/FilteringLabelsConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LegendPointStyleConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LegendPointStyleConfiguration.java index 14938151..bde13915 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LegendPointStyleConfiguration.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartAreaDatasetConfiguration.java similarity index 97% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartAreaDatasetConfiguration.java index af88eb23..6c9a1a9f 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartAreaDatasetConfiguration.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; @@ -7,7 +7,7 @@ import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.RelativeIndex; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartBasicConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartBasicConfiguration.java index 49e6c1af..862541fc 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartBasicConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; @@ -69,4 +69,5 @@ public LineChartBasicConfiguration() { ; setOptions(options); } + } diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartInterpolatedConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartInterpolatedConfiguration.java index 5b51dafd..2258a146 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartInterpolatedConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; import java.util.List; diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartMultiAxisConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartMultiAxisConfiguration.java index fe82651a..c88144a3 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartMultiAxisConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfiguration.java similarity index 88% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfiguration.java index cf6f940d..3fe97798 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfiguration.java @@ -1,15 +1,15 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.ArrayList; import java.util.Arrays; + /** * * A sample that shows how a line chart with a progress bar is configured. @@ -86,10 +86,4 @@ public LineChartProgressBarConfiguration() { ; setOptions(options); } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","progressBar",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } } diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartStackedConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartStackedConfiguration.java index 383c7a06..84d63532 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartStackedConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartSteppedAfterConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartSteppedAfterConfiguration.java index cc3da325..74dc829f 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartSteppedAfterConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartSteppedBeforeConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartSteppedBeforeConfiguration.java index 4cfde004..e02a4adf 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartSteppedBeforeConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartWithDifferentPointSizesConfiguration.java similarity index 95% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartWithDifferentPointSizesConfiguration.java index 205fbf11..da90bfb8 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartWithDifferentPointSizesConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; import java.util.Collections; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineStylesConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineStylesConfiguration.java index 0862c977..e39f4066 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineStylesConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LinearStepSizeConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LinearStepSizeConfiguration.java index 84f1afb3..a4d14b88 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LinearStepSizeConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LogarithmicLineChartConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LogarithmicLineChartConfiguration.java index 0924670d..1c531123 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LogarithmicLineChartConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LogarithmicScatterChartConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LogarithmicScatterChartConfiguration.java index db5c6709..15ff2d4a 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LogarithmicScatterChartConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/MinMaxConfiguration.java similarity index 92% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/MinMaxConfiguration.java index 2d826156..b5493663 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/MinMaxConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/MinMaxSuggestedConfiguration.java similarity index 92% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/MinMaxSuggestedConfiguration.java index b83ce23d..1b31a38b 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/MinMaxSuggestedConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/MultilineLabelsConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/MultilineLabelsConfiguration.java index 85e23292..083a7628 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/MultilineLabelsConfiguration.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextListLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/NonNumericConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/NonNumericConfiguration.java index a6f3c0e7..64e3e16e 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/NonNumericConfiguration.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.ConstLabel; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ConstValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/OtherRadarChartConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/OtherRadarChartConfiguration.java index 19e7d5ec..c4d33d80 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/OtherRadarChartConfiguration.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextListLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/PieChartConfiguration.java similarity index 90% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/PieChartConfiguration.java index 9301accc..dbc10306 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/PieChartConfiguration.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.ChartType; import de.adesso.wickedcharts.chartjs.chartoptions.Data; @@ -7,7 +7,7 @@ import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/PointStylesConfiguration.java similarity index 97% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/PointStylesConfiguration.java index 47e62fc4..d12f7544 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/PointStylesConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/PolarAreaChartConfiguration.java similarity index 92% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/PolarAreaChartConfiguration.java index 03d581f6..0d615fc9 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/PolarAreaChartConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/RadarChartConfiguration.java similarity index 96% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/RadarChartConfiguration.java index be74b50d..68fa1426 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/RadarChartConfiguration.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; @@ -7,7 +7,7 @@ import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.RelativeIndex; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ScatterChartConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ScatterChartConfiguration.java index b9cee224..0d3b8293 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ScatterChartConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ScatterChartMultiAxisConfiguration.java similarity index 95% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ScatterChartMultiAxisConfiguration.java index 0dc680a2..46d7ad28 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ScatterChartMultiAxisConfiguration.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbaColor; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfiguration.java similarity index 91% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfiguration.java index 102fdcd0..7a2fbb59 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfiguration.java @@ -1,11 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.Session; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -33,7 +32,7 @@ public TimeComboConfiguration() { List labels = new ArrayList(7); LocalDateTime now = LocalDateTime.now(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM/dd/uuuu HH:mm", Session.get().getLocale()); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM/dd/uuuu HH:mm", getSessionLocale()); for(int i = 0; i < 7; i++) { diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeLineConfiguration.java similarity index 95% rename from showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeLineConfiguration.java index b625b6ef..5e2cbd1f 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeLineConfiguration.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; @@ -7,7 +7,7 @@ import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.StringValue; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ValueType; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.List; import java.util.Random; + /** * Sample which displays a time progression line for datasets. * @@ -33,7 +34,7 @@ public TimeLineConfiguration() { String timeFormat = "MM/DD/YYYY HH:mm"; DateTimeFormatter formatter = DateTimeFormatter.ofPattern(timeFormat); - List dateList = new ArrayList(); + List dateList = new ArrayList<>(); for(int i = 0; i < 7; i++) { dateList.add(new DateTimeLabel(LocalDateTime.of(2018, 1,1, 8+i, 00))); } diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimePointConfiguration.java similarity index 95% rename from showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimePointConfiguration.java index a5001616..e86f5298 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimePointConfiguration.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.colors.StringValueColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.*; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -13,6 +13,7 @@ import java.util.Arrays; import java.util.List; import java.util.Random; + /** * Sample which highlights the important points of the x-axis. * @@ -32,7 +33,7 @@ public TimePointConfiguration() { Data data = new Data(); - List dateList = new ArrayList(); + List dateList = new ArrayList<>(); for(int i = 0; i < 7; i++) { dateList.add(new DateTimeLabel(LocalDateTime.of(2018, 1,1, 8+i, 00))); } diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeSeriesConfiguration.java similarity index 90% rename from showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeSeriesConfiguration.java index 230710e2..091e6496 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeSeriesConfiguration.java @@ -1,15 +1,16 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.DoubleValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + /** * Sample that displays a progression of a dataset. * @@ -48,8 +49,8 @@ public TimeSeriesConfiguration() { LocalDateTime now = LocalDateTime.now(); - List labels = new ArrayList(60); - List randomData = new ArrayList(60); + List labels = new ArrayList<>(60); + List randomData = new ArrayList<>(60); labels.add(new DateTimeLabel(now)); randomData.add(randomBar(30)); diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipAverageConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipAverageConfiguration.java index 25664e15..ddc6f885 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipAverageConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipBorderConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipBorderConfiguration.java index 7271021f..91ca7c1b 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipBorderConfiguration.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbColor; @@ -6,7 +6,7 @@ import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipCallbacksConfiguration.java similarity index 95% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipCallbacksConfiguration.java index 87bb95eb..3fd26c29 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipCallbacksConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlLineConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlLineConfiguration.java index 686cc84b..b6404026 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlLineConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.ArrayList; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfiguration.java similarity index 81% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfiguration.java index f6ba2261..9b66cda6 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfiguration.java @@ -1,11 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.ArrayList; import java.util.Arrays; @@ -50,10 +49,4 @@ public TooltipHtmlPieConfiguration() { ); setOptions(options); } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","pieTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } } diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfiguration.java similarity index 83% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfiguration.java index 247c5dbd..71c9007e 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfiguration.java @@ -1,11 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.ArrayList; import java.util.Arrays; @@ -60,10 +59,4 @@ public TooltipHtmlPointsConfiguration() { ); setOptions(options); } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","pointTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } } diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipNearestConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipNearestConfiguration.java index 81ef4a14..a6be64c2 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipNearestConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations; +package de.adesso.wickedcharts.showcase.options.chartjs; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/base/ShowcaseConfiguration.java similarity index 71% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/base/ShowcaseConfiguration.java index 1ac0c322..2e672f85 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/base/ShowcaseConfiguration.java @@ -1,15 +1,11 @@ -package de.adesso.wickedcharts.showcase.configurations.base; +package de.adesso.wickedcharts.showcase.options.chartjs.base; import de.adesso.wickedcharts.chartjs.ChartConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Scanner; +import java.util.*; /** * The base class for all chart configurations for the showcase @@ -51,8 +47,13 @@ protected String readFile(String fileName) { } - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","defaultTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); + //This should be overriden in cofigurations that require optional markup + public void modfiyIndividualMarkup(Object optionalMarkup){ + + } + + //This should be overriden in cofigurations that require a proper locale + public Locale getSessionLocale(){ + return Locale.GERMANY; } } diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLineStylesConfiguration.java similarity index 93% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLineStylesConfiguration.java index c54b2548..90ebde1e 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLineStylesConfiguration.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; +package de.adesso.wickedcharts.showcase.options.chartjs.gridlines; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.colors.StringValueColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesBasicConfiguration.java similarity index 92% rename from showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesBasicConfiguration.java index ea0a665c..b52fdc81 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesBasicConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; +package de.adesso.wickedcharts.showcase.options.chartjs.gridlines; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesChartAreaConfiguration.java similarity index 90% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesChartAreaConfiguration.java index b45bc4c9..cb8162a4 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesChartAreaConfiguration.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; +package de.adesso.wickedcharts.showcase.options.chartjs.gridlines; import de.adesso.wickedcharts.chartjs.chartoptions.Title; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesDisplayFalseConfiguration.java similarity index 90% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesDisplayFalseConfiguration.java index 171a41fe..a0fe0c07 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesDisplayFalseConfiguration.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; +package de.adesso.wickedcharts.showcase.options.chartjs.gridlines; import de.adesso.wickedcharts.chartjs.chartoptions.Title; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java similarity index 91% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java index 2893b59a..5a81a878 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; +package de.adesso.wickedcharts.showcase.options.chartjs.gridlines; import de.adesso.wickedcharts.chartjs.chartoptions.Title; diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesTicksConfiguration.java similarity index 91% rename from showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesTicksConfiguration.java index 9c05bfd8..9f30262b 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/gridlines/GridLinesTicksConfiguration.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; +package de.adesso.wickedcharts.showcase.options.chartjs.gridlines; import de.adesso.wickedcharts.chartjs.chartoptions.Title; diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/DatasetIntersectFalseConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/DatasetIntersectFalseConfiguration.java index 14418fb1..85d8041e 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/DatasetIntersectFalseConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; /** diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/DatasetIntersectTrueConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/DatasetIntersectTrueConfiguration.java index e6fd9d62..4ed25f83 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/DatasetIntersectTrueConfiguration.java @@ -1,13 +1,12 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; - /** * If the intersect setting is true, the first intersecting item is used to determine the index in the data. * diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/IndexIntersectFalseConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/IndexIntersectFalseConfiguration.java index 7e4409cc..1786c4ff 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/IndexIntersectFalseConfiguration.java @@ -1,13 +1,12 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; - /** * If intersect false the nearest item, in the x direction, is used to determine the index. * diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/IndexIntersectTrueConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/IndexIntersectTrueConfiguration.java index b3a53259..f9f0301a 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/IndexIntersectTrueConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; /** diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/NearestIntersectFalseConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/NearestIntersectFalseConfiguration.java index 34c6fb77..0542f46c 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/NearestIntersectFalseConfiguration.java @@ -1,13 +1,12 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; - /** * If intersect is false, this is not triggered when the mouse position intersects an item in the graph. * diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/NearestIntersectTrueConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/NearestIntersectTrueConfiguration.java index cc445895..9f80315d 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/NearestIntersectTrueConfiguration.java @@ -1,13 +1,12 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; - /** * If intersect is true, this is only triggered when the mouse position intersects an item in the graph. * diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/PointIntersectFalseConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/PointIntersectFalseConfiguration.java index 91cec1ba..a2c41c95 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/PointIntersectFalseConfiguration.java @@ -1,11 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/PointIntersectTrueConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/PointIntersectTrueConfiguration.java index 3cd2b690..17fa0718 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/PointIntersectTrueConfiguration.java @@ -1,13 +1,12 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; - /** * Finds all of the items that intersect the point. * diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/xIntersectFalseConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/xIntersectFalseConfiguration.java index 58113ff7..2dd738d0 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/xIntersectFalseConfiguration.java @@ -1,14 +1,12 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; - /** * Does not return all items that would intersect based on the X coordinate of the position only. * diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/xIntersectTrueConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/xIntersectTrueConfiguration.java index f4f97476..65b8fe1a 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/xIntersectTrueConfiguration.java @@ -1,13 +1,12 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; - /** * Returns all items that would intersect based on the X coordinate of the position only. * diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/yIntersectFalseConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/yIntersectFalseConfiguration.java index f48e7a2e..e2b118bd 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/yIntersectFalseConfiguration.java @@ -1,13 +1,12 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; - /** * Does not return all items that would intersect based on the Y coordinate of the position. * diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/yIntersectTrueConfiguration.java similarity index 94% rename from showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/yIntersectTrueConfiguration.java index e64893c6..9fff4a96 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/interactions/yIntersectTrueConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; +package de.adesso.wickedcharts.showcase.options.chartjs.interactions; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; /** diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionBottomConfiguration.java similarity index 92% rename from showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionBottomConfiguration.java index 838e8af0..271ff13e 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionBottomConfiguration.java @@ -1,5 +1,5 @@ -package de.adesso.wickedcharts.showcase.configurations.legendposition; +package de.adesso.wickedcharts.showcase.options.chartjs.legendposition; import de.adesso.wickedcharts.chartjs.chartoptions.Legend; import de.adesso.wickedcharts.chartjs.chartoptions.Position; diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionChartBasicConfiguration.java similarity index 89% rename from showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionChartBasicConfiguration.java index 7f90d7e8..02d5e47f 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionChartBasicConfiguration.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.configurations.legendposition; +package de.adesso.wickedcharts.showcase.options.chartjs.legendposition; import de.adesso.wickedcharts.chartjs.chartoptions.*; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import java.util.Arrays; /** diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionLeftConfiguration.java similarity index 92% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionLeftConfiguration.java index 910e34f8..ebcf6f30 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionLeftConfiguration.java @@ -1,5 +1,5 @@ -package de.adesso.wickedcharts.showcase.configurations.legendposition; +package de.adesso.wickedcharts.showcase.options.chartjs.legendposition; import de.adesso.wickedcharts.chartjs.chartoptions.Legend; import de.adesso.wickedcharts.chartjs.chartoptions.Position; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionRightConfiguration.java similarity index 92% rename from showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionRightConfiguration.java index 38dcecc9..e2116927 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionRightConfiguration.java @@ -1,5 +1,5 @@ -package de.adesso.wickedcharts.showcase.configurations.legendposition; +package de.adesso.wickedcharts.showcase.options.chartjs.legendposition; import de.adesso.wickedcharts.chartjs.chartoptions.Legend; import de.adesso.wickedcharts.chartjs.chartoptions.Position; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionTopConfiguration.java similarity index 92% rename from showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionTopConfiguration.java index 711c225c..eae5c6d7 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/legendposition/LegendPositionTopConfiguration.java @@ -1,5 +1,5 @@ -package de.adesso.wickedcharts.showcase.configurations.legendposition; +package de.adesso.wickedcharts.showcase.options.chartjs.legendposition; import de.adesso.wickedcharts.chartjs.chartoptions.Legend; import de.adesso.wickedcharts.chartjs.chartoptions.Position; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AngularGaugeOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AngularGaugeOptions.java similarity index 95% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AngularGaugeOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AngularGaugeOptions.java index 0614b523..9f0c1633 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AngularGaugeOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AngularGaugeOptions.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.PixelOrPercent.Unit; @@ -6,7 +6,7 @@ import de.adesso.wickedcharts.highcharts.options.color.LinearGradient; import de.adesso.wickedcharts.highcharts.options.color.NullColor; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class AngularGaugeOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaInvertedAxisOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaInvertedAxisOptions.java similarity index 94% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaInvertedAxisOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaInvertedAxisOptions.java index 825eb9c6..40a9b24b 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaInvertedAxisOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaInvertedAxisOptions.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaMissingOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaMissingOptions.java similarity index 95% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaMissingOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaMissingOptions.java index d25e6b60..6572172e 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaMissingOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaMissingOptions.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaRangeOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaRangeOptions.java similarity index 99% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaRangeOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaRangeOptions.java index 24040c91..a472ab5f 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaRangeOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaRangeOptions.java @@ -1,9 +1,9 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.RangeCoordinate; import de.adesso.wickedcharts.highcharts.options.series.RangeSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class AreaRangeOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaSplineOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaSplineOptions.java similarity index 94% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaSplineOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaSplineOptions.java index 1437a2e2..0d11c5e1 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaSplineOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaSplineOptions.java @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.color.RgbaColor; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; import java.util.Collections; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaSplineRangeOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaSplineRangeOptions.java similarity index 93% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaSplineRangeOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaSplineRangeOptions.java index d4e942a7..83212573 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaSplineRangeOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaSplineRangeOptions.java @@ -1,8 +1,8 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.CoordinatesSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class AreaSplineRangeOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaWithNegativeValuesOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaWithNegativeValuesOptions.java similarity index 95% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaWithNegativeValuesOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaWithNegativeValuesOptions.java index c802eb14..cb1df892 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/AreaWithNegativeValuesOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/AreaWithNegativeValuesOptions.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.Series; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BarWithNegativeStackOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BarWithNegativeStackOptions.java similarity index 95% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BarWithNegativeStackOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BarWithNegativeStackOptions.java index 0b631f59..76fd5809 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BarWithNegativeStackOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BarWithNegativeStackOptions.java @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; import java.util.List; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicAreaOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicAreaOptions.java similarity index 96% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicAreaOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicAreaOptions.java index 5d80b78c..2995cde8 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicAreaOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicAreaOptions.java @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.Symbol.PredefinedSymbol; import de.adesso.wickedcharts.highcharts.options.series.Series; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicBarOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicBarOptions.java similarity index 94% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicBarOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicBarOptions.java index 79b3a1ca..61983cb7 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicBarOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicBarOptions.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class BasicBarOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicColumnOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicColumnOptions.java similarity index 95% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicColumnOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicColumnOptions.java index 75064867..20d60218 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicColumnOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicColumnOptions.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class BasicColumnOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicLineOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicLineOptions.java similarity index 96% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicLineOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicLineOptions.java index 0ea342e0..0db688eb 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicLineOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicLineOptions.java @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.series.Series; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; import java.util.Collections; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicPieOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicPieOptions.java similarity index 94% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicPieOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicPieOptions.java index d75cfd9c..ae6641e5 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BasicPieOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BasicPieOptions.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; @@ -20,7 +20,7 @@ import de.adesso.wickedcharts.highcharts.options.functions.PercentageFormatter; import de.adesso.wickedcharts.highcharts.options.series.Point; import de.adesso.wickedcharts.highcharts.options.series.PointSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class BasicPieOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BoxplotChartOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BoxplotChartOptions.java similarity index 94% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BoxplotChartOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BoxplotChartOptions.java index c7bdcc09..f2739915 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BoxplotChartOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BoxplotChartOptions.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.ColorReference; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.series.Box; import de.adesso.wickedcharts.highcharts.options.series.BoxSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.ArrayList; import java.util.List; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChart3DOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BubbleChart3DOptions.java similarity index 95% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChart3DOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BubbleChart3DOptions.java index 2948e4f2..c0dfb428 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChart3DOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BubbleChart3DOptions.java @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.RadialGradient; import de.adesso.wickedcharts.highcharts.options.color.RgbaColor; import de.adesso.wickedcharts.highcharts.options.series.BubbleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class BubbleChart3DOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChartOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BubbleChartOptions.java similarity index 94% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChartOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BubbleChartOptions.java index 38514abb..f7c60e68 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/BubbleChartOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/BubbleChartOptions.java @@ -12,14 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.ChartOptions; import de.adesso.wickedcharts.highcharts.options.SeriesType; import de.adesso.wickedcharts.highcharts.options.Title; import de.adesso.wickedcharts.highcharts.options.ZoomType; import de.adesso.wickedcharts.highcharts.options.series.BubbleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class BubbleChartOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ClickToAddAPointOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ClickToAddAPointOptions.java similarity index 92% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ClickToAddAPointOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ClickToAddAPointOptions.java index 5d878614..9370920a 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ClickToAddAPointOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ClickToAddAPointOptions.java @@ -1,11 +1,11 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.functions.AddPointFunction; import de.adesso.wickedcharts.highcharts.options.functions.RemovePointFunction; import de.adesso.wickedcharts.highcharts.options.series.CoordinatesSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnRangeOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnRangeOptions.java similarity index 92% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnRangeOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnRangeOptions.java index 14c5c5ed..408cd5fc 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnRangeOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnRangeOptions.java @@ -1,8 +1,8 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.CoordinatesSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class ColumnRangeOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithDrilldownOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnWithDrilldownOptions.java similarity index 98% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithDrilldownOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnWithDrilldownOptions.java index c6dfeae2..5a57ac60 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithDrilldownOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnWithDrilldownOptions.java @@ -12,14 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.color.HighchartsColor; import de.adesso.wickedcharts.highcharts.options.drilldown.DrilldownPoint; import de.adesso.wickedcharts.highcharts.options.series.PointSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; public class ColumnWithDrilldownOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithNegativeValuesOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnWithNegativeValuesOptions.java similarity index 92% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithNegativeValuesOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnWithNegativeValuesOptions.java index 37203c57..e4e62f0f 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithNegativeValuesOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnWithNegativeValuesOptions.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.functions.DefaultFormatter; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class ColumnWithNegativeValuesOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithRotatedLabelsOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnWithRotatedLabelsOptions.java similarity index 96% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithRotatedLabelsOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnWithRotatedLabelsOptions.java index 09f5a216..372c92a4 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ColumnWithRotatedLabelsOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ColumnWithRotatedLabelsOptions.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class ColumnWithRotatedLabelsOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ComboOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ComboOptions.java similarity index 96% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ComboOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ComboOptions.java index e1f161bc..ee6f0b42 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ComboOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ComboOptions.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; @@ -20,7 +20,7 @@ import de.adesso.wickedcharts.highcharts.options.series.PointSeries; import de.adesso.wickedcharts.highcharts.options.series.Series; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/DonutOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/DonutOptions.java similarity index 98% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/DonutOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/DonutOptions.java index 40dc9fd0..95d929e6 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/DonutOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/DonutOptions.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.PixelOrPercent.Unit; @@ -21,7 +21,7 @@ import de.adesso.wickedcharts.highcharts.options.color.HighchartsColor; import de.adesso.wickedcharts.highcharts.options.series.Point; import de.adesso.wickedcharts.highcharts.options.series.PointSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.ArrayList; import java.util.List; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/DualAxesOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/DualAxesOptions.java similarity index 95% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/DualAxesOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/DualAxesOptions.java index ac29f20e..8eeec98c 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/DualAxesOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/DualAxesOptions.java @@ -1,9 +1,9 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class DualAxesOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ErrorBarOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ErrorBarOptions.java similarity index 96% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ErrorBarOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ErrorBarOptions.java index 83574a00..9b802ec2 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ErrorBarOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ErrorBarOptions.java @@ -1,10 +1,10 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.Coordinate; import de.adesso.wickedcharts.highcharts.options.series.CoordinatesSeries; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class ErrorBarOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/FunnelOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/FunnelOptions.java similarity index 92% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/FunnelOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/FunnelOptions.java index 034adf8e..797aa40b 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/FunnelOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/FunnelOptions.java @@ -1,9 +1,9 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.Coordinate; import de.adesso.wickedcharts.highcharts.options.series.CustomCoordinatesSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class FunnelOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/HeatmapOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/HeatmapOptions.java similarity index 97% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/HeatmapOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/HeatmapOptions.java index de29f736..e4a564f6 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/HeatmapOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/HeatmapOptions.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; @@ -6,7 +6,7 @@ import de.adesso.wickedcharts.highcharts.options.heatmap.ColorAxis; import de.adesso.wickedcharts.highcharts.options.series.Custom3DCoordinateSeries; import de.adesso.wickedcharts.highcharts.options.series.ThreeDCoordinate; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class HeatmapOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/InteractionOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/InteractionOptions.java similarity index 96% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/InteractionOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/InteractionOptions.java index e3848c8d..56a33243 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/InteractionOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/InteractionOptions.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; @@ -20,7 +20,7 @@ import de.adesso.wickedcharts.highcharts.options.interaction.InteractionFunction; import de.adesso.wickedcharts.highcharts.options.series.Point; import de.adesso.wickedcharts.highcharts.options.series.PointSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class InteractionOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LineWithDataLabelsOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/LineWithDataLabelsOptions.java similarity index 95% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LineWithDataLabelsOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/LineWithDataLabelsOptions.java index 5c0bfcf5..5a545a00 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LineWithDataLabelsOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/LineWithDataLabelsOptions.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.Series; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LogarithmicAxisOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/LogarithmicAxisOptions.java similarity index 94% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LogarithmicAxisOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/LogarithmicAxisOptions.java index 6c41cf3c..f954bdd3 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/LogarithmicAxisOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/LogarithmicAxisOptions.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.Series; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/MultipleAxesOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/MultipleAxesOptions.java similarity index 96% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/MultipleAxesOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/MultipleAxesOptions.java index 48b49de8..c3ec82eb 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/MultipleAxesOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/MultipleAxesOptions.java @@ -1,9 +1,9 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class MultipleAxesOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PercentageAreaOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PercentageAreaOptions.java similarity index 95% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PercentageAreaOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PercentageAreaOptions.java index 306afe51..96a2e4ea 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PercentageAreaOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PercentageAreaOptions.java @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithGradientOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PieWithGradientOptions.java similarity index 96% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithGradientOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PieWithGradientOptions.java index 142bbabb..de61420f 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithGradientOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PieWithGradientOptions.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; @@ -22,7 +22,7 @@ import de.adesso.wickedcharts.highcharts.options.functions.PercentageFormatter; import de.adesso.wickedcharts.highcharts.options.series.Point; import de.adesso.wickedcharts.highcharts.options.series.PointSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class PieWithGradientOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithLegendOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PieWithLegendOptions.java similarity index 93% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithLegendOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PieWithLegendOptions.java index 5f0d4f90..eb002400 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PieWithLegendOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PieWithLegendOptions.java @@ -12,13 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.NullColor; import de.adesso.wickedcharts.highcharts.options.series.Point; import de.adesso.wickedcharts.highcharts.options.series.PointSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class PieWithLegendOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PolarOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PolarOptions.java similarity index 94% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PolarOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PolarOptions.java index a943adb9..12dcdf9e 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PolarOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PolarOptions.java @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.Arrays; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PyramidOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PyramidOptions.java similarity index 92% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PyramidOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PyramidOptions.java index 3e6e0c6d..eb7b886c 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/PyramidOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/PyramidOptions.java @@ -1,9 +1,9 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.Coordinate; import de.adesso.wickedcharts.highcharts.options.series.CustomCoordinatesSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class PyramidOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ScatterPlotOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ScatterPlotOptions.java similarity index 99% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ScatterPlotOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ScatterPlotOptions.java index 54da143b..2edb47bb 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ScatterPlotOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ScatterPlotOptions.java @@ -12,14 +12,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; import de.adesso.wickedcharts.highcharts.options.color.RgbaColor; import de.adesso.wickedcharts.highcharts.options.series.Coordinate; import de.adesso.wickedcharts.highcharts.options.series.CoordinatesSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; import java.util.ArrayList; import java.util.List; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ScatterWithRegressionLineOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ScatterWithRegressionLineOptions.java similarity index 90% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ScatterWithRegressionLineOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ScatterWithRegressionLineOptions.java index b12a31ae..8f0ca0f4 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/ScatterWithRegressionLineOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ScatterWithRegressionLineOptions.java @@ -1,9 +1,9 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.CoordinatesSeries; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class ScatterWithRegressionLineOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/base/ShowcaseOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ShowcaseOptions.java similarity index 86% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/base/ShowcaseOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ShowcaseOptions.java index 20153eda..99b940fc 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/base/ShowcaseOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/ShowcaseOptions.java @@ -1,4 +1,4 @@ -package de.adesso.wickedcharts.showcase.options.base; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.Options; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SpiderwebOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/SpiderwebOptions.java similarity index 92% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SpiderwebOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/SpiderwebOptions.java index 0b9b7ae3..50bffe72 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SpiderwebOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/SpiderwebOptions.java @@ -1,9 +1,9 @@ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.PixelOrPercent.Unit; import de.adesso.wickedcharts.highcharts.options.series.SimpleSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; public class SpiderwebOptions extends ShowcaseOptions { diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineUpdatingOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/SplineUpdatingOptions.java similarity index 96% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineUpdatingOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/SplineUpdatingOptions.java index d12c3aa8..81be6e60 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineUpdatingOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/SplineUpdatingOptions.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.HexColor; @@ -20,7 +20,7 @@ import de.adesso.wickedcharts.highcharts.options.livedata.LiveDataSeries; import de.adesso.wickedcharts.highcharts.options.livedata.LiveDataUpdateEvent; import de.adesso.wickedcharts.highcharts.options.series.Point; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import java.util.ArrayList; import java.util.Collections; diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithInvertedAxisOptions.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/SplineWithInvertedAxisOptions.java similarity index 95% rename from showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithInvertedAxisOptions.java rename to showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/SplineWithInvertedAxisOptions.java index cd6e3a60..6302d68d 100644 --- a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/SplineWithInvertedAxisOptions.java +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/highcharts/base/SplineWithInvertedAxisOptions.java @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.adesso.wickedcharts.showcase.options; +package de.adesso.wickedcharts.showcase.options.highcharts.base; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.series.CoordinatesSeries; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; /** * Demo of the same chart displayed in the Highcharts Demo at getChartFromParams(final PageParameters params) { String chartString; List config = new ArrayList<>(); - //Get the parameters of the page - //Set pairs = params.entrySet(); - //If the showcase is started without any parameters //set the parameters to lineBasic and give us a line Chart - if(params.keySet().size() == 0){ + if(params.keySet().isEmpty()){ PageParameters temp = new PageParameters(); temp.add("chart", "lineBasic"); setResponsePage(HomepageChartJs.class, temp); @@ -314,7 +315,7 @@ private List getChartFromParams(final PageParameters params) { break; case "timeCombo": - config.add(new Chart("chart", new TimeComboConfiguration())); + config.add(new Chart("chart", new TimeComboConfigurationWicket14())); break; case "gridLines": @@ -358,8 +359,8 @@ private List getChartFromParams(final PageParameters params) { case "tooltipHtml": config.add(new Chart("chart", new TooltipHtmlLineConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPieConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPointsConfiguration())); + config.add(new Chart("chart", new TooltipHtmlPieConfigurationWicket14())); + config.add(new Chart("chart", new TooltipHtmlPointsConfigurationWicket14())); break; case "bubble": @@ -367,7 +368,7 @@ private List getChartFromParams(final PageParameters params) { break; case "lineProgressBar": - config.add(new Chart("chart", new LineChartProgressBarConfiguration())); + config.add(new Chart("chart", new LineChartProgressBarConfigurationWicket14())); break; case "dataLabelling": diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index 3cc07551..a4218e38 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -17,7 +17,7 @@ import de.adesso.wickedcharts.showcase.links.ChartjsShowcaseLink; import de.adesso.wickedcharts.showcase.links.HighchartsShowcaseLink; import de.adesso.wickedcharts.showcase.links.UpdateHighchartLink; -import de.adesso.wickedcharts.showcase.options.*; +import de.adesso.wickedcharts.showcase.options.highcharts.base.*; import de.adesso.wickedcharts.wicket14.highcharts.Chart; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.WebPage; diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/LineChartProgressBarConfigurationWicket14.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/LineChartProgressBarConfigurationWicket14.java new file mode 100644 index 00000000..dbbb81d5 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/LineChartProgressBarConfigurationWicket14.java @@ -0,0 +1,26 @@ +package de.adesso.wickedcharts.showcase.chartjs; + +import de.adesso.wickedcharts.showcase.options.chartjs.LineChartProgressBarConfiguration; +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * + * A sample that shows how a line chart with a progress bar is configured. + * + * @see http://www.chartjs.org/samples/latest/advanced/progress-bar.html + * + * @author maximAtanasov + */ +@SuppressWarnings("serial") +public class LineChartProgressBarConfigurationWicket14 extends LineChartProgressBarConfiguration { + + public LineChartProgressBarConfigurationWicket14() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","progressBar", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TimeComboConfigurationWicket14.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TimeComboConfigurationWicket14.java new file mode 100644 index 00000000..f98651a9 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TimeComboConfigurationWicket14.java @@ -0,0 +1,27 @@ +package de.adesso.wickedcharts.showcase.chartjs; + +import de.adesso.wickedcharts.showcase.options.chartjs.TimeComboConfiguration; +import org.apache.wicket.Session; + +import java.util.Locale; + +/** + * Sample which displays a bar chart for the data distribution and a line chart for the time progression of datasets. + * + * @see http://www.chartjs.org/samples/latest/scales/time/combo.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TimeComboConfigurationWicket14 extends TimeComboConfiguration { + + + public TimeComboConfigurationWicket14() { + super(); + } + + @Override + public Locale getSessionLocale(){ + return Session.get().getLocale(); + } +} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TooltipHtmlPieConfigurationWicket14.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TooltipHtmlPieConfigurationWicket14.java new file mode 100644 index 00000000..eeeff35f --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TooltipHtmlPieConfigurationWicket14.java @@ -0,0 +1,24 @@ +package de.adesso.wickedcharts.showcase.chartjs; + +import de.adesso.wickedcharts.showcase.options.chartjs.TooltipHtmlPieConfiguration; +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * Sample that enables the use of custom html markup for tooltips in a pie chart. + * + * @see http://www.chartjs.org/samples/latest/tooltips/custom-pie.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TooltipHtmlPieConfigurationWicket14 extends TooltipHtmlPieConfiguration { + public TooltipHtmlPieConfigurationWicket14() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","pieTooltip", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TooltipHtmlPointsConfigurationWicket14.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TooltipHtmlPointsConfigurationWicket14.java new file mode 100644 index 00000000..77716313 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/chartjs/TooltipHtmlPointsConfigurationWicket14.java @@ -0,0 +1,24 @@ +package de.adesso.wickedcharts.showcase.chartjs; + +import de.adesso.wickedcharts.showcase.options.chartjs.TooltipHtmlPointsConfiguration; +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * Sample that enables the use of custom html markup for tooltip points. + * + * @see http://www.chartjs.org/samples/latest/tooltips/custom-points.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TooltipHtmlPointsConfigurationWicket14 extends TooltipHtmlPointsConfiguration { + public TooltipHtmlPointsConfigurationWicket14() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","pointTooltip", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java deleted file mode 100644 index 62047c4e..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how the 'end' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartEndConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartEndConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.END); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - End")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java deleted file mode 100644 index 208d3b5c..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java +++ /dev/null @@ -1,62 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how the 'false' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartFalseConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - False")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java deleted file mode 100644 index 25263e27..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how the 'origin' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartOriginConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartOriginConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.ORIGIN); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - Origin")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java deleted file mode 100644 index 353e5dab..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how the 'start' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartStartConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartStartConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.START); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - Start")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java deleted file mode 100644 index 7178325e..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a horizontal bar chart configuration looks. - */ - -/** - * - * A sample that shows how a horizontal bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/horizontal.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class BarChartHorizontalConfiguration extends ShowcaseConfiguration { - public BarChartHorizontalConfiguration() { - super(); - setType(ChartType.HORIZONTAL_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setElements(new Rectangle()) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Horizontal Bar Chart")) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java deleted file mode 100644 index bfd43c26..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java +++ /dev/null @@ -1,79 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * A sample that shows how a multi-axis bar chart configuration looks. - */ - -/** - * - * A sample that shows how a multi-axis bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/multi-axis.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class BarChartMultiAxisConfiguration extends ShowcaseConfiguration{ - public BarChartMultiAxisConfiguration() { - setType(ChartType.BAR); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-1"); - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-2"); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Multi Axis")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScales(new Scales() - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - - ; - setOptions(options); - - } - -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java deleted file mode 100644 index 8cd45a6d..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java +++ /dev/null @@ -1,87 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * A sample that shows how a stacked bar chart configuration looks. - */ - -/** - * - * A sample that shows how a stack bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/stacked.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class BarChartStackedConfiguration extends ShowcaseConfiguration { - public BarChartStackedConfiguration() { - setType(ChartType.STACKED_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - Dataset dataset3 = new Dataset() - .setLabel("Dataset 3") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Stacked")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java deleted file mode 100644 index 8e0bff32..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java +++ /dev/null @@ -1,85 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * A sample that shows how a stacked group bar chart configuration looks. - */ - -/** - * - * A sample that shows how a stacked bar chart group configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/stacked-group.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class BarChartStackedGroupConfiguration extends ShowcaseConfiguration { - public BarChartStackedGroupConfiguration() { - setType(ChartType.STACKED_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("0"); - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("0"); - - Dataset dataset3 = new Dataset() - .setLabel("Dataset 3") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Stacked Groups")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java deleted file mode 100644 index 0e5c7ee6..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * A sample that shows how a vertical bar chart configuration looks. - */ - -/** - * - * A sample that shows how a vertical bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/vertical.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class BarChartVerticalConfiguration extends ShowcaseConfiguration { - public BarChartVerticalConfiguration() { - super(); - setType(ChartType.BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart")) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java deleted file mode 100644 index fc5d735b..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java +++ /dev/null @@ -1,102 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.BubbleValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.Random; -/** - * - * A sample that shows how a bubble chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scriptable/bubble.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class BubbleChartConfiguration extends ShowcaseConfiguration { - public BubbleChartConfiguration() { - super(); - setType(ChartType.BUBBLE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("My Third dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - - Options options = new Options() - .setResponsive(true) - .setAspectRatio((double)1) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bubble Chart")) - ; - setOptions(options); - - - } - - private Double randomDouble(int bound) { - Random random = new Random(); - return (double)random.nextInt(bound)+1; - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java deleted file mode 100644 index 5ec762e4..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java +++ /dev/null @@ -1,63 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a combo bar-line chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/combo-bar-line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class ComboBarLineChartConfiguration extends ShowcaseConfiguration { - public ComboBarLineChartConfiguration() { - super(); - setType(ChartType.BAR); - Data data = new Data(); - Dataset dataset1 = new Dataset(); - dataset1.setType(ChartType.LINE) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(2) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 1"); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.WHITE) - .setBorderWidth(2) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 2"); - - Dataset dataset3 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 3"); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Bar Line Chart")) - .setTooltips(new Tooltips() - .setIntersect(true) - .setMode(TooltipMode.INDEX)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java deleted file mode 100644 index 999a7bd3..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java +++ /dev/null @@ -1,71 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.ArrayList; -import java.util.Arrays; - - -/** - * - * A sample that shows how a combo bar-line chart configuration with data labelling. - * - * @see http://www.chartjs.org/samples/latest/advanced/data-labelling.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class DataLabellingChartConfiguration extends ShowcaseConfiguration { - public DataLabellingChartConfiguration() { - super(); - setType(ChartType.BAR); - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/dataLabellingPlugin.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data(); - Dataset dataset1 = new Dataset(); - dataset1.setType(ChartType.LINE) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(2) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 1"); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.WHITE) - .setBorderWidth(2) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 2"); - - Dataset dataset3 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 3"); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Bar Line Chart")) - .setTooltips(new Tooltips() - .setIntersect(true) - .setMode(TooltipMode.INDEX)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java deleted file mode 100644 index 71103554..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java +++ /dev/null @@ -1,50 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a doughnut configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/doughnut.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class DoughnutChartConfiguration extends ShowcaseConfiguration { - public DoughnutChartConfiguration() { - super(); - setType(ChartType.DOUGHNUT); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE, SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Doughnut Chart")) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setAnimation(new Animation() - .setAnimateScale(true) - .setAnimateRotate(true)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java deleted file mode 100644 index 8441defc..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how a chart with label filtering is configured. - * - * @see http://www.chartjs.org/samples/latest/scales/filtering-labels.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class FilteringLabelsConfiguration extends ShowcaseConfiguration { - public FilteringLabelsConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart - X-Axis Filter")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setCallback( - new CallbackFunction("function(dataLabel, index) {\r\n" + - " // Hide the label of every 2nd dataset. return null to hide the grid line too\r\n" + - " return index % 2 === 0 ? dataLabel : '';}")))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setBeginAtZero(true))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java deleted file mode 100644 index a9f6bee7..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java +++ /dev/null @@ -1,70 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how different point style configurations look. - * - * @see http://www.chartjs.org/samples/latest/legend/point-style.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LegendPointStyleConfiguration extends ShowcaseConfiguration { - public LegendPointStyleConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setPointStyle(PointStyle.RECT_ROT) - .setPointRadius(10) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.ORIGIN); - - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Point Style Legend")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setLabels(new LegendLabel() - .setUsePointStyle(true))) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java deleted file mode 100644 index 402b1ab3..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java +++ /dev/null @@ -1,142 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.AbsoluteIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.RelativeIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how a chart with different datasets can be configured. - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-datasets.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartAreaDatasetConfiguration extends ShowcaseConfiguration { - public LineChartAreaDatasetConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("D0 (hidden), Fill: undefined") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(BoundaryFillingMode.UNDEFINED) - .setHidden(true); - - - Dataset dataset1 = new Dataset() - .setLabel("D1 Fill: -1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("-1")); - - - Dataset dataset2 = new Dataset() - .setLabel("D2 (hidden) Fill: 1") - .setBackgroundColor(SimpleColor.ORANGE_TRANSPARENT) - .setBorderColor(SimpleColor.ORANGE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setHidden(true) - .setFill(new AbsoluteIndex(1)); - - Dataset dataset3 = new Dataset() - .setLabel("D3 Fill: -1") - .setBackgroundColor(SimpleColor.YELLOW_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset4 = new Dataset() - .setLabel("D4 Fill: -1") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("-1")); - - Dataset dataset5 = new Dataset() - .setLabel("D5 Fill: +2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("+2")); - - - Dataset dataset6 = new Dataset() - .setLabel("D6 Fill: false") - .setBackgroundColor(SimpleColor.GREY_TRANSPARENT) - .setBorderColor(SimpleColor.GREY) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset7 = new Dataset() - .setLabel("D7 Fill: 8") - .setBackgroundColor(SimpleColor.PURPLE_TRANSPARENT) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new AbsoluteIndex(8)); - - - Dataset dataset8 = new Dataset() - .setLabel("D8 (hidden) Fill: end") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setHidden(true) - .setFill(BoundaryFillingMode.END); - - data.setDatasets(Arrays.asList(dataset0, dataset1, dataset2, dataset3, dataset4, - dataset5, dataset6, dataset7, dataset8)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Dataset Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setPlugins(new Plugins() - .setFiller(new Filler() - .setPropagate(false)) - .setSamples_filler_analyzer(new SamplesFillerAnalyzer() - .setTarget("chart-analyzer"))) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java deleted file mode 100644 index 86c1e218..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java +++ /dev/null @@ -1,71 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample of a basic line chart configuration. - * - * @see http://www.chartjs.org/samples/latest/charts/line/basic.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LineChartBasicConfiguration extends ShowcaseConfiguration { - public LineChartBasicConfiguration() { - - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java deleted file mode 100644 index 43e1dcfb..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java +++ /dev/null @@ -1,83 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.List; -/** - * - * A sample that shows how configuring interpolation of lines in a line chart is configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/interpolation-modes.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartInterpolatedConfiguration extends ShowcaseConfiguration { - public LineChartInterpolatedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - List datasetsData = IntegerValue.of(randomIntegerList(7)); - - Dataset dataset1 = new Dataset() - .setLabel("Cubic interpolation (monotone)") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(datasetsData) - .setFill(false) - .setCubicInterpolationMode(CubicInterpolationMode.MONOTONE); - - Dataset dataset2 = new Dataset() - .setLabel("Cubic interpolation (default)") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(datasetsData) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("Linear interpolation") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(datasetsData) - .setFill(false) - .setLineTension(0); - - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Interpolation")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java deleted file mode 100644 index fe82651a..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java +++ /dev/null @@ -1,76 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how multiple axes in a line chart are configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/multi-axis.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartMultiAxisConfiguration extends ShowcaseConfiguration{ - public LineChartMultiAxisConfiguration() { - setType(ChartType.LINE); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-1"); - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-2"); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart - Multi Axis")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScales(new Scales() - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - - ; - setOptions(options); - - } - -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java deleted file mode 100644 index e16366cb..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; -/** - * - * A sample that shows how a line chart with a progress bar is configured. - * - * @see http://www.chartjs.org/samples/latest/advanced/progress-bar.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartProgressBarConfiguration extends ShowcaseConfiguration { - public LineChartProgressBarConfiguration() { - super(); - setType(ChartType.LINE); - - String optionalJavascript= readFile("de/adesso/wickedcharts/showcase/progressBar.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Progress Bar")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setAnimation(new Animation() - .setDuration(2000) - .setOnProgress(new CallbackFunction("function(animation) {\r\n" + - " progress.value = animation.currentStep / animation.numSteps;\r\n" + - " }")) - .setOnComplete(new CallbackFunction("function(animation) {\r\n" + - " window.setTimeout(function() {\r\n" + - " progress.value = 0;\r\n" + - " }, 2000);\r\n" + - " }"))) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","progressBar",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java deleted file mode 100644 index 2b5c19c3..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java +++ /dev/null @@ -1,76 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how a stacked line chart is configured. - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-stacked.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartStackedConfiguration extends ShowcaseConfiguration{ - public LineChartStackedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset3 = new Dataset() - .setLabel("My Third dataset") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Stacked Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java deleted file mode 100644 index 1ee820b3..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how a stepped line chart configuration looks with stepped = after. - * - * @see http://www.chartjs.org/samples/latest/charts/line/stepped.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartSteppedAfterConfiguration extends ShowcaseConfiguration { - public LineChartSteppedAfterConfiguration() { - super(); - setType(ChartType.LINE); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - - - Dataset dataset1 = new Dataset() - .setLabel("Stepped After") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setSteppedLine(SteppedLineValue.AFTER); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Stepped - After")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java deleted file mode 100644 index a994ff1b..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how a stepped line chart configuration looks with stepped = before. - * - * @see http://www.chartjs.org/samples/latest/charts/line/stepped.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartSteppedBeforeConfiguration extends ShowcaseConfiguration { - public LineChartSteppedBeforeConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Stepped Before") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setSteppedLine(SteppedLineValue.BEFORE); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Stepped - Before")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java deleted file mode 100644 index 21b5a14b..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java +++ /dev/null @@ -1,93 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.Collections; -/** - * - * A sample that shows how a line chart can be configured to have different point sizes. - * - * @see http://www.chartjs.org/samples/latest/charts/line/point-sizes.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartWithDifferentPointSizesConfiguration extends ShowcaseConfiguration { - public LineChartWithDifferentPointSizesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("dataset - big points") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointRadius(Collections.nCopies(7, 15)) - .setPointHoverRadius(10) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("dataset - individual point sizes") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setBorderDash(Arrays.asList("5", "5")) - .setPointRadius(Arrays.asList(2, 4, 6, 18, 0, 12, 20)) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("dataset - large pointHoverRadius") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointHoverRadius(30) - .setFill(false); - - - Dataset dataset4 = new Dataset() - .setLabel("dataset - large pointHitRadius") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointHitRadius(20) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3, dataset4)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart with Different Point Sizes")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java deleted file mode 100644 index 37049124..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java +++ /dev/null @@ -1,79 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how different line styles can be configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/line-styles.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineStylesConfiguration extends ShowcaseConfiguration { - public LineStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Filled") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setLabel("Unfilled") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset3 = new Dataset() - .setLabel("Dashed") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setBorderDash(Arrays.asList("5", "5")) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Styles")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java deleted file mode 100644 index 5ae5ee58..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java +++ /dev/null @@ -1,74 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how a line chart with linear step size is configured. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/step-size.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LinearStepSizeConfiguration extends ShowcaseConfiguration { - public LinearStepSizeConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(5)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java deleted file mode 100644 index 0868a4b1..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java +++ /dev/null @@ -1,71 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * - * A sample that shows how a logarithmic line chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scales/logarithmic/line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LogarithmicLineChartConfiguration extends ShowcaseConfiguration { - public LogarithmicLineChartConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Logarithmic Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("logarithmic") - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java deleted file mode 100644 index 65e7c8c0..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java +++ /dev/null @@ -1,84 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * A sample that shows how a logarithmic scatter chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scales/logarithmic/scatter.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LogarithmicScatterChartConfiguration extends ShowcaseConfiguration { - public LogarithmicScatterChartConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Logarithmic Scatter Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("logarithmic") - .setPosition(Position.BOTTOM) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Frequency"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Voltage")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java deleted file mode 100644 index f1a74136..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java +++ /dev/null @@ -1,59 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how to configure min and max Ticks in the chart options. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/min-max.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MinMaxConfiguration extends ShowcaseConfiguration { - public MinMaxConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 39, 20, 25, 34, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(100, 33, 22, 19, 11, 49, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Min and Max")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setTicks(new Ticks() - .setMin(10) - .setMax(50)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java deleted file mode 100644 index 7f02e1be..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java +++ /dev/null @@ -1,59 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how to configure suggestedMin and suggestedMax Ticks in the chart options. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/min-max-suggested.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MinMaxSuggestedConfiguration extends ShowcaseConfiguration { - public MinMaxSuggestedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 50, 20, 25, 44, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Min and Max - Suggested")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setTicks(new Ticks() - .setSuggestedMin(10) - .setSuggestedMax(50)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java deleted file mode 100644 index f20c6e25..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextListLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how to configure multiline labels. - * - * @see http://www.chartjs.org/samples/latest/scales/multiline-labels.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MultilineLabelsConfiguration extends ShowcaseConfiguration { - - public MultilineLabelsConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(Arrays.asList( - new TextListLabel("June","2015"), - new TextLabel("July"), - new TextLabel("August"), - new TextLabel("September"), - new TextLabel("October"), - new TextLabel("November"), - new TextLabel("December"), - new TextListLabel("January","2016"), - new TextLabel("February"), - new TextLabel("March"), - new TextLabel("April"), - new TextLabel("May") - )); - - Dataset dataset1 = new Dataset() - .setData(IntegerValue.of(randomIntegerList(12))) - .setLabel("My First dataset") - .setFill(false) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED); - - Dataset dataset2 = new Dataset() - .setData(IntegerValue.of(randomIntegerList(12))) - .setLabel("My Second dataset") - .setFill(false) - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart with Multiline Labels")); - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java deleted file mode 100644 index 6f8a6672..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.ConstLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ConstValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how to configure non-numeric values in a chart. - * - * @see http://www.chartjs.org/samples/latest/scales/non-numeric-y.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class NonNumericConfiguration extends ShowcaseConfiguration { - - public NonNumericConfiguration() { - setType(ChartType.LINE); - - Data data = new Data() - .setXLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")) - .setYLabels(ConstLabel.of("", "Request Added", "Request Viewed", "Request Accepted", "Request Solved", "Solving Confirmed")) - ; - - Dataset dataset1 = new Dataset() - .setLabel("My First Dataset") - .setFill(false) - .setBorderColor(SimpleColor.RED) - .setBackgroundColor(SimpleColor.RED) - .setData(ConstValue.of("", "Request Added", "Request Added", "Request Added", "Request Viewed", "Request Viewed", "Request Viewed")) - ; - data.setDatasets(Arrays.asList(dataset1)); - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart with Non Numeric Y Axis")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("category") - .setPosition(Position.LEFT) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Request State")) - .setTicks(new Ticks() - .setReverse(true)))) - ; - setOptions(options); - - - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java deleted file mode 100644 index 908964a7..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextListLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Sample that displays different datasets on a radar. - * - * @see http://www.chartjs.org/samples/latest/charts/radar.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class OtherRadarChartConfiguration extends ShowcaseConfiguration { - public OtherRadarChartConfiguration() { - super(); - setType(ChartType.RADAR); - - Data data = new Data() - .setLabels(Arrays.asList( - new TextListLabel("Eating", "Dinner"), - new TextListLabel("Drining", "Water"), - new TextLabel("Sleeping"), - new TextListLabel("Designing","Graphics"), - new TextLabel("Coding"), - new TextLabel("Cycling"), - new TextLabel("Running") - )); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setPointBackgroundColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - - Dataset dataset1 = new Dataset() - .setLabel("My second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setPointBackgroundColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset0, dataset1)); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Radar Chart")) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScale(new Scale() - .setTicks(new Ticks() - .setBeginAtZero(true))); - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java deleted file mode 100644 index 9301accc..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java +++ /dev/null @@ -1,44 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.ChartType; -import de.adesso.wickedcharts.chartjs.chartoptions.Data; -import de.adesso.wickedcharts.chartjs.chartoptions.Dataset; -import de.adesso.wickedcharts.chartjs.chartoptions.Options; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays a dataset as a pie chart. - * - * @see http://www.chartjs.org/samples/latest/charts/pie.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PieChartConfiguration extends ShowcaseConfiguration { - public PieChartConfiguration() { - super(); - setType(ChartType.PIE); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE, SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java deleted file mode 100644 index a61d0dc1..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java +++ /dev/null @@ -1,181 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Sample that supports different point styles: - * 'circle', - * 'triangle', - * 'rect', - * 'rectRounded', - * 'rectRot', - * 'cross', - * 'crossRot', - * 'star', - * 'line', - * 'dash' - * - * @see http://www.chartjs.org/samples/latest/charts/line/point-styles.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PointStylesConfiguration extends ShowcaseConfiguration { - public PointStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dash") - .setBackgroundColor(SimpleColor.GREY) - .setBorderColor(SimpleColor.GREY) - .setData(IntegerValue.of(Arrays.asList(1,1,1,1,1,1,1))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.DASH) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("Star") - .setBackgroundColor(SimpleColor.PURPLE) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(Arrays.asList(2,2,2,2,2,2,2))) - .setShowLine(false) - .setPointRadius(20) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.STAR) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("Rectangle") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(Arrays.asList(3,3,3,3,3,3,3))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT) - .setFill(false); - - Dataset dataset4 = new Dataset() - .setLabel("Triangle") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(Arrays.asList(4,4,4,4,4,4,4))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.TRIANGLE) - .setFill(false); - - Dataset dataset5 = new Dataset() - .setLabel("Circle") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(5,5,5,5,5,5,5))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CIRCLE) - .setFill(false); - - Dataset dataset6 = new Dataset() - .setLabel("CrossRot") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(6,6,6,6,6,6,6))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CROSS_ROT) - .setFill(false); - - Dataset dataset7 = new Dataset() - .setLabel("Line") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(7,7,7,7,7,7,7))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.LINE) - .setFill(false); - - Dataset dataset8 = new Dataset() - .setLabel("Cross") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(8,8,8,8,8,8,8))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CROSS) - .setFill(false); - - Dataset dataset9 = new Dataset() - .setLabel("Rectangle Rounded") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(9,9,9,9,9,9,9))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT_ROUNDED) - .setFill(false); - - Dataset dataset10 = new Dataset() - .setLabel("Rectangle Rotated") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(11,11,11,11,11,11,11))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT_ROT) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1, dataset2, dataset3, dataset4, dataset5, dataset6, - dataset7, dataset8, dataset9, dataset10)); - - //Point Style Can also be set in the options using the Elements option - //But you can only have one point style for all datasets - - //Some Point Styles are drawn incorrectly - //See this issue: https://github.com/chartjs/Chart.js/issues/2607 - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Point Styles")) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")) - .setTicks(new Ticks() - .setMax(13) - .setMin(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java deleted file mode 100644 index c90785d3..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java +++ /dev/null @@ -1,54 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Sample that distributes data in a polar area chart. - * - * @see http://www.chartjs.org/samples/latest/charts/polar-area.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PolarAreaChartConfiguration extends ShowcaseConfiguration { - public PolarAreaChartConfiguration() { - super(); - setType(ChartType.POLAR_AREA); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED_TRANSPARENT,SimpleColor.ORANGE_TRANSPARENT, - SimpleColor.YELLOW_TRANSPARENT, SimpleColor.GREEN_TRANSPARENT, - SimpleColor.BLUE_TRANSPARENT)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Polar Area Chart")) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setScale(new Scale() - .setTicks(new Ticks() - .setBeginAtZero(true)) - .setReverse(false)) - .setAnimation(new Animation() - .setAnimateScale(true) - .setAnimateRotate(false)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java deleted file mode 100644 index 0f5af3a3..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java +++ /dev/null @@ -1,97 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.AbsoluteIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.RelativeIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Sample that displays different datasets on a radar. - * - * @see http://www.chartjs.org/samples/latest/charts/area/radar.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class RadarChartConfiguration extends ShowcaseConfiguration { - public RadarChartConfiguration() { - super(); - setType(ChartType.RADAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("D0") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(1, 2, 3, 1, 2, 1, 2))) - .setFill(BoundaryFillingMode.UNDEFINED); - - - Dataset dataset1 = new Dataset() - .setLabel("D1 (hidden) Fill: -1") - .setBackgroundColor(SimpleColor.ORANGE_TRANSPARENT) - .setBorderColor(SimpleColor.ORANGE) - .setData(IntegerValue.of(Arrays.asList(5, 4, 3, 5, 4, 3, 5))) - .setHidden(true) - .setFill(new RelativeIndex("-1")); - - Dataset dataset2 = new Dataset() - .setLabel("D2 Fill: 1") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(10, 8, 12, 6, 13, 10, 9))) - .setFill(new AbsoluteIndex(1)); - - - Dataset dataset3 = new Dataset() - .setLabel("D3 Fill: False") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(Arrays.asList(20, 18, 22, 16, 23, 20, 19))) - .setFill(false); - - Dataset dataset4 = new Dataset() - .setLabel("D4 Fill: -1") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(30, 28, 32, 26, 33, 30, 29))) - .setFill(new RelativeIndex("-1")); - - - Dataset dataset5 = new Dataset() - .setLabel("D5 Fill: -1") - .setBackgroundColor(SimpleColor.PURPLE_TRANSPARENT) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(Arrays.asList(40, 38, 42, 36, 43, 40, 39))) - .setFill(new RelativeIndex("-1")); - - data.setDatasets(Arrays.asList(dataset0, dataset1, dataset2, dataset3, dataset4, dataset5)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Radar Chart")) - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins() - .setFiller(new Filler() - .setPropagate(false)) - .setSamples_filler_analyzer(new SamplesFillerAnalyzer() - .setTarget("chart-analyzer"))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java deleted file mode 100644 index 476958d6..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java +++ /dev/null @@ -1,78 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Sample which displays data as scattered points in the coordinate system. - * - * @see http://www.chartjs.org/samples/latest/charts/scatter/basic.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class ScatterChartConfiguration extends ShowcaseConfiguration { - public ScatterChartConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Scatter Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setPosition(Position.BOTTOM) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java deleted file mode 100644 index 46b4e604..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java +++ /dev/null @@ -1,90 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbaColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Sample that displays a scatter chart with two y-axes. - * - * @see http://www.chartjs.org/samples/latest/charts/scatter/multi-axis.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class ScatterChartMultiAxisConfiguration extends ShowcaseConfiguration { - public ScatterChartMultiAxisConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setYAxisID("y-axis-1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setYAxisID("y-axis-2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Scatter Chart Multi Axis")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setPosition(Position.BOTTOM) - .setGridLines(new GridLines() - .setZeroLineColor(new RgbaColor(0, 0, 0, 1))) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setReverse(true) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java deleted file mode 100644 index ef00d8aa..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java +++ /dev/null @@ -1,86 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.Session; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -/** - * Sample which displays a bar chart for the data distribution and a line chart for the time progression of datasets. - * - * @see http://www.chartjs.org/samples/latest/scales/time/combo.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeComboConfiguration extends ShowcaseConfiguration { - - - public TimeComboConfiguration() { - setType(ChartType.BAR); - - String timeFormat = "MM/DD/YYYY HH:mm"; - - List labels = new ArrayList(7); - - LocalDateTime now = LocalDateTime.now(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM/dd/uuuu HH:mm", Session.get().getLocale()); - - - for(int i = 0; i < 7; i++) { - labels.add(new TextLabel(now.plus(i,ChronoUnit.DAYS).format(formatter))); - } - - Dataset dataset1 = new Dataset() - .setType(ChartType.BAR) - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset3 = new Dataset() - .setType(ChartType.LINE) - .setLabel("Dataset 3") - .setFill(false) - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - - - setData( new Data() - .setLabels(labels) - .setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - ); - - - - setOptions( new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDisplay(true) - .setTime(new TimeFormat() - .setFormat(timeFormat) -// .setRound(TimeFormatRound.DAY) - )))); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java deleted file mode 100644 index 866b6ca1..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Sample that enables tooltips to be at a average position to the data points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipAverageConfiguration extends ShowcaseConfiguration { - public TooltipAverageConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip Average Position")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.AVERAGE) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java deleted file mode 100644 index 0ecd5c28..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java +++ /dev/null @@ -1,61 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbaColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Sample which adds a border to the tooltips. - * - * @see http://www.chartjs.org/samples/latest/tooltips/border.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipBorderConfiguration extends ShowcaseConfiguration { - public TooltipBorderConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(10, 30, 46, 2,8,50,0)) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1)); - - - RgbColor black = new RgbColor(0,0,0); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip with border")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setIntersect(false) - .setYPadding(10) - .setXPadding(10) - .setCaretSize(8) - .setBackgroundColor(new RgbaColor(72, 241, 12,1.0f)) - .setTitleFontColor(black) - .setBodyFontColor(black) - .setBorderColor(new RgbaColor(0,0,0,1.0f)) - .setBorderWidth(4)) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java deleted file mode 100644 index 6021061c..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java +++ /dev/null @@ -1,80 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Sample that enables the use of callback functions for tooltips. - * - * @see http://www.chartjs.org/samples/latest/tooltips/callbacks.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipCallbacksConfiguration extends ShowcaseConfiguration { - public TooltipCallbacksConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - String footerFunction = "function(tooltipItems, data) {\r\n" + - " var sum = 0;\r\n" + - "\r\n" + - " tooltipItems.forEach(function(tooltipItem) {\r\n" + - " sum += data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];\r\n" + - " });\r\n" + - " return 'Sum: ' + sum;\r\n" + - " }"; - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Custom Information in Tooltip")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setCallbacks(new TooltipCallbacks() - .setFooter(new CallbackFunction(footerFunction))) - .setFooterFontStyle(FontStyle.NORMAL)) - .setHover(new Hover() - .setMode(HoverMode.INDEX) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java deleted file mode 100644 index 5f2c32e0..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java +++ /dev/null @@ -1,63 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.ArrayList; -import java.util.Arrays; -/** - * Sample that enables the use of custom html markup for tooltips in a line chart. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlLineConfiguration extends ShowcaseConfiguration { - public TooltipHtmlLineConfiguration() { - setType(ChartType.LINE); - - String optionalJavascript= readFile("de/adesso/wickedcharts/showcase/customTooltip.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Line")) - .setTooltips(new Tooltips() - .setEnabled(false) - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java deleted file mode 100644 index 0fd8d84d..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java +++ /dev/null @@ -1,58 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; -/** - * Sample that enables the use of custom html markup for tooltips in a pie chart. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-pie.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlPieConfiguration extends ShowcaseConfiguration { - public TooltipHtmlPieConfiguration() { - setType(ChartType.PIE); - - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/customTooltip-Pie.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data(); - setData(data); - - Dataset dataset = new Dataset() - .setLabel("My Dataset") - .setBackgroundColor(Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE,SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setData(IntegerValue.of(300, 50, 100, 40, 10)); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setDisplay(true)) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Pie")) - .setTooltips(new Tooltips() - .setEnabled(false) -// .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","pieTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java deleted file mode 100644 index 247c5dbd..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Sample that enables the use of custom html markup for tooltip points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-points.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlPointsConfiguration extends ShowcaseConfiguration { - public TooltipHtmlPointsConfiguration() { - setType(ChartType.LINE); - - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/customTooltip-Point.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setPointBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setPointBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Points")) - .setTooltips(new Tooltips() - .setEnabled(false) - .setIntersect(false) - .setMode(TooltipMode.INDEX) - .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","pointTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java deleted file mode 100644 index cef3a5a1..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that enables tooltips to be at the nearest possible position to the data points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipNearestConfiguration extends ShowcaseConfiguration { - public TooltipNearestConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip Nearest Position")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java deleted file mode 100644 index 0a9bcc75..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ /dev/null @@ -1,57 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.base; - -import de.adesso.wickedcharts.chartjs.ChartConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Scanner; - -/** - * The base class for all chart configurations for the showcase - */ -@SuppressWarnings("serial") -public abstract class ShowcaseConfiguration extends ChartConfiguration { - - protected List randomIntegerList(int size) { - List dataList = new ArrayList(); - Random rng = new Random(); - for (int i = 0; i < size; i++) { - dataList.add(rng.nextInt(60) + 1); - } - return dataList; - } - - protected String readFile(String fileName) { - - StringBuilder result = new StringBuilder(""); - - // Get file from resources folder - ClassLoader classLoader = getClass().getClassLoader(); - File file = new File(classLoader.getResource(fileName).getFile()); - - try (Scanner scanner = new Scanner(file)) { - - while (scanner.hasNextLine()) { - String line = scanner.nextLine(); - result.append(line).append("\n"); - } - - scanner.close(); - - } catch (IOException e) { - e.printStackTrace(); - } - - return result.toString(); - - } - - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","defaultTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java deleted file mode 100644 index c54b2548..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java +++ /dev/null @@ -1,74 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.StringValueColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * Chart configuration for different grid line styles. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-style.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLineStylesConfiguration extends ShowcaseConfiguration { - public GridLineStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 39, 20, 25, 34, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Styles")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setGridLines(new GridLines() - .setDrawBorder(true) - .setColor(Arrays.asList( - new StringValueColor("pink"), - new StringValueColor("red"), - new StringValueColor("orange"), - new StringValueColor("yellow"), - new StringValueColor("green"), - new StringValueColor("blue"), - new StringValueColor("indigo"), - new StringValueColor("purple")))) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(10)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java deleted file mode 100644 index b45bc4c9..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration for the area chart grid line layout. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesChartAreaConfiguration extends GridLinesBasicConfiguration { - - public GridLinesChartAreaConfiguration() { - super(); - - gridLines.setDisplay(true) - .setDrawBorder(true) - .setDrawOnChartArea(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Chart Area")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java deleted file mode 100644 index 171a41fe..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display grid lines. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesDisplayFalseConfiguration extends GridLinesBasicConfiguration { - - public GridLinesDisplayFalseConfiguration() { - super(); - - gridLines.setDisplay(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Display False")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java deleted file mode 100644 index 2893b59a..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display grid lines and axes. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesDisplayFalseNoBorderConfiguration extends GridLinesBasicConfiguration { - - public GridLinesDisplayFalseNoBorderConfiguration() { - super(); - - gridLines.setDisplay(false) - .setDrawBorder(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Display False No Border")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java deleted file mode 100644 index 1aee3937..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * If the intersect setting is true, the first intersecting item is used to determine the index in the data. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class DatasetIntersectTrueConfiguration extends ShowcaseConfiguration { - public DatasetIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Dataset, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.DATASET) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java deleted file mode 100644 index 7c5c0df2..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * If intersect false the nearest item, in the x direction, is used to determine the index. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class IndexIntersectFalseConfiguration extends ShowcaseConfiguration { - public IndexIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Index, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java deleted file mode 100644 index 8cb3e319..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * If intersect is false, this is not triggered when the mouse position intersects an item in the graph. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class NearestIntersectFalseConfiguration extends ShowcaseConfiguration { - public NearestIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Nearest, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.NEAREST) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java deleted file mode 100644 index 929eea10..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * If intersect is true, this is only triggered when the mouse position intersects an item in the graph. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class NearestIntersectTrueConfiguration extends ShowcaseConfiguration { - public NearestIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Nearest, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java deleted file mode 100644 index d0dabfa2..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Finds no items that intersect the point. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class PointIntersectFalseConfiguration extends ShowcaseConfiguration { - public PointIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Point, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.POINT) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java deleted file mode 100644 index 900b8523..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Finds all of the items that intersect the point. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class PointIntersectTrueConfiguration extends ShowcaseConfiguration { - public PointIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Point, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.POINT) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java deleted file mode 100644 index bab11b18..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Does not return all items that would intersect based on the X coordinate of the position only. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class xIntersectFalseConfiguration extends ShowcaseConfiguration { - public xIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: x, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.X) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java deleted file mode 100644 index e7b6b0c9..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Returns all items that would intersect based on the X coordinate of the position only. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class xIntersectTrueConfiguration extends ShowcaseConfiguration { - public xIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: x, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.X) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java deleted file mode 100644 index d251ddbd..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -/** - * Does not return all items that would intersect based on the Y coordinate of the position. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class yIntersectFalseConfiguration extends ShowcaseConfiguration { - public yIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: y, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.Y) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java deleted file mode 100644 index 910e34f8..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position on the left - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionLeftConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionLeftConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.YELLOW_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW); - - getOptions().setLegend(new Legend().setPosition(Position.LEFT)); - - getOptions().getTitle().setText("Legend Position: Left"); - } -} diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java deleted file mode 100644 index 38dcecc9..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java +++ /dev/null @@ -1,29 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position on the right - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionRightConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionRightConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE); - - getOptions().setLegend(new Legend().setPosition(Position.RIGHT)); - - getOptions().getTitle().setText("Legend Position: Right"); - } -} - diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java deleted file mode 100644 index 711c225c..00000000 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java +++ /dev/null @@ -1,29 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position at the top - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionTopConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionTopConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED); - - getOptions().setLegend(new Legend().setPosition(Position.TOP)); - - getOptions().getTitle().setText("Legend Position: Top"); - } -} - diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java index 0fda619a..5d84fe5e 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import de.adesso.wickedcharts.wicket15.chartjs.Chart; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.html.panel.Panel; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index affd70f9..774c09d8 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -15,13 +15,13 @@ */ -import de.adesso.wickedcharts.showcase.configurations.*; -import de.adesso.wickedcharts.showcase.configurations.gridlines.*; -import de.adesso.wickedcharts.showcase.configurations.interactions.*; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionBottomConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionLeftConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionRightConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionTopConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.*; +import de.adesso.wickedcharts.showcase.options.chartjs.gridlines.*; +import de.adesso.wickedcharts.showcase.options.chartjs.interactions.*; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionBottomConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionLeftConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionRightConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionTopConfiguration; import de.adesso.wickedcharts.showcase.links.ChartjsShowcaseLink; import de.adesso.wickedcharts.showcase.links.HighchartsShowcaseLink; import de.adesso.wickedcharts.showcase.links.UpdateChartJsLink; @@ -167,12 +167,9 @@ private List getChartFromParams(final PageParameters params) { String chartString; List config = new ArrayList<>(); - //Get the parameters of the page - List pairs = params.getAllNamed(); - //If the showcase is started without any parameters //set the parameters to lineBasic and give us a line Chart - if(params.getAllNamed().size() == 0){ + if(params.getAllNamed().isEmpty()){ PageParameters temp = new PageParameters(); temp.add("chart", "lineBasic"); setResponsePage(HomepageChartJs.class, temp); @@ -358,8 +355,8 @@ private List getChartFromParams(final PageParameters params) { case "tooltipHtml": config.add(new Chart("chart", new TooltipHtmlLineConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPieConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPointsConfiguration())); + config.add(new Chart("chart", new TooltipHtmlPieConfigurationWicket15())); + config.add(new Chart("chart", new TooltipHtmlPointsConfigurationWicket15())); break; case "bubble": @@ -367,7 +364,7 @@ private List getChartFromParams(final PageParameters params) { break; case "lineProgressBar": - config.add(new Chart("chart", new LineChartProgressBarConfiguration())); + config.add(new Chart("chart", new LineChartProgressBarConfigurationWicket15())); break; case "dataLabelling": diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index 417db407..a100fb28 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -19,7 +19,7 @@ import de.adesso.wickedcharts.showcase.links.HighchartsShowcaseLink; import de.adesso.wickedcharts.showcase.links.UpdateHighchartLink; import de.adesso.wickedcharts.showcase.links.UpdateThemeLink; -import de.adesso.wickedcharts.showcase.options.*; +import de.adesso.wickedcharts.showcase.options.highcharts.base.*; import de.adesso.wickedcharts.wicket15.highcharts.Chart; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebPage; diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java deleted file mode 100644 index bfcd00db..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'end' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartEndConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartEndConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.END); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - End")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java deleted file mode 100644 index 8905576a..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'start' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartStartConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartStartConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.START); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - Start")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java deleted file mode 100644 index 7178325e..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a horizontal bar chart configuration looks. - */ - -/** - * - * A sample that shows how a horizontal bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/horizontal.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class BarChartHorizontalConfiguration extends ShowcaseConfiguration { - public BarChartHorizontalConfiguration() { - super(); - setType(ChartType.HORIZONTAL_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setElements(new Rectangle()) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Horizontal Bar Chart")) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java deleted file mode 100644 index 1573712e..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java +++ /dev/null @@ -1,80 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a multi-axis bar chart configuration looks. - */ - -/** - * - * A sample that shows how a multi-axis bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/multi-axis.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class BarChartMultiAxisConfiguration extends ShowcaseConfiguration{ - public BarChartMultiAxisConfiguration() { - setType(ChartType.BAR); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-1"); - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-2"); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Multi Axis")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScales(new Scales() - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - - ; - setOptions(options); - - } - -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java deleted file mode 100644 index 02987aff..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how a combo bar-line chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/combo-bar-line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class ComboBarLineChartConfiguration extends ShowcaseConfiguration { - public ComboBarLineChartConfiguration() { - super(); - setType(ChartType.BAR); - Data data = new Data(); - Dataset dataset1 = new Dataset(); - dataset1.setType(ChartType.LINE) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(2) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 1"); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.WHITE) - .setBorderWidth(2) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 2"); - - Dataset dataset3 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 3"); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Bar Line Chart")) - .setTooltips(new Tooltips() - .setIntersect(true) - .setMode(TooltipMode.INDEX)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java deleted file mode 100644 index 9e2d6573..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java +++ /dev/null @@ -1,71 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.ArrayList; -import java.util.Arrays; - - -/** - * - * A sample that shows how a combo bar-line chart configuration with data labelling. - * - * @see http://www.chartjs.org/samples/latest/advanced/data-labelling.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class DataLabellingChartConfiguration extends ShowcaseConfiguration { - public DataLabellingChartConfiguration() { - super(); - setType(ChartType.BAR); - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/dataLabellingPlugin.js"); - - setOptionalJavascript(new ArrayList<>()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data(); - Dataset dataset1 = new Dataset(); - dataset1.setType(ChartType.LINE) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(2) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 1"); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.WHITE) - .setBorderWidth(2) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 2"); - - Dataset dataset3 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 3"); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Bar Line Chart")) - .setTooltips(new Tooltips() - .setIntersect(true) - .setMode(TooltipMode.INDEX)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java deleted file mode 100644 index 71103554..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java +++ /dev/null @@ -1,50 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a doughnut configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/doughnut.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class DoughnutChartConfiguration extends ShowcaseConfiguration { - public DoughnutChartConfiguration() { - super(); - setType(ChartType.DOUGHNUT); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE, SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Doughnut Chart")) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setAnimation(new Animation() - .setAnimateScale(true) - .setAnimateRotate(true)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java deleted file mode 100644 index bc7a4aa4..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a chart with label filtering is configured. - * - * @see http://www.chartjs.org/samples/latest/scales/filtering-labels.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class FilteringLabelsConfiguration extends ShowcaseConfiguration { - public FilteringLabelsConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart - X-Axis Filter")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setCallback( - new CallbackFunction("function(dataLabel, index) {\r\n" + - " // Hide the label of every 2nd dataset. return null to hide the grid line too\r\n" + - " return index % 2 === 0 ? dataLabel : '';}")))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setBeginAtZero(true))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java deleted file mode 100644 index 49e6c1af..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java +++ /dev/null @@ -1,72 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample of a basic line chart configuration. - * - * @see http://www.chartjs.org/samples/latest/charts/line/basic.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LineChartBasicConfiguration extends ShowcaseConfiguration { - public LineChartBasicConfiguration() { - - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java deleted file mode 100644 index 5b51dafd..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java +++ /dev/null @@ -1,84 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.List; - -/** - * - * A sample that shows how configuring interpolation of lines in a line chart is configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/interpolation-modes.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartInterpolatedConfiguration extends ShowcaseConfiguration { - public LineChartInterpolatedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - List datasetsData = IntegerValue.of(randomIntegerList(7)); - - Dataset dataset1 = new Dataset() - .setLabel("Cubic interpolation (monotone)") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(datasetsData) - .setFill(false) - .setCubicInterpolationMode(CubicInterpolationMode.MONOTONE); - - Dataset dataset2 = new Dataset() - .setLabel("Cubic interpolation (default)") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(datasetsData) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("Linear interpolation") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(datasetsData) - .setFill(false) - .setLineTension(0); - - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Interpolation")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java deleted file mode 100644 index fe82651a..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java +++ /dev/null @@ -1,76 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how multiple axes in a line chart are configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/multi-axis.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartMultiAxisConfiguration extends ShowcaseConfiguration{ - public LineChartMultiAxisConfiguration() { - setType(ChartType.LINE); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-1"); - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-2"); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart - Multi Axis")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScales(new Scales() - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - - ; - setOptions(options); - - } - -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java deleted file mode 100644 index cf6f940d..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java +++ /dev/null @@ -1,95 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * - * A sample that shows how a line chart with a progress bar is configured. - * - * @see http://www.chartjs.org/samples/latest/advanced/progress-bar.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartProgressBarConfiguration extends ShowcaseConfiguration { - public LineChartProgressBarConfiguration() { - super(); - setType(ChartType.LINE); - - String optionalJavascript= readFile("de/adesso/wickedcharts/showcase/progressBar.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Progress Bar")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setAnimation(new Animation() - .setDuration(2000) - .setOnProgress(new CallbackFunction("function(animation) {\r\n" + - " progress.value = animation.currentStep / animation.numSteps;\r\n" + - " }")) - .setOnComplete(new CallbackFunction("function(animation) {\r\n" + - " window.setTimeout(function() {\r\n" + - " progress.value = 0;\r\n" + - " }, 2000);\r\n" + - " }"))) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","progressBar",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java deleted file mode 100644 index 383c7a06..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a stacked line chart is configured. - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-stacked.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartStackedConfiguration extends ShowcaseConfiguration{ - public LineChartStackedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset3 = new Dataset() - .setLabel("My Third dataset") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Stacked Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java deleted file mode 100644 index 4cfde004..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a stepped line chart configuration looks with stepped = before. - * - * @see http://www.chartjs.org/samples/latest/charts/line/stepped.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartSteppedBeforeConfiguration extends ShowcaseConfiguration { - public LineChartSteppedBeforeConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Stepped Before") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setSteppedLine(SteppedLineValue.BEFORE); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Stepped - Before")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java deleted file mode 100644 index 205fbf11..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.Collections; - -/** - * - * A sample that shows how a line chart can be configured to have different point sizes. - * - * @see http://www.chartjs.org/samples/latest/charts/line/point-sizes.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartWithDifferentPointSizesConfiguration extends ShowcaseConfiguration { - public LineChartWithDifferentPointSizesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("dataset - big points") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointRadius(Collections.nCopies(7, 15)) - .setPointHoverRadius(10) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("dataset - individual point sizes") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setBorderDash(Arrays.asList("5", "5")) - .setPointRadius(Arrays.asList(2, 4, 6, 18, 0, 12, 20)) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("dataset - large pointHoverRadius") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointHoverRadius(30) - .setFill(false); - - - Dataset dataset4 = new Dataset() - .setLabel("dataset - large pointHitRadius") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointHitRadius(20) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3, dataset4)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart with Different Point Sizes")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java deleted file mode 100644 index 0862c977..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java +++ /dev/null @@ -1,80 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how different line styles can be configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/line-styles.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineStylesConfiguration extends ShowcaseConfiguration { - public LineStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Filled") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setLabel("Unfilled") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset3 = new Dataset() - .setLabel("Dashed") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setBorderDash(Arrays.asList("5", "5")) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Styles")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java deleted file mode 100644 index 84f1afb3..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java +++ /dev/null @@ -1,75 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a line chart with linear step size is configured. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/step-size.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LinearStepSizeConfiguration extends ShowcaseConfiguration { - public LinearStepSizeConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(5)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java deleted file mode 100644 index db5c6709..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java +++ /dev/null @@ -1,85 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a logarithmic scatter chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scales/logarithmic/scatter.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LogarithmicScatterChartConfiguration extends ShowcaseConfiguration { - public LogarithmicScatterChartConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Logarithmic Scatter Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("logarithmic") - .setPosition(Position.BOTTOM) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Frequency"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Voltage")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java deleted file mode 100644 index 2d826156..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure min and max Ticks in the chart options. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/min-max.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MinMaxConfiguration extends ShowcaseConfiguration { - public MinMaxConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 39, 20, 25, 34, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(100, 33, 22, 19, 11, 49, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Min and Max")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setTicks(new Ticks() - .setMin(10) - .setMax(50)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java deleted file mode 100644 index b83ce23d..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure suggestedMin and suggestedMax Ticks in the chart options. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/min-max-suggested.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MinMaxSuggestedConfiguration extends ShowcaseConfiguration { - public MinMaxSuggestedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 50, 20, 25, 44, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Min and Max - Suggested")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setTicks(new Ticks() - .setSuggestedMin(10) - .setSuggestedMax(50)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java deleted file mode 100644 index 85e23292..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextListLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure multiline labels. - * - * @see http://www.chartjs.org/samples/latest/scales/multiline-labels.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MultilineLabelsConfiguration extends ShowcaseConfiguration { - - public MultilineLabelsConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(Arrays.asList( - new TextListLabel("June","2015"), - new TextLabel("July"), - new TextLabel("August"), - new TextLabel("September"), - new TextLabel("October"), - new TextLabel("November"), - new TextLabel("December"), - new TextListLabel("January","2016"), - new TextLabel("February"), - new TextLabel("March"), - new TextLabel("April"), - new TextLabel("May") - )); - - Dataset dataset1 = new Dataset() - .setData(IntegerValue.of(randomIntegerList(12))) - .setLabel("My First dataset") - .setFill(false) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED); - - Dataset dataset2 = new Dataset() - .setData(IntegerValue.of(randomIntegerList(12))) - .setLabel("My Second dataset") - .setFill(false) - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart with Multiline Labels")); - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java deleted file mode 100644 index 19e7d5ec..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextListLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays different datasets on a radar. - * - * @see http://www.chartjs.org/samples/latest/charts/radar.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class OtherRadarChartConfiguration extends ShowcaseConfiguration { - public OtherRadarChartConfiguration() { - super(); - setType(ChartType.RADAR); - - Data data = new Data() - .setLabels(Arrays.asList( - new TextListLabel("Eating", "Dinner"), - new TextListLabel("Drining", "Water"), - new TextLabel("Sleeping"), - new TextListLabel("Designing","Graphics"), - new TextLabel("Coding"), - new TextLabel("Cycling"), - new TextLabel("Running") - )); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setPointBackgroundColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - - Dataset dataset1 = new Dataset() - .setLabel("My second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setPointBackgroundColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset0, dataset1)); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Radar Chart")) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScale(new Scale() - .setTicks(new Ticks() - .setBeginAtZero(true))); - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java deleted file mode 100644 index 47e62fc4..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java +++ /dev/null @@ -1,182 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that supports different point styles: - * 'circle', - * 'triangle', - * 'rect', - * 'rectRounded', - * 'rectRot', - * 'cross', - * 'crossRot', - * 'star', - * 'line', - * 'dash' - * - * @see http://www.chartjs.org/samples/latest/charts/line/point-styles.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PointStylesConfiguration extends ShowcaseConfiguration { - public PointStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dash") - .setBackgroundColor(SimpleColor.GREY) - .setBorderColor(SimpleColor.GREY) - .setData(IntegerValue.of(Arrays.asList(1,1,1,1,1,1,1))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.DASH) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("Star") - .setBackgroundColor(SimpleColor.PURPLE) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(Arrays.asList(2,2,2,2,2,2,2))) - .setShowLine(false) - .setPointRadius(20) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.STAR) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("Rectangle") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(Arrays.asList(3,3,3,3,3,3,3))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT) - .setFill(false); - - Dataset dataset4 = new Dataset() - .setLabel("Triangle") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(Arrays.asList(4,4,4,4,4,4,4))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.TRIANGLE) - .setFill(false); - - Dataset dataset5 = new Dataset() - .setLabel("Circle") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(5,5,5,5,5,5,5))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CIRCLE) - .setFill(false); - - Dataset dataset6 = new Dataset() - .setLabel("CrossRot") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(6,6,6,6,6,6,6))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CROSS_ROT) - .setFill(false); - - Dataset dataset7 = new Dataset() - .setLabel("Line") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(7,7,7,7,7,7,7))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.LINE) - .setFill(false); - - Dataset dataset8 = new Dataset() - .setLabel("Cross") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(8,8,8,8,8,8,8))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CROSS) - .setFill(false); - - Dataset dataset9 = new Dataset() - .setLabel("Rectangle Rounded") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(9,9,9,9,9,9,9))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT_ROUNDED) - .setFill(false); - - Dataset dataset10 = new Dataset() - .setLabel("Rectangle Rotated") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(11,11,11,11,11,11,11))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT_ROT) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1, dataset2, dataset3, dataset4, dataset5, dataset6, - dataset7, dataset8, dataset9, dataset10)); - - //Point Style Can also be set in the options using the Elements option - //But you can only have one point style for all datasets - - //Some Point Styles are drawn incorrectly - //See this issue: https://github.com/chartjs/Chart.js/issues/2607 - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Point Styles")) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")) - .setTicks(new Ticks() - .setMax(13) - .setMin(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java deleted file mode 100644 index be74b50d..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java +++ /dev/null @@ -1,98 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.AbsoluteIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.RelativeIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays different datasets on a radar. - * - * @see http://www.chartjs.org/samples/latest/charts/area/radar.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class RadarChartConfiguration extends ShowcaseConfiguration { - public RadarChartConfiguration() { - super(); - setType(ChartType.RADAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("D0") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(1, 2, 3, 1, 2, 1, 2))) - .setFill(BoundaryFillingMode.UNDEFINED); - - - Dataset dataset1 = new Dataset() - .setLabel("D1 (hidden) Fill: -1") - .setBackgroundColor(SimpleColor.ORANGE_TRANSPARENT) - .setBorderColor(SimpleColor.ORANGE) - .setData(IntegerValue.of(Arrays.asList(5, 4, 3, 5, 4, 3, 5))) - .setHidden(true) - .setFill(new RelativeIndex("-1")); - - Dataset dataset2 = new Dataset() - .setLabel("D2 Fill: 1") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(10, 8, 12, 6, 13, 10, 9))) - .setFill(new AbsoluteIndex(1)); - - - Dataset dataset3 = new Dataset() - .setLabel("D3 Fill: False") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(Arrays.asList(20, 18, 22, 16, 23, 20, 19))) - .setFill(false); - - Dataset dataset4 = new Dataset() - .setLabel("D4 Fill: -1") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(30, 28, 32, 26, 33, 30, 29))) - .setFill(new RelativeIndex("-1")); - - - Dataset dataset5 = new Dataset() - .setLabel("D5 Fill: -1") - .setBackgroundColor(SimpleColor.PURPLE_TRANSPARENT) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(Arrays.asList(40, 38, 42, 36, 43, 40, 39))) - .setFill(new RelativeIndex("-1")); - - data.setDatasets(Arrays.asList(dataset0, dataset1, dataset2, dataset3, dataset4, dataset5)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Radar Chart")) - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins() - .setFiller(new Filler() - .setPropagate(false)) - .setSamples_filler_analyzer(new SamplesFillerAnalyzer() - .setTarget("chart-analyzer"))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java deleted file mode 100644 index b9cee224..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java +++ /dev/null @@ -1,79 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample which displays data as scattered points in the coordinate system. - * - * @see http://www.chartjs.org/samples/latest/charts/scatter/basic.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class ScatterChartConfiguration extends ShowcaseConfiguration { - public ScatterChartConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Scatter Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setPosition(Position.BOTTOM) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java deleted file mode 100644 index 0dc680a2..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java +++ /dev/null @@ -1,91 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbaColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays a scatter chart with two y-axes. - * - * @see http://www.chartjs.org/samples/latest/charts/scatter/multi-axis.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class ScatterChartMultiAxisConfiguration extends ShowcaseConfiguration { - public ScatterChartMultiAxisConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setYAxisID("y-axis-1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setYAxisID("y-axis-2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Scatter Chart Multi Axis")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setPosition(Position.BOTTOM) - .setGridLines(new GridLines() - .setZeroLineColor(new RgbaColor(0, 0, 0, 1))) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setReverse(true) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java deleted file mode 100644 index 102fdcd0..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java +++ /dev/null @@ -1,87 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.Session; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Sample which displays a bar chart for the data distribution and a line chart for the time progression of datasets. - * - * @see http://www.chartjs.org/samples/latest/scales/time/combo.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeComboConfiguration extends ShowcaseConfiguration { - - - public TimeComboConfiguration() { - setType(ChartType.BAR); - - String timeFormat = "MM/DD/YYYY HH:mm"; - - List labels = new ArrayList(7); - - LocalDateTime now = LocalDateTime.now(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM/dd/uuuu HH:mm", Session.get().getLocale()); - - - for(int i = 0; i < 7; i++) { - labels.add(new TextLabel(now.plus(i,ChronoUnit.DAYS).format(formatter))); - } - - Dataset dataset1 = new Dataset() - .setType(ChartType.BAR) - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset3 = new Dataset() - .setType(ChartType.LINE) - .setLabel("Dataset 3") - .setFill(false) - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - - - setData( new Data() - .setLabels(labels) - .setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - ); - - - - setOptions( new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDisplay(true) - .setTime(new TimeFormat() - .setFormat(timeFormat) -// .setRound(TimeFormatRound.DAY) - )))); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java deleted file mode 100644 index 1771cd0d..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java +++ /dev/null @@ -1,126 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.StringValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ValueType; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -/** - * Sample which displays a time progression line for datasets. - * - * @see http://www.chartjs.org/samples/latest/scales/time/line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeLineConfiguration extends ShowcaseConfiguration { - - public TimeLineConfiguration() { - setType(ChartType.LINE); - - Data data = new Data(); - - String timeFormat = "MM/DD/YYYY HH:mm"; - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(timeFormat); - - List dateList = new ArrayList(); - for(int i = 0; i < 7; i++) { - dateList.add(new DateTimeLabel(LocalDateTime.of(2018, 1,1, 8+i, 00))); - } - data.setLabels(dateList); - - Dataset dataset1 = new Dataset() - .setLabel("My First Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - ; - - Dataset dataset2 = new Dataset() - .setLabel("My Second Dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - ; - - Dataset dataset3 = new Dataset() - .setLabel("Dataset with point data") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(0).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(1).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(2).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(3).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(4).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(5).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(6).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 15, 0)))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 16, 0)))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 17, 0)))) - .setY(randomInteger()) - )) - ; - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - setData(data); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setTime(new TimeFormat() - .setTimeFormat(timeFormat ) - .setTooltipFormat("ll HH:mm"))) - .setYAxes(new AxesScale() - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("value")))); - setOptions(options); - - - } - - private ValueType randomInteger() { - Random rng = new Random(); - return new IntegerValue(rng.nextInt(60)+1); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java deleted file mode 100644 index 9913c110..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java +++ /dev/null @@ -1,138 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.StringValueColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.*; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -/** - * Sample which highlights the important points of the x-axis. - * - * @see http://www.chartjs.org/samples/latest/scales/time/line-point-data.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimePointConfiguration extends ShowcaseConfiguration { - - - public TimePointConfiguration() { - setType(ChartType.LINE); - - String timeFormat = "MM/DD/YYYY HH:mm"; - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(timeFormat); - - Data data = new Data(); - - List dateList = new ArrayList(); - for(int i = 0; i < 7; i++) { - dateList.add(new DateTimeLabel(LocalDateTime.of(2018, 1,1, 8+i, 00))); - } - data.setLabels(dateList); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset with date object point data") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new DateTimeValue(dateList.get(0).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(1).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(2).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(3).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(4).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(5).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(6).getDate())) - .setY(randomInteger()) - )); - - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset with string point data") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(0).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(1).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(2).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(3).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(4).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(5).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(6).getDate()))) - .setY(randomInteger()) - )) - ; - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - setData(data); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Date")) - .setTicks(new Ticks() - .setMajor(new TickStyle() - .setFontColor(new StringValueColor("red")) - .setFontStyle(FontStyle.BOLD)))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("value")))); - setOptions(options); - - - } - - private ValueType randomInteger() { - Random rng = new Random(); - return new IntegerValue(rng.nextInt(60)+1); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java deleted file mode 100644 index b634b84d..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.DoubleValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Sample that displays a progression of a dataset. - * - * @see http://www.chartjs.org/samples/latest/scales/time/financial.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeSeriesConfiguration extends ShowcaseConfiguration { - - public TimeSeriesConfiguration() { - - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Time Series")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDistribution(DistributionType.SERIES) - .setTicks(new Ticks() - .setSource(TickSource.LABELS) - ) - ) - .setYAxes(new AxesScale() - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Closing price ($)")) - )); - - setOptions(options); - - setType(ChartType.LINE); - - LocalDateTime now = LocalDateTime.now(); - - - List labels = new ArrayList(60); - List randomData = new ArrayList(60); - - labels.add(new DateTimeLabel(now)); - randomData.add(randomBar(30)); - - - for(int i = 1; i < 60; i++) { - int dayOfTheWeek = now.plus(i, ChronoUnit.DAYS).getDayOfWeek().getValue(); - if( 1 <= dayOfTheWeek && dayOfTheWeek <= 5) { - labels.add(new DateTimeLabel(now.plus(i, ChronoUnit.DAYS))); - } - randomData.add(randomBar(randomData.get(i-1).getValue())); - } - - - - Data data = new Data() - .setLabels(labels) - .setDatasets(Arrays.asList(new Dataset() - .setLabel("My Dataset") - .setData(randomData) - .setType(ChartType.LINE) - .setPointRadius(0) - .setFill(false) - .setLineTension(0) - .setBorderWidth(2) - )); - setData(data); - } - - private DoubleValue randomBar(double lastClose) { - double open = randomNumber(lastClose * .95, lastClose *1.05); - double close = randomNumber(open * .95, open *1.05); -// double high = randomNumber(Math.max(open, close), Math.max(open, close) * 1.1); -// double low = randomNumber(Math.min(open, close) * .9, Math.min(open, close)); - return new DoubleValue(close); - } - - private double randomNumber(double min, double max) { - return Math.random() * (max - min) + min; - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java deleted file mode 100644 index 7271021f..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java +++ /dev/null @@ -1,62 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbaColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample which adds a border to the tooltips. - * - * @see http://www.chartjs.org/samples/latest/tooltips/border.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipBorderConfiguration extends ShowcaseConfiguration { - public TooltipBorderConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(10, 30, 46, 2,8,50,0)) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1)); - - - RgbColor black = new RgbColor(0,0,0); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip with border")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setIntersect(false) - .setYPadding(10) - .setXPadding(10) - .setCaretSize(8) - .setBackgroundColor(new RgbaColor(72, 241, 12,1.0f)) - .setTitleFontColor(black) - .setBodyFontColor(black) - .setBorderColor(new RgbaColor(0,0,0,1.0f)) - .setBorderWidth(4)) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java deleted file mode 100644 index 87bb95eb..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java +++ /dev/null @@ -1,81 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that enables the use of callback functions for tooltips. - * - * @see http://www.chartjs.org/samples/latest/tooltips/callbacks.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipCallbacksConfiguration extends ShowcaseConfiguration { - public TooltipCallbacksConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - String footerFunction = "function(tooltipItems, data) {\r\n" + - " var sum = 0;\r\n" + - "\r\n" + - " tooltipItems.forEach(function(tooltipItem) {\r\n" + - " sum += data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];\r\n" + - " });\r\n" + - " return 'Sum: ' + sum;\r\n" + - " }"; - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Custom Information in Tooltip")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setCallbacks(new TooltipCallbacks() - .setFooter(new CallbackFunction(footerFunction))) - .setFooterFontStyle(FontStyle.NORMAL)) - .setHover(new Hover() - .setMode(HoverMode.INDEX) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java deleted file mode 100644 index 686cc84b..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Sample that enables the use of custom html markup for tooltips in a line chart. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlLineConfiguration extends ShowcaseConfiguration { - public TooltipHtmlLineConfiguration() { - setType(ChartType.LINE); - - String optionalJavascript= readFile("de/adesso/wickedcharts/showcase/customTooltip.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Line")) - .setTooltips(new Tooltips() - .setEnabled(false) - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java deleted file mode 100644 index f6ba2261..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java +++ /dev/null @@ -1,59 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Sample that enables the use of custom html markup for tooltips in a pie chart. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-pie.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlPieConfiguration extends ShowcaseConfiguration { - public TooltipHtmlPieConfiguration() { - setType(ChartType.PIE); - - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/customTooltip-Pie.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data(); - setData(data); - - Dataset dataset = new Dataset() - .setLabel("My Dataset") - .setBackgroundColor(Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE,SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setData(IntegerValue.of(300, 50, 100, 40, 10)); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setDisplay(true)) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Pie")) - .setTooltips(new Tooltips() - .setEnabled(false) -// .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","pieTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java deleted file mode 100644 index 64d68d36..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ /dev/null @@ -1,57 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.base; - -import de.adesso.wickedcharts.chartjs.ChartConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Scanner; - -/** - * The base class for all chart configurations for the showcase - */ -@SuppressWarnings("serial") -public abstract class ShowcaseConfiguration extends ChartConfiguration{ - - protected List randomIntegerList(int size) { - List dataList = new ArrayList<>(); - Random rng = new Random(); - for (int i = 0; i < size; i++) { - dataList.add(rng.nextInt(60) + 1); - } - return dataList; - } - - protected String readFile(String fileName) { - - StringBuilder result = new StringBuilder(""); - - // Get file from resources folder - ClassLoader classLoader = getClass().getClassLoader(); - File file = new File(classLoader.getResource(fileName).getFile()); - - try (Scanner scanner = new Scanner(file)) { - - while (scanner.hasNextLine()) { - String line = scanner.nextLine(); - result.append(line).append("\n"); - } - - scanner.close(); - - } catch (IOException e) { - e.printStackTrace(); - } - - return result.toString(); - - } - - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","defaultTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java deleted file mode 100644 index c54b2548..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java +++ /dev/null @@ -1,74 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.StringValueColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * Chart configuration for different grid line styles. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-style.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLineStylesConfiguration extends ShowcaseConfiguration { - public GridLineStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 39, 20, 25, 34, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Styles")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setGridLines(new GridLines() - .setDrawBorder(true) - .setColor(Arrays.asList( - new StringValueColor("pink"), - new StringValueColor("red"), - new StringValueColor("orange"), - new StringValueColor("yellow"), - new StringValueColor("green"), - new StringValueColor("blue"), - new StringValueColor("indigo"), - new StringValueColor("purple")))) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(10)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java deleted file mode 100644 index ea0a665c..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * Chart configuration for the basic grid line layout. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesBasicConfiguration extends ShowcaseConfiguration { - - protected GridLines gridLines; - - public GridLinesBasicConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(10, 30, 39, 20, 25, 34, -10)) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - gridLines = new GridLines() - .setDisplay(true); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Basic")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setGridLines(gridLines)) - .setYAxes(new AxesScale() - .setGridLines(gridLines) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(10)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java deleted file mode 100644 index b45bc4c9..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration for the area chart grid line layout. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesChartAreaConfiguration extends GridLinesBasicConfiguration { - - public GridLinesChartAreaConfiguration() { - super(); - - gridLines.setDisplay(true) - .setDrawBorder(true) - .setDrawOnChartArea(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Chart Area")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java deleted file mode 100644 index 171a41fe..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display grid lines. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesDisplayFalseConfiguration extends GridLinesBasicConfiguration { - - public GridLinesDisplayFalseConfiguration() { - super(); - - gridLines.setDisplay(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Display False")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java deleted file mode 100644 index 9c05bfd8..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display the ticks. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesTicksConfiguration extends GridLinesBasicConfiguration { - - public GridLinesTicksConfiguration() { - super(); - - gridLines.setDisplay(true) - .setDrawBorder(true) - .setDrawOnChartArea(true) - .setDrawTicks(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Ticks")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java deleted file mode 100644 index b44975d6..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect false the nearest item is used to determine the index. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class DatasetIntersectFalseConfiguration extends ShowcaseConfiguration { - public DatasetIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Dataset, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.DATASET) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java deleted file mode 100644 index e6fd9d62..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If the intersect setting is true, the first intersecting item is used to determine the index in the data. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class DatasetIntersectTrueConfiguration extends ShowcaseConfiguration { - public DatasetIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Dataset, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.DATASET) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java deleted file mode 100644 index 51d05303..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If the intersect setting is true, the first intersecting item is used to determine the index in the data. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class IndexIntersectTrueConfiguration extends ShowcaseConfiguration { - public IndexIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Index, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java deleted file mode 100644 index cc445895..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect is true, this is only triggered when the mouse position intersects an item in the graph. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class NearestIntersectTrueConfiguration extends ShowcaseConfiguration { - public NearestIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Nearest, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java deleted file mode 100644 index d0dabfa2..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Finds no items that intersect the point. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class PointIntersectFalseConfiguration extends ShowcaseConfiguration { - public PointIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Point, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.POINT) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java deleted file mode 100644 index d1fa9739..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Does not return all items that would intersect based on the X coordinate of the position only. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class xIntersectFalseConfiguration extends ShowcaseConfiguration { - public xIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: x, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.X) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java deleted file mode 100644 index f4f97476..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Returns all items that would intersect based on the X coordinate of the position only. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class xIntersectTrueConfiguration extends ShowcaseConfiguration { - public xIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: x, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.X) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java deleted file mode 100644 index 16512e31..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Returns all items that would intersect based on the Y coordinate of the position. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class yIntersectTrueConfiguration extends ShowcaseConfiguration { - public yIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: y, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.Y) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java deleted file mode 100644 index bc02dee4..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position at the bottom - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionBottomConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionBottomConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN); - - getOptions().setLegend(new Legend().setPosition(Position.BOTTOM)); - - getOptions().getTitle().setText("Legend Position: Bottom"); - } -} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java deleted file mode 100644 index 1a8aecd5..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Base class for the other configurations for the legend position - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionChartBasicConfiguration extends ShowcaseConfiguration { - public LegendPositionChartBasicConfiguration() { - super(); - - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setData(IntegerValue.of(randomIntegerList(7))) - .setBorderWidth(1); - - data.setDatasets(Arrays.asList(dataset1)); - setData(data); - - Options options = new Options() - .setResponsive(true) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value"))) - ) - .setTitle(new Title() - .setDisplay(true)) - ; - setOptions(options); - - } -} - diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java deleted file mode 100644 index 38dcecc9..00000000 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java +++ /dev/null @@ -1,29 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position on the right - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionRightConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionRightConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE); - - getOptions().setLegend(new Legend().setPosition(Position.RIGHT)); - - getOptions().getTitle().setText("Legend Position: Right"); - } -} - diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket15.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket15.java new file mode 100644 index 00000000..cb3c4b47 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket15.java @@ -0,0 +1,25 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * + * A sample that shows how a line chart with a progress bar is configured. + * + * @see http://www.chartjs.org/samples/latest/advanced/progress-bar.html + * + * @author maximAtanasov + */ +@SuppressWarnings("serial") +public class LineChartProgressBarConfigurationWicket15 extends LineChartProgressBarConfiguration { + + public LineChartProgressBarConfigurationWicket15() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","progressBar", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket15.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket15.java new file mode 100644 index 00000000..f2a2a590 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket15.java @@ -0,0 +1,26 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.Session; + +import java.util.Locale; + +/** + * Sample which displays a bar chart for the data distribution and a line chart for the time progression of datasets. + * + * @see http://www.chartjs.org/samples/latest/scales/time/combo.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TimeComboConfigurationWicket15 extends TimeComboConfiguration { + + + public TimeComboConfigurationWicket15() { + super(); + } + + @Override + public Locale getSessionLocale(){ + return Session.get().getLocale(); + } +} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket15.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket15.java new file mode 100644 index 00000000..775a557d --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket15.java @@ -0,0 +1,23 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * Sample that enables the use of custom html markup for tooltips in a pie chart. + * + * @see http://www.chartjs.org/samples/latest/tooltips/custom-pie.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TooltipHtmlPieConfigurationWicket15 extends TooltipHtmlPieConfiguration { + public TooltipHtmlPieConfigurationWicket15() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","pieTooltip", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket15.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket15.java new file mode 100644 index 00000000..7418c934 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket15.java @@ -0,0 +1,23 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * Sample that enables the use of custom html markup for tooltip points. + * + * @see http://www.chartjs.org/samples/latest/tooltips/custom-points.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TooltipHtmlPointsConfigurationWicket15 extends TooltipHtmlPointsConfiguration { + public TooltipHtmlPointsConfigurationWicket15() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","pointTooltip", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java index f91c05be..047dae55 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import de.adesso.wickedcharts.wicket6.chartjs.Chart; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.html.panel.Panel; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index 9391f4b8..2aedc488 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -15,13 +15,13 @@ */ -import de.adesso.wickedcharts.showcase.configurations.*; -import de.adesso.wickedcharts.showcase.configurations.gridlines.*; -import de.adesso.wickedcharts.showcase.configurations.interactions.*; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionBottomConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionLeftConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionRightConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionTopConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.*; +import de.adesso.wickedcharts.showcase.options.chartjs.gridlines.*; +import de.adesso.wickedcharts.showcase.options.chartjs.interactions.*; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionBottomConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionLeftConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionRightConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionTopConfiguration; import de.adesso.wickedcharts.showcase.links.ChartjsShowcaseLink; import de.adesso.wickedcharts.showcase.links.HighchartsShowcaseLink; import de.adesso.wickedcharts.showcase.links.UpdateChartJsLink; @@ -167,10 +167,9 @@ private List getChartFromParams(final PageParameters params) { String chartString; List config = new ArrayList<>(); - //If the showcase is started without any parameters //set the parameters to lineBasic and give us a line Chart - if(params.getAllNamed().size() == 0){ + if(params.getAllNamed().isEmpty()){ PageParameters temp = new PageParameters(); temp.add("chart", "lineBasic"); setResponsePage(HomepageChartJs.class, temp); @@ -312,7 +311,7 @@ private List getChartFromParams(final PageParameters params) { break; case "timeCombo": - config.add(new Chart("chart", new TimeComboConfiguration())); + config.add(new Chart("chart", new TimeComboConfigurationWicket6())); break; case "gridLines": @@ -356,8 +355,8 @@ private List getChartFromParams(final PageParameters params) { case "tooltipHtml": config.add(new Chart("chart", new TooltipHtmlLineConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPieConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPointsConfiguration())); + config.add(new Chart("chart", new TooltipHtmlPieConfigurationWicket6())); + config.add(new Chart("chart", new TooltipHtmlPointsConfigurationWicket6())); break; case "bubble": @@ -365,7 +364,7 @@ private List getChartFromParams(final PageParameters params) { break; case "lineProgressBar": - config.add(new Chart("chart", new LineChartProgressBarConfiguration())); + config.add(new Chart("chart", new LineChartProgressBarConfigurationWicket6())); break; case "dataLabelling": diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index 4218e58c..a6f9e7ca 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -20,6 +20,7 @@ import de.adesso.wickedcharts.showcase.links.UpdateHighchartLink; import de.adesso.wickedcharts.showcase.links.UpdateThemeLink; import de.adesso.wickedcharts.showcase.options.*; +import de.adesso.wickedcharts.showcase.options.highcharts.base.*; import de.adesso.wickedcharts.wicket6.highcharts.Chart; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java deleted file mode 100644 index bfcd00db..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'end' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartEndConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartEndConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.END); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - End")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java deleted file mode 100644 index 0ac5393a..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java +++ /dev/null @@ -1,63 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'false' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartFalseConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - False")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java deleted file mode 100644 index 7bca9aeb..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'origin' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartOriginConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartOriginConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.ORIGIN); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - Origin")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java deleted file mode 100644 index 7178325e..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a horizontal bar chart configuration looks. - */ - -/** - * - * A sample that shows how a horizontal bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/horizontal.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class BarChartHorizontalConfiguration extends ShowcaseConfiguration { - public BarChartHorizontalConfiguration() { - super(); - setType(ChartType.HORIZONTAL_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setElements(new Rectangle()) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Horizontal Bar Chart")) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java deleted file mode 100644 index 1573712e..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java +++ /dev/null @@ -1,80 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a multi-axis bar chart configuration looks. - */ - -/** - * - * A sample that shows how a multi-axis bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/multi-axis.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class BarChartMultiAxisConfiguration extends ShowcaseConfiguration{ - public BarChartMultiAxisConfiguration() { - setType(ChartType.BAR); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-1"); - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-2"); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Multi Axis")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScales(new Scales() - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - - ; - setOptions(options); - - } - -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java deleted file mode 100644 index 20a05db5..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a stacked bar chart configuration looks. - */ - -/** - * - * A sample that shows how a stack bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/stacked.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class BarChartStackedConfiguration extends ShowcaseConfiguration { - public BarChartStackedConfiguration() { - setType(ChartType.STACKED_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - Dataset dataset3 = new Dataset() - .setLabel("Dataset 3") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Stacked")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java deleted file mode 100644 index cd1cea4f..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java +++ /dev/null @@ -1,86 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a stacked group bar chart configuration looks. - */ - -/** - * - * A sample that shows how a stacked bar chart group configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/stacked-group.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class BarChartStackedGroupConfiguration extends ShowcaseConfiguration { - public BarChartStackedGroupConfiguration() { - setType(ChartType.STACKED_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("0"); - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("0"); - - Dataset dataset3 = new Dataset() - .setLabel("Dataset 3") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Stacked Groups")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java deleted file mode 100644 index c0275a09..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java +++ /dev/null @@ -1,61 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a vertical bar chart configuration looks. - */ - -/** - * - * A sample that shows how a vertical bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/vertical.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class BarChartVerticalConfiguration extends ShowcaseConfiguration { - public BarChartVerticalConfiguration() { - super(); - setType(ChartType.BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart")) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java deleted file mode 100644 index ba8c44d3..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java +++ /dev/null @@ -1,103 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.BubbleValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.Random; - -/** - * - * A sample that shows how a bubble chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scriptable/bubble.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class BubbleChartConfiguration extends ShowcaseConfiguration { - public BubbleChartConfiguration() { - super(); - setType(ChartType.BUBBLE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("My Third dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - - Options options = new Options() - .setResponsive(true) - .setAspectRatio((double)1) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bubble Chart")) - ; - setOptions(options); - - - } - - private Double randomDouble(int bound) { - Random random = new Random(); - return (double)random.nextInt(bound)+1; - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java deleted file mode 100644 index 02987aff..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how a combo bar-line chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/combo-bar-line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class ComboBarLineChartConfiguration extends ShowcaseConfiguration { - public ComboBarLineChartConfiguration() { - super(); - setType(ChartType.BAR); - Data data = new Data(); - Dataset dataset1 = new Dataset(); - dataset1.setType(ChartType.LINE) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(2) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 1"); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.WHITE) - .setBorderWidth(2) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 2"); - - Dataset dataset3 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 3"); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Bar Line Chart")) - .setTooltips(new Tooltips() - .setIntersect(true) - .setMode(TooltipMode.INDEX)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java deleted file mode 100644 index 14938151..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java +++ /dev/null @@ -1,71 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how different point style configurations look. - * - * @see http://www.chartjs.org/samples/latest/legend/point-style.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LegendPointStyleConfiguration extends ShowcaseConfiguration { - public LegendPointStyleConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setPointStyle(PointStyle.RECT_ROT) - .setPointRadius(10) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.ORIGIN); - - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Point Style Legend")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setLabels(new LegendLabel() - .setUsePointStyle(true))) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java deleted file mode 100644 index af88eb23..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java +++ /dev/null @@ -1,143 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.AbsoluteIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.RelativeIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a chart with different datasets can be configured. - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-datasets.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartAreaDatasetConfiguration extends ShowcaseConfiguration { - public LineChartAreaDatasetConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("D0 (hidden), Fill: undefined") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(BoundaryFillingMode.UNDEFINED) - .setHidden(true); - - - Dataset dataset1 = new Dataset() - .setLabel("D1 Fill: -1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("-1")); - - - Dataset dataset2 = new Dataset() - .setLabel("D2 (hidden) Fill: 1") - .setBackgroundColor(SimpleColor.ORANGE_TRANSPARENT) - .setBorderColor(SimpleColor.ORANGE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setHidden(true) - .setFill(new AbsoluteIndex(1)); - - Dataset dataset3 = new Dataset() - .setLabel("D3 Fill: -1") - .setBackgroundColor(SimpleColor.YELLOW_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset4 = new Dataset() - .setLabel("D4 Fill: -1") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("-1")); - - Dataset dataset5 = new Dataset() - .setLabel("D5 Fill: +2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("+2")); - - - Dataset dataset6 = new Dataset() - .setLabel("D6 Fill: false") - .setBackgroundColor(SimpleColor.GREY_TRANSPARENT) - .setBorderColor(SimpleColor.GREY) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset7 = new Dataset() - .setLabel("D7 Fill: 8") - .setBackgroundColor(SimpleColor.PURPLE_TRANSPARENT) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new AbsoluteIndex(8)); - - - Dataset dataset8 = new Dataset() - .setLabel("D8 (hidden) Fill: end") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setHidden(true) - .setFill(BoundaryFillingMode.END); - - data.setDatasets(Arrays.asList(dataset0, dataset1, dataset2, dataset3, dataset4, - dataset5, dataset6, dataset7, dataset8)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Dataset Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setPlugins(new Plugins() - .setFiller(new Filler() - .setPropagate(false)) - .setSamples_filler_analyzer(new SamplesFillerAnalyzer() - .setTarget("chart-analyzer"))) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java deleted file mode 100644 index 5b51dafd..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java +++ /dev/null @@ -1,84 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.List; - -/** - * - * A sample that shows how configuring interpolation of lines in a line chart is configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/interpolation-modes.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartInterpolatedConfiguration extends ShowcaseConfiguration { - public LineChartInterpolatedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - List datasetsData = IntegerValue.of(randomIntegerList(7)); - - Dataset dataset1 = new Dataset() - .setLabel("Cubic interpolation (monotone)") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(datasetsData) - .setFill(false) - .setCubicInterpolationMode(CubicInterpolationMode.MONOTONE); - - Dataset dataset2 = new Dataset() - .setLabel("Cubic interpolation (default)") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(datasetsData) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("Linear interpolation") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(datasetsData) - .setFill(false) - .setLineTension(0); - - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Interpolation")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java deleted file mode 100644 index fe82651a..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java +++ /dev/null @@ -1,76 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how multiple axes in a line chart are configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/multi-axis.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartMultiAxisConfiguration extends ShowcaseConfiguration{ - public LineChartMultiAxisConfiguration() { - setType(ChartType.LINE); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-1"); - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-2"); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart - Multi Axis")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScales(new Scales() - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - - ; - setOptions(options); - - } - -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java deleted file mode 100644 index cf6f940d..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java +++ /dev/null @@ -1,95 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * - * A sample that shows how a line chart with a progress bar is configured. - * - * @see http://www.chartjs.org/samples/latest/advanced/progress-bar.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartProgressBarConfiguration extends ShowcaseConfiguration { - public LineChartProgressBarConfiguration() { - super(); - setType(ChartType.LINE); - - String optionalJavascript= readFile("de/adesso/wickedcharts/showcase/progressBar.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Progress Bar")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setAnimation(new Animation() - .setDuration(2000) - .setOnProgress(new CallbackFunction("function(animation) {\r\n" + - " progress.value = animation.currentStep / animation.numSteps;\r\n" + - " }")) - .setOnComplete(new CallbackFunction("function(animation) {\r\n" + - " window.setTimeout(function() {\r\n" + - " progress.value = 0;\r\n" + - " }, 2000);\r\n" + - " }"))) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","progressBar",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java deleted file mode 100644 index 383c7a06..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a stacked line chart is configured. - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-stacked.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartStackedConfiguration extends ShowcaseConfiguration{ - public LineChartStackedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset3 = new Dataset() - .setLabel("My Third dataset") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Stacked Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java deleted file mode 100644 index cc3da325..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a stepped line chart configuration looks with stepped = after. - * - * @see http://www.chartjs.org/samples/latest/charts/line/stepped.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartSteppedAfterConfiguration extends ShowcaseConfiguration { - public LineChartSteppedAfterConfiguration() { - super(); - setType(ChartType.LINE); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - - - Dataset dataset1 = new Dataset() - .setLabel("Stepped After") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setSteppedLine(SteppedLineValue.AFTER); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Stepped - After")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java deleted file mode 100644 index 84f1afb3..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java +++ /dev/null @@ -1,75 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a line chart with linear step size is configured. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/step-size.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LinearStepSizeConfiguration extends ShowcaseConfiguration { - public LinearStepSizeConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(5)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java deleted file mode 100644 index 0924670d..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java +++ /dev/null @@ -1,72 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a logarithmic line chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scales/logarithmic/line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LogarithmicLineChartConfiguration extends ShowcaseConfiguration { - public LogarithmicLineChartConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Logarithmic Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("logarithmic") - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java deleted file mode 100644 index 2d826156..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure min and max Ticks in the chart options. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/min-max.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MinMaxConfiguration extends ShowcaseConfiguration { - public MinMaxConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 39, 20, 25, 34, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(100, 33, 22, 19, 11, 49, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Min and Max")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setTicks(new Ticks() - .setMin(10) - .setMax(50)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java deleted file mode 100644 index a6f3c0e7..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.ConstLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ConstValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure non-numeric values in a chart. - * - * @see http://www.chartjs.org/samples/latest/scales/non-numeric-y.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class NonNumericConfiguration extends ShowcaseConfiguration { - - public NonNumericConfiguration() { - setType(ChartType.LINE); - - Data data = new Data() - .setXLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")) - .setYLabels(ConstLabel.of("", "Request Added", "Request Viewed", "Request Accepted", "Request Solved", "Solving Confirmed")) - ; - - Dataset dataset1 = new Dataset() - .setLabel("My First Dataset") - .setFill(false) - .setBorderColor(SimpleColor.RED) - .setBackgroundColor(SimpleColor.RED) - .setData(ConstValue.of("", "Request Added", "Request Added", "Request Added", "Request Viewed", "Request Viewed", "Request Viewed")) - ; - data.setDatasets(Arrays.asList(dataset1)); - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart with Non Numeric Y Axis")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("category") - .setPosition(Position.LEFT) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Request State")) - .setTicks(new Ticks() - .setReverse(true)))) - ; - setOptions(options); - - - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java deleted file mode 100644 index 19e7d5ec..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextListLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays different datasets on a radar. - * - * @see http://www.chartjs.org/samples/latest/charts/radar.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class OtherRadarChartConfiguration extends ShowcaseConfiguration { - public OtherRadarChartConfiguration() { - super(); - setType(ChartType.RADAR); - - Data data = new Data() - .setLabels(Arrays.asList( - new TextListLabel("Eating", "Dinner"), - new TextListLabel("Drining", "Water"), - new TextLabel("Sleeping"), - new TextListLabel("Designing","Graphics"), - new TextLabel("Coding"), - new TextLabel("Cycling"), - new TextLabel("Running") - )); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setPointBackgroundColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - - Dataset dataset1 = new Dataset() - .setLabel("My second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setPointBackgroundColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset0, dataset1)); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Radar Chart")) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScale(new Scale() - .setTicks(new Ticks() - .setBeginAtZero(true))); - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java deleted file mode 100644 index 9301accc..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java +++ /dev/null @@ -1,44 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.ChartType; -import de.adesso.wickedcharts.chartjs.chartoptions.Data; -import de.adesso.wickedcharts.chartjs.chartoptions.Dataset; -import de.adesso.wickedcharts.chartjs.chartoptions.Options; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays a dataset as a pie chart. - * - * @see http://www.chartjs.org/samples/latest/charts/pie.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PieChartConfiguration extends ShowcaseConfiguration { - public PieChartConfiguration() { - super(); - setType(ChartType.PIE); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE, SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java deleted file mode 100644 index 47e62fc4..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java +++ /dev/null @@ -1,182 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that supports different point styles: - * 'circle', - * 'triangle', - * 'rect', - * 'rectRounded', - * 'rectRot', - * 'cross', - * 'crossRot', - * 'star', - * 'line', - * 'dash' - * - * @see http://www.chartjs.org/samples/latest/charts/line/point-styles.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PointStylesConfiguration extends ShowcaseConfiguration { - public PointStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dash") - .setBackgroundColor(SimpleColor.GREY) - .setBorderColor(SimpleColor.GREY) - .setData(IntegerValue.of(Arrays.asList(1,1,1,1,1,1,1))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.DASH) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("Star") - .setBackgroundColor(SimpleColor.PURPLE) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(Arrays.asList(2,2,2,2,2,2,2))) - .setShowLine(false) - .setPointRadius(20) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.STAR) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("Rectangle") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(Arrays.asList(3,3,3,3,3,3,3))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT) - .setFill(false); - - Dataset dataset4 = new Dataset() - .setLabel("Triangle") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(Arrays.asList(4,4,4,4,4,4,4))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.TRIANGLE) - .setFill(false); - - Dataset dataset5 = new Dataset() - .setLabel("Circle") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(5,5,5,5,5,5,5))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CIRCLE) - .setFill(false); - - Dataset dataset6 = new Dataset() - .setLabel("CrossRot") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(6,6,6,6,6,6,6))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CROSS_ROT) - .setFill(false); - - Dataset dataset7 = new Dataset() - .setLabel("Line") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(7,7,7,7,7,7,7))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.LINE) - .setFill(false); - - Dataset dataset8 = new Dataset() - .setLabel("Cross") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(8,8,8,8,8,8,8))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CROSS) - .setFill(false); - - Dataset dataset9 = new Dataset() - .setLabel("Rectangle Rounded") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(9,9,9,9,9,9,9))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT_ROUNDED) - .setFill(false); - - Dataset dataset10 = new Dataset() - .setLabel("Rectangle Rotated") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(11,11,11,11,11,11,11))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT_ROT) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1, dataset2, dataset3, dataset4, dataset5, dataset6, - dataset7, dataset8, dataset9, dataset10)); - - //Point Style Can also be set in the options using the Elements option - //But you can only have one point style for all datasets - - //Some Point Styles are drawn incorrectly - //See this issue: https://github.com/chartjs/Chart.js/issues/2607 - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Point Styles")) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")) - .setTicks(new Ticks() - .setMax(13) - .setMin(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java deleted file mode 100644 index 03d581f6..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that distributes data in a polar area chart. - * - * @see http://www.chartjs.org/samples/latest/charts/polar-area.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PolarAreaChartConfiguration extends ShowcaseConfiguration { - public PolarAreaChartConfiguration() { - super(); - setType(ChartType.POLAR_AREA); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED_TRANSPARENT,SimpleColor.ORANGE_TRANSPARENT, - SimpleColor.YELLOW_TRANSPARENT, SimpleColor.GREEN_TRANSPARENT, - SimpleColor.BLUE_TRANSPARENT)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Polar Area Chart")) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setScale(new Scale() - .setTicks(new Ticks() - .setBeginAtZero(true)) - .setReverse(false)) - .setAnimation(new Animation() - .setAnimateScale(true) - .setAnimateRotate(false)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java deleted file mode 100644 index be74b50d..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java +++ /dev/null @@ -1,98 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.AbsoluteIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.RelativeIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays different datasets on a radar. - * - * @see http://www.chartjs.org/samples/latest/charts/area/radar.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class RadarChartConfiguration extends ShowcaseConfiguration { - public RadarChartConfiguration() { - super(); - setType(ChartType.RADAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("D0") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(1, 2, 3, 1, 2, 1, 2))) - .setFill(BoundaryFillingMode.UNDEFINED); - - - Dataset dataset1 = new Dataset() - .setLabel("D1 (hidden) Fill: -1") - .setBackgroundColor(SimpleColor.ORANGE_TRANSPARENT) - .setBorderColor(SimpleColor.ORANGE) - .setData(IntegerValue.of(Arrays.asList(5, 4, 3, 5, 4, 3, 5))) - .setHidden(true) - .setFill(new RelativeIndex("-1")); - - Dataset dataset2 = new Dataset() - .setLabel("D2 Fill: 1") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(10, 8, 12, 6, 13, 10, 9))) - .setFill(new AbsoluteIndex(1)); - - - Dataset dataset3 = new Dataset() - .setLabel("D3 Fill: False") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(Arrays.asList(20, 18, 22, 16, 23, 20, 19))) - .setFill(false); - - Dataset dataset4 = new Dataset() - .setLabel("D4 Fill: -1") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(30, 28, 32, 26, 33, 30, 29))) - .setFill(new RelativeIndex("-1")); - - - Dataset dataset5 = new Dataset() - .setLabel("D5 Fill: -1") - .setBackgroundColor(SimpleColor.PURPLE_TRANSPARENT) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(Arrays.asList(40, 38, 42, 36, 43, 40, 39))) - .setFill(new RelativeIndex("-1")); - - data.setDatasets(Arrays.asList(dataset0, dataset1, dataset2, dataset3, dataset4, dataset5)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Radar Chart")) - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins() - .setFiller(new Filler() - .setPropagate(false)) - .setSamples_filler_analyzer(new SamplesFillerAnalyzer() - .setTarget("chart-analyzer"))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java deleted file mode 100644 index 0dc680a2..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java +++ /dev/null @@ -1,91 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbaColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays a scatter chart with two y-axes. - * - * @see http://www.chartjs.org/samples/latest/charts/scatter/multi-axis.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class ScatterChartMultiAxisConfiguration extends ShowcaseConfiguration { - public ScatterChartMultiAxisConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setYAxisID("y-axis-1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setYAxisID("y-axis-2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Scatter Chart Multi Axis")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setPosition(Position.BOTTOM) - .setGridLines(new GridLines() - .setZeroLineColor(new RgbaColor(0, 0, 0, 1))) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setReverse(true) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java deleted file mode 100644 index 1771cd0d..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java +++ /dev/null @@ -1,126 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.StringValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ValueType; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -/** - * Sample which displays a time progression line for datasets. - * - * @see http://www.chartjs.org/samples/latest/scales/time/line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeLineConfiguration extends ShowcaseConfiguration { - - public TimeLineConfiguration() { - setType(ChartType.LINE); - - Data data = new Data(); - - String timeFormat = "MM/DD/YYYY HH:mm"; - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(timeFormat); - - List dateList = new ArrayList(); - for(int i = 0; i < 7; i++) { - dateList.add(new DateTimeLabel(LocalDateTime.of(2018, 1,1, 8+i, 00))); - } - data.setLabels(dateList); - - Dataset dataset1 = new Dataset() - .setLabel("My First Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - ; - - Dataset dataset2 = new Dataset() - .setLabel("My Second Dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - ; - - Dataset dataset3 = new Dataset() - .setLabel("Dataset with point data") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(0).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(1).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(2).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(3).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(4).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(5).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(6).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 15, 0)))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 16, 0)))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 17, 0)))) - .setY(randomInteger()) - )) - ; - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - setData(data); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setTime(new TimeFormat() - .setTimeFormat(timeFormat ) - .setTooltipFormat("ll HH:mm"))) - .setYAxes(new AxesScale() - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("value")))); - setOptions(options); - - - } - - private ValueType randomInteger() { - Random rng = new Random(); - return new IntegerValue(rng.nextInt(60)+1); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java deleted file mode 100644 index 9913c110..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java +++ /dev/null @@ -1,138 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.StringValueColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.*; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -/** - * Sample which highlights the important points of the x-axis. - * - * @see http://www.chartjs.org/samples/latest/scales/time/line-point-data.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimePointConfiguration extends ShowcaseConfiguration { - - - public TimePointConfiguration() { - setType(ChartType.LINE); - - String timeFormat = "MM/DD/YYYY HH:mm"; - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(timeFormat); - - Data data = new Data(); - - List dateList = new ArrayList(); - for(int i = 0; i < 7; i++) { - dateList.add(new DateTimeLabel(LocalDateTime.of(2018, 1,1, 8+i, 00))); - } - data.setLabels(dateList); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset with date object point data") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new DateTimeValue(dateList.get(0).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(1).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(2).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(3).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(4).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(5).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(6).getDate())) - .setY(randomInteger()) - )); - - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset with string point data") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(0).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(1).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(2).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(3).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(4).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(5).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(6).getDate()))) - .setY(randomInteger()) - )) - ; - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - setData(data); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Date")) - .setTicks(new Ticks() - .setMajor(new TickStyle() - .setFontColor(new StringValueColor("red")) - .setFontStyle(FontStyle.BOLD)))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("value")))); - setOptions(options); - - - } - - private ValueType randomInteger() { - Random rng = new Random(); - return new IntegerValue(rng.nextInt(60)+1); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java deleted file mode 100644 index b634b84d..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.DoubleValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Sample that displays a progression of a dataset. - * - * @see http://www.chartjs.org/samples/latest/scales/time/financial.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeSeriesConfiguration extends ShowcaseConfiguration { - - public TimeSeriesConfiguration() { - - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Time Series")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDistribution(DistributionType.SERIES) - .setTicks(new Ticks() - .setSource(TickSource.LABELS) - ) - ) - .setYAxes(new AxesScale() - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Closing price ($)")) - )); - - setOptions(options); - - setType(ChartType.LINE); - - LocalDateTime now = LocalDateTime.now(); - - - List labels = new ArrayList(60); - List randomData = new ArrayList(60); - - labels.add(new DateTimeLabel(now)); - randomData.add(randomBar(30)); - - - for(int i = 1; i < 60; i++) { - int dayOfTheWeek = now.plus(i, ChronoUnit.DAYS).getDayOfWeek().getValue(); - if( 1 <= dayOfTheWeek && dayOfTheWeek <= 5) { - labels.add(new DateTimeLabel(now.plus(i, ChronoUnit.DAYS))); - } - randomData.add(randomBar(randomData.get(i-1).getValue())); - } - - - - Data data = new Data() - .setLabels(labels) - .setDatasets(Arrays.asList(new Dataset() - .setLabel("My Dataset") - .setData(randomData) - .setType(ChartType.LINE) - .setPointRadius(0) - .setFill(false) - .setLineTension(0) - .setBorderWidth(2) - )); - setData(data); - } - - private DoubleValue randomBar(double lastClose) { - double open = randomNumber(lastClose * .95, lastClose *1.05); - double close = randomNumber(open * .95, open *1.05); -// double high = randomNumber(Math.max(open, close), Math.max(open, close) * 1.1); -// double low = randomNumber(Math.min(open, close) * .9, Math.min(open, close)); - return new DoubleValue(close); - } - - private double randomNumber(double min, double max) { - return Math.random() * (max - min) + min; - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java deleted file mode 100644 index 25664e15..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that enables tooltips to be at a average position to the data points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipAverageConfiguration extends ShowcaseConfiguration { - public TooltipAverageConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip Average Position")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.AVERAGE) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java deleted file mode 100644 index 7271021f..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java +++ /dev/null @@ -1,62 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbaColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample which adds a border to the tooltips. - * - * @see http://www.chartjs.org/samples/latest/tooltips/border.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipBorderConfiguration extends ShowcaseConfiguration { - public TooltipBorderConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(10, 30, 46, 2,8,50,0)) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1)); - - - RgbColor black = new RgbColor(0,0,0); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip with border")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setIntersect(false) - .setYPadding(10) - .setXPadding(10) - .setCaretSize(8) - .setBackgroundColor(new RgbaColor(72, 241, 12,1.0f)) - .setTitleFontColor(black) - .setBodyFontColor(black) - .setBorderColor(new RgbaColor(0,0,0,1.0f)) - .setBorderWidth(4)) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java deleted file mode 100644 index 686cc84b..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Sample that enables the use of custom html markup for tooltips in a line chart. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlLineConfiguration extends ShowcaseConfiguration { - public TooltipHtmlLineConfiguration() { - setType(ChartType.LINE); - - String optionalJavascript= readFile("de/adesso/wickedcharts/showcase/customTooltip.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Line")) - .setTooltips(new Tooltips() - .setEnabled(false) - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java deleted file mode 100644 index 247c5dbd..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Sample that enables the use of custom html markup for tooltip points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-points.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlPointsConfiguration extends ShowcaseConfiguration { - public TooltipHtmlPointsConfiguration() { - setType(ChartType.LINE); - - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/customTooltip-Point.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setPointBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setPointBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Points")) - .setTooltips(new Tooltips() - .setEnabled(false) - .setIntersect(false) - .setMode(TooltipMode.INDEX) - .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","pointTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java deleted file mode 100644 index 81ef4a14..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * Sample that enables tooltips to be at the nearest possible position to the data points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipNearestConfiguration extends ShowcaseConfiguration { - public TooltipNearestConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip Nearest Position")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java deleted file mode 100644 index ea0a665c..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * Chart configuration for the basic grid line layout. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesBasicConfiguration extends ShowcaseConfiguration { - - protected GridLines gridLines; - - public GridLinesBasicConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(10, 30, 39, 20, 25, 34, -10)) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - gridLines = new GridLines() - .setDisplay(true); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Basic")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setGridLines(gridLines)) - .setYAxes(new AxesScale() - .setGridLines(gridLines) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(10)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java deleted file mode 100644 index 2893b59a..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display grid lines and axes. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesDisplayFalseNoBorderConfiguration extends GridLinesBasicConfiguration { - - public GridLinesDisplayFalseNoBorderConfiguration() { - super(); - - gridLines.setDisplay(false) - .setDrawBorder(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Display False No Border")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java deleted file mode 100644 index 9c05bfd8..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display the ticks. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesTicksConfiguration extends GridLinesBasicConfiguration { - - public GridLinesTicksConfiguration() { - super(); - - gridLines.setDisplay(true) - .setDrawBorder(true) - .setDrawOnChartArea(true) - .setDrawTicks(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Ticks")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java deleted file mode 100644 index b44975d6..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect false the nearest item is used to determine the index. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class DatasetIntersectFalseConfiguration extends ShowcaseConfiguration { - public DatasetIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Dataset, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.DATASET) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java deleted file mode 100644 index 7e4409cc..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect false the nearest item, in the x direction, is used to determine the index. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class IndexIntersectFalseConfiguration extends ShowcaseConfiguration { - public IndexIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Index, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java deleted file mode 100644 index 866e97d7..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If the intersect setting is true, the first intersecting item is used to determine the index in the data. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class IndexIntersectTrueConfiguration extends ShowcaseConfiguration { - public IndexIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Index, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java deleted file mode 100644 index 34c6fb77..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect is false, this is not triggered when the mouse position intersects an item in the graph. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class NearestIntersectFalseConfiguration extends ShowcaseConfiguration { - public NearestIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Nearest, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.NEAREST) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java deleted file mode 100644 index 91cec1ba..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Finds no items that intersect the point. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class PointIntersectFalseConfiguration extends ShowcaseConfiguration { - public PointIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Point, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.POINT) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java deleted file mode 100644 index 885b4b12..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Finds all of the items that intersect the point. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class PointIntersectTrueConfiguration extends ShowcaseConfiguration { - public PointIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Point, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.POINT) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java deleted file mode 100644 index f48e7a2e..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Does not return all items that would intersect based on the Y coordinate of the position. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class yIntersectFalseConfiguration extends ShowcaseConfiguration { - public yIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: y, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.Y) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java deleted file mode 100644 index 16512e31..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Returns all items that would intersect based on the Y coordinate of the position. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class yIntersectTrueConfiguration extends ShowcaseConfiguration { - public yIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: y, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.Y) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java deleted file mode 100644 index bc02dee4..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position at the bottom - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionBottomConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionBottomConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN); - - getOptions().setLegend(new Legend().setPosition(Position.BOTTOM)); - - getOptions().getTitle().setText("Legend Position: Bottom"); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java deleted file mode 100644 index 1a8aecd5..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Base class for the other configurations for the legend position - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionChartBasicConfiguration extends ShowcaseConfiguration { - public LegendPositionChartBasicConfiguration() { - super(); - - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setData(IntegerValue.of(randomIntegerList(7))) - .setBorderWidth(1); - - data.setDatasets(Arrays.asList(dataset1)); - setData(data); - - Options options = new Options() - .setResponsive(true) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value"))) - ) - .setTitle(new Title() - .setDisplay(true)) - ; - setOptions(options); - - } -} - diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java deleted file mode 100644 index 910e34f8..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position on the left - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionLeftConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionLeftConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.YELLOW_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW); - - getOptions().setLegend(new Legend().setPosition(Position.LEFT)); - - getOptions().getTitle().setText("Legend Position: Left"); - } -} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java deleted file mode 100644 index 711c225c..00000000 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java +++ /dev/null @@ -1,29 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position at the top - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionTopConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionTopConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED); - - getOptions().setLegend(new Legend().setPosition(Position.TOP)); - - getOptions().getTitle().setText("Legend Position: Top"); - } -} - diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java index 549b8f05..8acf6886 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java @@ -2,7 +2,7 @@ import de.adesso.wickedcharts.highcharts.options.Options; import de.adesso.wickedcharts.showcase.options.*; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.*; import de.adesso.wickedcharts.wicket6.highcharts.Chart; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.ChoiceRenderer; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java index 7f1a8cbf..5a8c9311 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase.modalwindow; -import de.adesso.wickedcharts.showcase.options.BasicBarOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.BasicBarOptions; import de.adesso.wickedcharts.wicket6.highcharts.Chart; import org.apache.wicket.markup.html.panel.Panel; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java index 7000e619..83e644bb 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java @@ -20,7 +20,7 @@ import de.adesso.wickedcharts.highcharts.options.livedata.LiveDataSeries; import de.adesso.wickedcharts.highcharts.options.livedata.LiveDataUpdateEvent; import de.adesso.wickedcharts.highcharts.options.series.Point; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import de.adesso.wickedcharts.wicket6.highcharts.features.livedata.WicketLiveDataUpdateEvent; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket6.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket6.java new file mode 100644 index 00000000..346def5a --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket6.java @@ -0,0 +1,25 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * + * A sample that shows how a line chart with a progress bar is configured. + * + * @see http://www.chartjs.org/samples/latest/advanced/progress-bar.html + * + * @author maximAtanasov + */ +@SuppressWarnings("serial") +public class LineChartProgressBarConfigurationWicket6 extends LineChartProgressBarConfiguration { + + public LineChartProgressBarConfigurationWicket6() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","progressBar", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket6.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket6.java new file mode 100644 index 00000000..85b50cf7 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket6.java @@ -0,0 +1,37 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import de.adesso.wickedcharts.chartjs.chartoptions.*; +import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; +import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; +import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; +import org.apache.wicket.Session; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; + +/** + * Sample which displays a bar chart for the data distribution and a line chart for the time progression of datasets. + * + * @see http://www.chartjs.org/samples/latest/scales/time/combo.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TimeComboConfigurationWicket6 extends TimeComboConfiguration { + + + public TimeComboConfigurationWicket6() { + super(); + } + + @Override + public Locale getSessionLocale(){ + return Session.get().getLocale(); + } +} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket6.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket6.java new file mode 100644 index 00000000..67b80199 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket6.java @@ -0,0 +1,31 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import de.adesso.wickedcharts.chartjs.chartoptions.*; +import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; +import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; +import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; +import org.apache.wicket.markup.html.panel.Fragment; + +import java.util.ArrayList; +import java.util.Arrays; + +/** + * Sample that enables the use of custom html markup for tooltips in a pie chart. + * + * @see http://www.chartjs.org/samples/latest/tooltips/custom-pie.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TooltipHtmlPieConfigurationWicket6 extends TooltipHtmlPieConfiguration { + public TooltipHtmlPieConfigurationWicket6() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","pieTooltip", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket6.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket6.java new file mode 100644 index 00000000..6c3a6c3b --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket6.java @@ -0,0 +1,32 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import de.adesso.wickedcharts.chartjs.chartoptions.*; +import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; +import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; +import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; + +import java.util.ArrayList; +import java.util.Arrays; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * Sample that enables the use of custom html markup for tooltip points. + * + * @see http://www.chartjs.org/samples/latest/tooltips/custom-points.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TooltipHtmlPointsConfigurationWicket6 extends TooltipHtmlPointsConfiguration { + public TooltipHtmlPointsConfigurationWicket6() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","pointTooltip", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java index c3efee7c..8374b0c6 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import de.adesso.wickedcharts.wicket7.chartjs.Chart; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.html.panel.Panel; diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index d53953d1..61856369 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -15,21 +15,20 @@ */ -import de.adesso.wickedcharts.showcase.configurations.*; -import de.adesso.wickedcharts.showcase.configurations.gridlines.*; -import de.adesso.wickedcharts.showcase.configurations.interactions.*; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionBottomConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionLeftConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionRightConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionTopConfiguration; import de.adesso.wickedcharts.showcase.links.ChartjsShowcaseLink; import de.adesso.wickedcharts.showcase.links.HighchartsShowcaseLink; import de.adesso.wickedcharts.showcase.links.UpdateChartJsLink; +import de.adesso.wickedcharts.showcase.options.chartjs.*; +import de.adesso.wickedcharts.showcase.options.chartjs.gridlines.*; +import de.adesso.wickedcharts.showcase.options.chartjs.interactions.*; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionBottomConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionLeftConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionRightConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionTopConfiguration; import de.adesso.wickedcharts.wicket7.chartjs.Chart; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; -import org.apache.wicket.request.mapper.parameter.INamedParameters; import org.apache.wicket.request.mapper.parameter.PageParameters; import java.io.Serializable; @@ -168,12 +167,9 @@ private List getChartFromParams(final PageParameters params) { String chartString; List config = new ArrayList<>(); - //Get the parameters of the page - List pairs = params.getAllNamed(); - //If the showcase is started without any parameters //set the parameters to lineBasic and give us a line Chart - if(params.getAllNamed().size() == 0){ + if(params.getAllNamed().isEmpty()){ PageParameters temp = new PageParameters(); temp.add("chart", "lineBasic"); setResponsePage(HomepageChartJs.class, temp); @@ -315,7 +311,7 @@ private List getChartFromParams(final PageParameters params) { break; case "timeCombo": - config.add(new Chart("chart", new TimeComboConfiguration())); + config.add(new Chart("chart", new TimeComboConfigurationWicket7())); break; case "gridLines": @@ -359,8 +355,8 @@ private List getChartFromParams(final PageParameters params) { case "tooltipHtml": config.add(new Chart("chart", new TooltipHtmlLineConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPieConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPointsConfiguration())); + config.add(new Chart("chart", new TooltipHtmlPieConfigurationWicket7())); + config.add(new Chart("chart", new TooltipHtmlPointsConfigurationWicket7())); break; case "bubble": @@ -368,7 +364,7 @@ private List getChartFromParams(final PageParameters params) { break; case "lineProgressBar": - config.add(new Chart("chart", new LineChartProgressBarConfiguration())); + config.add(new Chart("chart", new LineChartProgressBarConfigurationWicket7())); break; case "dataLabelling": diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index 57420a4e..68ddec04 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -20,6 +20,7 @@ import de.adesso.wickedcharts.showcase.links.UpdateHighchartLink; import de.adesso.wickedcharts.showcase.links.UpdateThemeLink; import de.adesso.wickedcharts.showcase.options.*; +import de.adesso.wickedcharts.showcase.options.highcharts.base.*; import de.adesso.wickedcharts.wicket7.highcharts.Chart; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java deleted file mode 100644 index bfcd00db..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartEndConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'end' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartEndConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartEndConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.END); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - End")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java deleted file mode 100644 index 0ac5393a..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java +++ /dev/null @@ -1,63 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'false' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartFalseConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - False")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java deleted file mode 100644 index 7bca9aeb..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'origin' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartOriginConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartOriginConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.ORIGIN); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - Origin")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java deleted file mode 100644 index 8905576a..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'start' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartStartConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartStartConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.START); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - Start")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java deleted file mode 100644 index 1573712e..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartMultiAxisConfiguration.java +++ /dev/null @@ -1,80 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a multi-axis bar chart configuration looks. - */ - -/** - * - * A sample that shows how a multi-axis bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/multi-axis.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class BarChartMultiAxisConfiguration extends ShowcaseConfiguration{ - public BarChartMultiAxisConfiguration() { - setType(ChartType.BAR); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-1"); - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-2"); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Multi Axis")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScales(new Scales() - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - - ; - setOptions(options); - - } - -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java deleted file mode 100644 index 20a05db5..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a stacked bar chart configuration looks. - */ - -/** - * - * A sample that shows how a stack bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/stacked.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class BarChartStackedConfiguration extends ShowcaseConfiguration { - public BarChartStackedConfiguration() { - setType(ChartType.STACKED_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - Dataset dataset3 = new Dataset() - .setLabel("Dataset 3") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Stacked")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java deleted file mode 100644 index cd1cea4f..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java +++ /dev/null @@ -1,86 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a stacked group bar chart configuration looks. - */ - -/** - * - * A sample that shows how a stacked bar chart group configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/stacked-group.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class BarChartStackedGroupConfiguration extends ShowcaseConfiguration { - public BarChartStackedGroupConfiguration() { - setType(ChartType.STACKED_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("0"); - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("0"); - - Dataset dataset3 = new Dataset() - .setLabel("Dataset 3") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Stacked Groups")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java deleted file mode 100644 index c0275a09..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java +++ /dev/null @@ -1,61 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a vertical bar chart configuration looks. - */ - -/** - * - * A sample that shows how a vertical bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/vertical.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class BarChartVerticalConfiguration extends ShowcaseConfiguration { - public BarChartVerticalConfiguration() { - super(); - setType(ChartType.BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart")) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java deleted file mode 100644 index ba8c44d3..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java +++ /dev/null @@ -1,103 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.BubbleValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.Random; - -/** - * - * A sample that shows how a bubble chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scriptable/bubble.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class BubbleChartConfiguration extends ShowcaseConfiguration { - public BubbleChartConfiguration() { - super(); - setType(ChartType.BUBBLE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("My Third dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - - Options options = new Options() - .setResponsive(true) - .setAspectRatio((double)1) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bubble Chart")) - ; - setOptions(options); - - - } - - private Double randomDouble(int bound) { - Random random = new Random(); - return (double)random.nextInt(bound)+1; - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java deleted file mode 100644 index 02987aff..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ComboBarLineChartConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how a combo bar-line chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/combo-bar-line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class ComboBarLineChartConfiguration extends ShowcaseConfiguration { - public ComboBarLineChartConfiguration() { - super(); - setType(ChartType.BAR); - Data data = new Data(); - Dataset dataset1 = new Dataset(); - dataset1.setType(ChartType.LINE) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(2) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 1"); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.WHITE) - .setBorderWidth(2) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 2"); - - Dataset dataset3 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 3"); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Bar Line Chart")) - .setTooltips(new Tooltips() - .setIntersect(true) - .setMode(TooltipMode.INDEX)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java deleted file mode 100644 index 999a7bd3..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java +++ /dev/null @@ -1,71 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.ArrayList; -import java.util.Arrays; - - -/** - * - * A sample that shows how a combo bar-line chart configuration with data labelling. - * - * @see http://www.chartjs.org/samples/latest/advanced/data-labelling.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class DataLabellingChartConfiguration extends ShowcaseConfiguration { - public DataLabellingChartConfiguration() { - super(); - setType(ChartType.BAR); - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/dataLabellingPlugin.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data(); - Dataset dataset1 = new Dataset(); - dataset1.setType(ChartType.LINE) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(2) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 1"); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.WHITE) - .setBorderWidth(2) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 2"); - - Dataset dataset3 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 3"); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Bar Line Chart")) - .setTooltips(new Tooltips() - .setIntersect(true) - .setMode(TooltipMode.INDEX)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java deleted file mode 100644 index 71103554..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java +++ /dev/null @@ -1,50 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a doughnut configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/doughnut.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class DoughnutChartConfiguration extends ShowcaseConfiguration { - public DoughnutChartConfiguration() { - super(); - setType(ChartType.DOUGHNUT); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE, SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Doughnut Chart")) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setAnimation(new Animation() - .setAnimateScale(true) - .setAnimateRotate(true)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java deleted file mode 100644 index bc7a4aa4..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a chart with label filtering is configured. - * - * @see http://www.chartjs.org/samples/latest/scales/filtering-labels.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class FilteringLabelsConfiguration extends ShowcaseConfiguration { - public FilteringLabelsConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart - X-Axis Filter")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setCallback( - new CallbackFunction("function(dataLabel, index) {\r\n" + - " // Hide the label of every 2nd dataset. return null to hide the grid line too\r\n" + - " return index % 2 === 0 ? dataLabel : '';}")))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setBeginAtZero(true))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java deleted file mode 100644 index 14938151..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java +++ /dev/null @@ -1,71 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how different point style configurations look. - * - * @see http://www.chartjs.org/samples/latest/legend/point-style.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LegendPointStyleConfiguration extends ShowcaseConfiguration { - public LegendPointStyleConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setPointStyle(PointStyle.RECT_ROT) - .setPointRadius(10) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.ORIGIN); - - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Point Style Legend")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setLabels(new LegendLabel() - .setUsePointStyle(true))) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java deleted file mode 100644 index af88eb23..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java +++ /dev/null @@ -1,143 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.AbsoluteIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.RelativeIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a chart with different datasets can be configured. - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-datasets.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartAreaDatasetConfiguration extends ShowcaseConfiguration { - public LineChartAreaDatasetConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("D0 (hidden), Fill: undefined") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(BoundaryFillingMode.UNDEFINED) - .setHidden(true); - - - Dataset dataset1 = new Dataset() - .setLabel("D1 Fill: -1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("-1")); - - - Dataset dataset2 = new Dataset() - .setLabel("D2 (hidden) Fill: 1") - .setBackgroundColor(SimpleColor.ORANGE_TRANSPARENT) - .setBorderColor(SimpleColor.ORANGE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setHidden(true) - .setFill(new AbsoluteIndex(1)); - - Dataset dataset3 = new Dataset() - .setLabel("D3 Fill: -1") - .setBackgroundColor(SimpleColor.YELLOW_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset4 = new Dataset() - .setLabel("D4 Fill: -1") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("-1")); - - Dataset dataset5 = new Dataset() - .setLabel("D5 Fill: +2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("+2")); - - - Dataset dataset6 = new Dataset() - .setLabel("D6 Fill: false") - .setBackgroundColor(SimpleColor.GREY_TRANSPARENT) - .setBorderColor(SimpleColor.GREY) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset7 = new Dataset() - .setLabel("D7 Fill: 8") - .setBackgroundColor(SimpleColor.PURPLE_TRANSPARENT) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new AbsoluteIndex(8)); - - - Dataset dataset8 = new Dataset() - .setLabel("D8 (hidden) Fill: end") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setHidden(true) - .setFill(BoundaryFillingMode.END); - - data.setDatasets(Arrays.asList(dataset0, dataset1, dataset2, dataset3, dataset4, - dataset5, dataset6, dataset7, dataset8)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Dataset Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setPlugins(new Plugins() - .setFiller(new Filler() - .setPropagate(false)) - .setSamples_filler_analyzer(new SamplesFillerAnalyzer() - .setTarget("chart-analyzer"))) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java deleted file mode 100644 index 49e6c1af..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java +++ /dev/null @@ -1,72 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample of a basic line chart configuration. - * - * @see http://www.chartjs.org/samples/latest/charts/line/basic.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LineChartBasicConfiguration extends ShowcaseConfiguration { - public LineChartBasicConfiguration() { - - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java deleted file mode 100644 index cf6f940d..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartProgressBarConfiguration.java +++ /dev/null @@ -1,95 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * - * A sample that shows how a line chart with a progress bar is configured. - * - * @see http://www.chartjs.org/samples/latest/advanced/progress-bar.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartProgressBarConfiguration extends ShowcaseConfiguration { - public LineChartProgressBarConfiguration() { - super(); - setType(ChartType.LINE); - - String optionalJavascript= readFile("de/adesso/wickedcharts/showcase/progressBar.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Progress Bar")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setAnimation(new Animation() - .setDuration(2000) - .setOnProgress(new CallbackFunction("function(animation) {\r\n" + - " progress.value = animation.currentStep / animation.numSteps;\r\n" + - " }")) - .setOnComplete(new CallbackFunction("function(animation) {\r\n" + - " window.setTimeout(function() {\r\n" + - " progress.value = 0;\r\n" + - " }, 2000);\r\n" + - " }"))) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","progressBar",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java deleted file mode 100644 index 383c7a06..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartStackedConfiguration.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a stacked line chart is configured. - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-stacked.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartStackedConfiguration extends ShowcaseConfiguration{ - public LineChartStackedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset3 = new Dataset() - .setLabel("My Third dataset") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Stacked Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java deleted file mode 100644 index cc3da325..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a stepped line chart configuration looks with stepped = after. - * - * @see http://www.chartjs.org/samples/latest/charts/line/stepped.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartSteppedAfterConfiguration extends ShowcaseConfiguration { - public LineChartSteppedAfterConfiguration() { - super(); - setType(ChartType.LINE); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - - - Dataset dataset1 = new Dataset() - .setLabel("Stepped After") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setSteppedLine(SteppedLineValue.AFTER); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Stepped - After")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java deleted file mode 100644 index 4cfde004..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a stepped line chart configuration looks with stepped = before. - * - * @see http://www.chartjs.org/samples/latest/charts/line/stepped.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartSteppedBeforeConfiguration extends ShowcaseConfiguration { - public LineChartSteppedBeforeConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Stepped Before") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setSteppedLine(SteppedLineValue.BEFORE); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Stepped - Before")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java deleted file mode 100644 index 205fbf11..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.Collections; - -/** - * - * A sample that shows how a line chart can be configured to have different point sizes. - * - * @see http://www.chartjs.org/samples/latest/charts/line/point-sizes.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartWithDifferentPointSizesConfiguration extends ShowcaseConfiguration { - public LineChartWithDifferentPointSizesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("dataset - big points") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointRadius(Collections.nCopies(7, 15)) - .setPointHoverRadius(10) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("dataset - individual point sizes") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setBorderDash(Arrays.asList("5", "5")) - .setPointRadius(Arrays.asList(2, 4, 6, 18, 0, 12, 20)) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("dataset - large pointHoverRadius") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointHoverRadius(30) - .setFill(false); - - - Dataset dataset4 = new Dataset() - .setLabel("dataset - large pointHitRadius") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointHitRadius(20) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3, dataset4)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart with Different Point Sizes")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java deleted file mode 100644 index 0862c977..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java +++ /dev/null @@ -1,80 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how different line styles can be configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/line-styles.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineStylesConfiguration extends ShowcaseConfiguration { - public LineStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Filled") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setLabel("Unfilled") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset3 = new Dataset() - .setLabel("Dashed") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setBorderDash(Arrays.asList("5", "5")) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Styles")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java deleted file mode 100644 index 84f1afb3..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LinearStepSizeConfiguration.java +++ /dev/null @@ -1,75 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a line chart with linear step size is configured. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/step-size.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LinearStepSizeConfiguration extends ShowcaseConfiguration { - public LinearStepSizeConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(5)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java deleted file mode 100644 index 0924670d..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java +++ /dev/null @@ -1,72 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a logarithmic line chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scales/logarithmic/line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LogarithmicLineChartConfiguration extends ShowcaseConfiguration { - public LogarithmicLineChartConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Logarithmic Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("logarithmic") - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java deleted file mode 100644 index db5c6709..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java +++ /dev/null @@ -1,85 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a logarithmic scatter chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scales/logarithmic/scatter.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LogarithmicScatterChartConfiguration extends ShowcaseConfiguration { - public LogarithmicScatterChartConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Logarithmic Scatter Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("logarithmic") - .setPosition(Position.BOTTOM) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Frequency"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Voltage")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java deleted file mode 100644 index 2d826156..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxConfiguration.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure min and max Ticks in the chart options. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/min-max.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MinMaxConfiguration extends ShowcaseConfiguration { - public MinMaxConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 39, 20, 25, 34, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(100, 33, 22, 19, 11, 49, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Min and Max")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setTicks(new Ticks() - .setMin(10) - .setMax(50)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java deleted file mode 100644 index b83ce23d..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure suggestedMin and suggestedMax Ticks in the chart options. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/min-max-suggested.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MinMaxSuggestedConfiguration extends ShowcaseConfiguration { - public MinMaxSuggestedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 50, 20, 25, 44, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Min and Max - Suggested")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setTicks(new Ticks() - .setSuggestedMin(10) - .setSuggestedMax(50)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java deleted file mode 100644 index 85e23292..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextListLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure multiline labels. - * - * @see http://www.chartjs.org/samples/latest/scales/multiline-labels.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MultilineLabelsConfiguration extends ShowcaseConfiguration { - - public MultilineLabelsConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(Arrays.asList( - new TextListLabel("June","2015"), - new TextLabel("July"), - new TextLabel("August"), - new TextLabel("September"), - new TextLabel("October"), - new TextLabel("November"), - new TextLabel("December"), - new TextListLabel("January","2016"), - new TextLabel("February"), - new TextLabel("March"), - new TextLabel("April"), - new TextLabel("May") - )); - - Dataset dataset1 = new Dataset() - .setData(IntegerValue.of(randomIntegerList(12))) - .setLabel("My First dataset") - .setFill(false) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED); - - Dataset dataset2 = new Dataset() - .setData(IntegerValue.of(randomIntegerList(12))) - .setLabel("My Second dataset") - .setFill(false) - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart with Multiline Labels")); - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java deleted file mode 100644 index a6f3c0e7..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.ConstLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ConstValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure non-numeric values in a chart. - * - * @see http://www.chartjs.org/samples/latest/scales/non-numeric-y.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class NonNumericConfiguration extends ShowcaseConfiguration { - - public NonNumericConfiguration() { - setType(ChartType.LINE); - - Data data = new Data() - .setXLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")) - .setYLabels(ConstLabel.of("", "Request Added", "Request Viewed", "Request Accepted", "Request Solved", "Solving Confirmed")) - ; - - Dataset dataset1 = new Dataset() - .setLabel("My First Dataset") - .setFill(false) - .setBorderColor(SimpleColor.RED) - .setBackgroundColor(SimpleColor.RED) - .setData(ConstValue.of("", "Request Added", "Request Added", "Request Added", "Request Viewed", "Request Viewed", "Request Viewed")) - ; - data.setDatasets(Arrays.asList(dataset1)); - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart with Non Numeric Y Axis")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("category") - .setPosition(Position.LEFT) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Request State")) - .setTicks(new Ticks() - .setReverse(true)))) - ; - setOptions(options); - - - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java deleted file mode 100644 index 19e7d5ec..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/OtherRadarChartConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextListLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays different datasets on a radar. - * - * @see http://www.chartjs.org/samples/latest/charts/radar.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class OtherRadarChartConfiguration extends ShowcaseConfiguration { - public OtherRadarChartConfiguration() { - super(); - setType(ChartType.RADAR); - - Data data = new Data() - .setLabels(Arrays.asList( - new TextListLabel("Eating", "Dinner"), - new TextListLabel("Drining", "Water"), - new TextLabel("Sleeping"), - new TextListLabel("Designing","Graphics"), - new TextLabel("Coding"), - new TextLabel("Cycling"), - new TextLabel("Running") - )); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setPointBackgroundColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - - Dataset dataset1 = new Dataset() - .setLabel("My second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setPointBackgroundColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset0, dataset1)); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Radar Chart")) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScale(new Scale() - .setTicks(new Ticks() - .setBeginAtZero(true))); - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java deleted file mode 100644 index 9301accc..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java +++ /dev/null @@ -1,44 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.ChartType; -import de.adesso.wickedcharts.chartjs.chartoptions.Data; -import de.adesso.wickedcharts.chartjs.chartoptions.Dataset; -import de.adesso.wickedcharts.chartjs.chartoptions.Options; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays a dataset as a pie chart. - * - * @see http://www.chartjs.org/samples/latest/charts/pie.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PieChartConfiguration extends ShowcaseConfiguration { - public PieChartConfiguration() { - super(); - setType(ChartType.PIE); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE, SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java deleted file mode 100644 index 47e62fc4..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PointStylesConfiguration.java +++ /dev/null @@ -1,182 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that supports different point styles: - * 'circle', - * 'triangle', - * 'rect', - * 'rectRounded', - * 'rectRot', - * 'cross', - * 'crossRot', - * 'star', - * 'line', - * 'dash' - * - * @see http://www.chartjs.org/samples/latest/charts/line/point-styles.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PointStylesConfiguration extends ShowcaseConfiguration { - public PointStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dash") - .setBackgroundColor(SimpleColor.GREY) - .setBorderColor(SimpleColor.GREY) - .setData(IntegerValue.of(Arrays.asList(1,1,1,1,1,1,1))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.DASH) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("Star") - .setBackgroundColor(SimpleColor.PURPLE) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(Arrays.asList(2,2,2,2,2,2,2))) - .setShowLine(false) - .setPointRadius(20) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.STAR) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("Rectangle") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(Arrays.asList(3,3,3,3,3,3,3))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT) - .setFill(false); - - Dataset dataset4 = new Dataset() - .setLabel("Triangle") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(Arrays.asList(4,4,4,4,4,4,4))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.TRIANGLE) - .setFill(false); - - Dataset dataset5 = new Dataset() - .setLabel("Circle") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(5,5,5,5,5,5,5))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CIRCLE) - .setFill(false); - - Dataset dataset6 = new Dataset() - .setLabel("CrossRot") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(6,6,6,6,6,6,6))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CROSS_ROT) - .setFill(false); - - Dataset dataset7 = new Dataset() - .setLabel("Line") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(7,7,7,7,7,7,7))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.LINE) - .setFill(false); - - Dataset dataset8 = new Dataset() - .setLabel("Cross") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(8,8,8,8,8,8,8))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.CROSS) - .setFill(false); - - Dataset dataset9 = new Dataset() - .setLabel("Rectangle Rounded") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(9,9,9,9,9,9,9))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT_ROUNDED) - .setFill(false); - - Dataset dataset10 = new Dataset() - .setLabel("Rectangle Rotated") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(11,11,11,11,11,11,11))) - .setShowLine(false) - .setPointRadius(10) - .setPointHoverRadius(15) - .setPointStyle(PointStyle.RECT_ROT) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1, dataset2, dataset3, dataset4, dataset5, dataset6, - dataset7, dataset8, dataset9, dataset10)); - - //Point Style Can also be set in the options using the Elements option - //But you can only have one point style for all datasets - - //Some Point Styles are drawn incorrectly - //See this issue: https://github.com/chartjs/Chart.js/issues/2607 - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Point Styles")) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")) - .setTicks(new Ticks() - .setMax(13) - .setMin(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java deleted file mode 100644 index 03d581f6..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that distributes data in a polar area chart. - * - * @see http://www.chartjs.org/samples/latest/charts/polar-area.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PolarAreaChartConfiguration extends ShowcaseConfiguration { - public PolarAreaChartConfiguration() { - super(); - setType(ChartType.POLAR_AREA); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED_TRANSPARENT,SimpleColor.ORANGE_TRANSPARENT, - SimpleColor.YELLOW_TRANSPARENT, SimpleColor.GREEN_TRANSPARENT, - SimpleColor.BLUE_TRANSPARENT)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Polar Area Chart")) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setScale(new Scale() - .setTicks(new Ticks() - .setBeginAtZero(true)) - .setReverse(false)) - .setAnimation(new Animation() - .setAnimateScale(true) - .setAnimateRotate(false)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java deleted file mode 100644 index be74b50d..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/RadarChartConfiguration.java +++ /dev/null @@ -1,98 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.AbsoluteIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.RelativeIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays different datasets on a radar. - * - * @see http://www.chartjs.org/samples/latest/charts/area/radar.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class RadarChartConfiguration extends ShowcaseConfiguration { - public RadarChartConfiguration() { - super(); - setType(ChartType.RADAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("D0") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(1, 2, 3, 1, 2, 1, 2))) - .setFill(BoundaryFillingMode.UNDEFINED); - - - Dataset dataset1 = new Dataset() - .setLabel("D1 (hidden) Fill: -1") - .setBackgroundColor(SimpleColor.ORANGE_TRANSPARENT) - .setBorderColor(SimpleColor.ORANGE) - .setData(IntegerValue.of(Arrays.asList(5, 4, 3, 5, 4, 3, 5))) - .setHidden(true) - .setFill(new RelativeIndex("-1")); - - Dataset dataset2 = new Dataset() - .setLabel("D2 Fill: 1") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW_TRANSPARENT) - .setData(IntegerValue.of(Arrays.asList(10, 8, 12, 6, 13, 10, 9))) - .setFill(new AbsoluteIndex(1)); - - - Dataset dataset3 = new Dataset() - .setLabel("D3 Fill: False") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(Arrays.asList(20, 18, 22, 16, 23, 20, 19))) - .setFill(false); - - Dataset dataset4 = new Dataset() - .setLabel("D4 Fill: -1") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(30, 28, 32, 26, 33, 30, 29))) - .setFill(new RelativeIndex("-1")); - - - Dataset dataset5 = new Dataset() - .setLabel("D5 Fill: -1") - .setBackgroundColor(SimpleColor.PURPLE_TRANSPARENT) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(Arrays.asList(40, 38, 42, 36, 43, 40, 39))) - .setFill(new RelativeIndex("-1")); - - data.setDatasets(Arrays.asList(dataset0, dataset1, dataset2, dataset3, dataset4, dataset5)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Radar Chart")) - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins() - .setFiller(new Filler() - .setPropagate(false)) - .setSamples_filler_analyzer(new SamplesFillerAnalyzer() - .setTarget("chart-analyzer"))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java deleted file mode 100644 index b9cee224..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java +++ /dev/null @@ -1,79 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample which displays data as scattered points in the coordinate system. - * - * @see http://www.chartjs.org/samples/latest/charts/scatter/basic.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class ScatterChartConfiguration extends ShowcaseConfiguration { - public ScatterChartConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Scatter Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setPosition(Position.BOTTOM) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java deleted file mode 100644 index 0dc680a2..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartMultiAxisConfiguration.java +++ /dev/null @@ -1,91 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbaColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays a scatter chart with two y-axes. - * - * @see http://www.chartjs.org/samples/latest/charts/scatter/multi-axis.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class ScatterChartMultiAxisConfiguration extends ShowcaseConfiguration { - public ScatterChartMultiAxisConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setYAxisID("y-axis-1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setYAxisID("y-axis-2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Scatter Chart Multi Axis")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setPosition(Position.BOTTOM) - .setGridLines(new GridLines() - .setZeroLineColor(new RgbaColor(0, 0, 0, 1))) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setReverse(true) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java deleted file mode 100644 index 102fdcd0..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java +++ /dev/null @@ -1,87 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.Session; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Sample which displays a bar chart for the data distribution and a line chart for the time progression of datasets. - * - * @see http://www.chartjs.org/samples/latest/scales/time/combo.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeComboConfiguration extends ShowcaseConfiguration { - - - public TimeComboConfiguration() { - setType(ChartType.BAR); - - String timeFormat = "MM/DD/YYYY HH:mm"; - - List labels = new ArrayList(7); - - LocalDateTime now = LocalDateTime.now(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM/dd/uuuu HH:mm", Session.get().getLocale()); - - - for(int i = 0; i < 7; i++) { - labels.add(new TextLabel(now.plus(i,ChronoUnit.DAYS).format(formatter))); - } - - Dataset dataset1 = new Dataset() - .setType(ChartType.BAR) - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset3 = new Dataset() - .setType(ChartType.LINE) - .setLabel("Dataset 3") - .setFill(false) - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - - - setData( new Data() - .setLabels(labels) - .setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - ); - - - - setOptions( new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDisplay(true) - .setTime(new TimeFormat() - .setFormat(timeFormat) -// .setRound(TimeFormatRound.DAY) - )))); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java deleted file mode 100644 index 1771cd0d..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java +++ /dev/null @@ -1,126 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.StringValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ValueType; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -/** - * Sample which displays a time progression line for datasets. - * - * @see http://www.chartjs.org/samples/latest/scales/time/line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeLineConfiguration extends ShowcaseConfiguration { - - public TimeLineConfiguration() { - setType(ChartType.LINE); - - Data data = new Data(); - - String timeFormat = "MM/DD/YYYY HH:mm"; - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(timeFormat); - - List dateList = new ArrayList(); - for(int i = 0; i < 7; i++) { - dateList.add(new DateTimeLabel(LocalDateTime.of(2018, 1,1, 8+i, 00))); - } - data.setLabels(dateList); - - Dataset dataset1 = new Dataset() - .setLabel("My First Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - ; - - Dataset dataset2 = new Dataset() - .setLabel("My Second Dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - ; - - Dataset dataset3 = new Dataset() - .setLabel("Dataset with point data") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(0).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(1).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(2).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(3).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(4).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(5).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(6).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 15, 0)))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 16, 0)))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 17, 0)))) - .setY(randomInteger()) - )) - ; - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - setData(data); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setTime(new TimeFormat() - .setTimeFormat(timeFormat ) - .setTooltipFormat("ll HH:mm"))) - .setYAxes(new AxesScale() - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("value")))); - setOptions(options); - - - } - - private ValueType randomInteger() { - Random rng = new Random(); - return new IntegerValue(rng.nextInt(60)+1); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java deleted file mode 100644 index 9913c110..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java +++ /dev/null @@ -1,138 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.StringValueColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.*; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -/** - * Sample which highlights the important points of the x-axis. - * - * @see http://www.chartjs.org/samples/latest/scales/time/line-point-data.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimePointConfiguration extends ShowcaseConfiguration { - - - public TimePointConfiguration() { - setType(ChartType.LINE); - - String timeFormat = "MM/DD/YYYY HH:mm"; - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(timeFormat); - - Data data = new Data(); - - List dateList = new ArrayList(); - for(int i = 0; i < 7; i++) { - dateList.add(new DateTimeLabel(LocalDateTime.of(2018, 1,1, 8+i, 00))); - } - data.setLabels(dateList); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset with date object point data") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new DateTimeValue(dateList.get(0).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(1).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(2).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(3).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(4).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(5).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(6).getDate())) - .setY(randomInteger()) - )); - - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset with string point data") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(0).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(1).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(2).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(3).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(4).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(5).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(6).getDate()))) - .setY(randomInteger()) - )) - ; - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - setData(data); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Date")) - .setTicks(new Ticks() - .setMajor(new TickStyle() - .setFontColor(new StringValueColor("red")) - .setFontStyle(FontStyle.BOLD)))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("value")))); - setOptions(options); - - - } - - private ValueType randomInteger() { - Random rng = new Random(); - return new IntegerValue(rng.nextInt(60)+1); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java deleted file mode 100644 index b634b84d..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.DoubleValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Sample that displays a progression of a dataset. - * - * @see http://www.chartjs.org/samples/latest/scales/time/financial.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeSeriesConfiguration extends ShowcaseConfiguration { - - public TimeSeriesConfiguration() { - - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Time Series")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDistribution(DistributionType.SERIES) - .setTicks(new Ticks() - .setSource(TickSource.LABELS) - ) - ) - .setYAxes(new AxesScale() - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Closing price ($)")) - )); - - setOptions(options); - - setType(ChartType.LINE); - - LocalDateTime now = LocalDateTime.now(); - - - List labels = new ArrayList(60); - List randomData = new ArrayList(60); - - labels.add(new DateTimeLabel(now)); - randomData.add(randomBar(30)); - - - for(int i = 1; i < 60; i++) { - int dayOfTheWeek = now.plus(i, ChronoUnit.DAYS).getDayOfWeek().getValue(); - if( 1 <= dayOfTheWeek && dayOfTheWeek <= 5) { - labels.add(new DateTimeLabel(now.plus(i, ChronoUnit.DAYS))); - } - randomData.add(randomBar(randomData.get(i-1).getValue())); - } - - - - Data data = new Data() - .setLabels(labels) - .setDatasets(Arrays.asList(new Dataset() - .setLabel("My Dataset") - .setData(randomData) - .setType(ChartType.LINE) - .setPointRadius(0) - .setFill(false) - .setLineTension(0) - .setBorderWidth(2) - )); - setData(data); - } - - private DoubleValue randomBar(double lastClose) { - double open = randomNumber(lastClose * .95, lastClose *1.05); - double close = randomNumber(open * .95, open *1.05); -// double high = randomNumber(Math.max(open, close), Math.max(open, close) * 1.1); -// double low = randomNumber(Math.min(open, close) * .9, Math.min(open, close)); - return new DoubleValue(close); - } - - private double randomNumber(double min, double max) { - return Math.random() * (max - min) + min; - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java deleted file mode 100644 index 25664e15..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that enables tooltips to be at a average position to the data points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipAverageConfiguration extends ShowcaseConfiguration { - public TooltipAverageConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip Average Position")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.AVERAGE) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java deleted file mode 100644 index 7271021f..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipBorderConfiguration.java +++ /dev/null @@ -1,62 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.RgbaColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample which adds a border to the tooltips. - * - * @see http://www.chartjs.org/samples/latest/tooltips/border.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipBorderConfiguration extends ShowcaseConfiguration { - public TooltipBorderConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(10, 30, 46, 2,8,50,0)) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1)); - - - RgbColor black = new RgbColor(0,0,0); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip with border")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setIntersect(false) - .setYPadding(10) - .setXPadding(10) - .setCaretSize(8) - .setBackgroundColor(new RgbaColor(72, 241, 12,1.0f)) - .setTitleFontColor(black) - .setBodyFontColor(black) - .setBorderColor(new RgbaColor(0,0,0,1.0f)) - .setBorderWidth(4)) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java deleted file mode 100644 index 87bb95eb..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java +++ /dev/null @@ -1,81 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that enables the use of callback functions for tooltips. - * - * @see http://www.chartjs.org/samples/latest/tooltips/callbacks.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipCallbacksConfiguration extends ShowcaseConfiguration { - public TooltipCallbacksConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - String footerFunction = "function(tooltipItems, data) {\r\n" + - " var sum = 0;\r\n" + - "\r\n" + - " tooltipItems.forEach(function(tooltipItem) {\r\n" + - " sum += data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];\r\n" + - " });\r\n" + - " return 'Sum: ' + sum;\r\n" + - " }"; - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Custom Information in Tooltip")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setCallbacks(new TooltipCallbacks() - .setFooter(new CallbackFunction(footerFunction))) - .setFooterFontStyle(FontStyle.NORMAL)) - .setHover(new Hover() - .setMode(HoverMode.INDEX) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java deleted file mode 100644 index 686cc84b..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlLineConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Sample that enables the use of custom html markup for tooltips in a line chart. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlLineConfiguration extends ShowcaseConfiguration { - public TooltipHtmlLineConfiguration() { - setType(ChartType.LINE); - - String optionalJavascript= readFile("de/adesso/wickedcharts/showcase/customTooltip.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Line")) - .setTooltips(new Tooltips() - .setEnabled(false) - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java deleted file mode 100644 index f6ba2261..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java +++ /dev/null @@ -1,59 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Sample that enables the use of custom html markup for tooltips in a pie chart. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-pie.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlPieConfiguration extends ShowcaseConfiguration { - public TooltipHtmlPieConfiguration() { - setType(ChartType.PIE); - - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/customTooltip-Pie.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data(); - setData(data); - - Dataset dataset = new Dataset() - .setLabel("My Dataset") - .setBackgroundColor(Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE,SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setData(IntegerValue.of(300, 50, 100, 40, 10)); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setDisplay(true)) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Pie")) - .setTooltips(new Tooltips() - .setEnabled(false) -// .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","pieTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java deleted file mode 100644 index 247c5dbd..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Sample that enables the use of custom html markup for tooltip points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-points.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlPointsConfiguration extends ShowcaseConfiguration { - public TooltipHtmlPointsConfiguration() { - setType(ChartType.LINE); - - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/customTooltip-Point.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setPointBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setPointBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Points")) - .setTooltips(new Tooltips() - .setEnabled(false) - .setIntersect(false) - .setMode(TooltipMode.INDEX) - .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","pointTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java deleted file mode 100644 index 81ef4a14..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * Sample that enables tooltips to be at the nearest possible position to the data points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipNearestConfiguration extends ShowcaseConfiguration { - public TooltipNearestConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip Nearest Position")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java deleted file mode 100644 index 64d68d36..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ /dev/null @@ -1,57 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.base; - -import de.adesso.wickedcharts.chartjs.ChartConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Scanner; - -/** - * The base class for all chart configurations for the showcase - */ -@SuppressWarnings("serial") -public abstract class ShowcaseConfiguration extends ChartConfiguration{ - - protected List randomIntegerList(int size) { - List dataList = new ArrayList<>(); - Random rng = new Random(); - for (int i = 0; i < size; i++) { - dataList.add(rng.nextInt(60) + 1); - } - return dataList; - } - - protected String readFile(String fileName) { - - StringBuilder result = new StringBuilder(""); - - // Get file from resources folder - ClassLoader classLoader = getClass().getClassLoader(); - File file = new File(classLoader.getResource(fileName).getFile()); - - try (Scanner scanner = new Scanner(file)) { - - while (scanner.hasNextLine()) { - String line = scanner.nextLine(); - result.append(line).append("\n"); - } - - scanner.close(); - - } catch (IOException e) { - e.printStackTrace(); - } - - return result.toString(); - - } - - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","defaultTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java deleted file mode 100644 index c54b2548..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java +++ /dev/null @@ -1,74 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.StringValueColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * Chart configuration for different grid line styles. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-style.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLineStylesConfiguration extends ShowcaseConfiguration { - public GridLineStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 39, 20, 25, 34, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Styles")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setGridLines(new GridLines() - .setDrawBorder(true) - .setColor(Arrays.asList( - new StringValueColor("pink"), - new StringValueColor("red"), - new StringValueColor("orange"), - new StringValueColor("yellow"), - new StringValueColor("green"), - new StringValueColor("blue"), - new StringValueColor("indigo"), - new StringValueColor("purple")))) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(10)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java deleted file mode 100644 index ea0a665c..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * Chart configuration for the basic grid line layout. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesBasicConfiguration extends ShowcaseConfiguration { - - protected GridLines gridLines; - - public GridLinesBasicConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(10, 30, 39, 20, 25, 34, -10)) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - gridLines = new GridLines() - .setDisplay(true); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Basic")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setGridLines(gridLines)) - .setYAxes(new AxesScale() - .setGridLines(gridLines) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(10)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java deleted file mode 100644 index b45bc4c9..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration for the area chart grid line layout. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesChartAreaConfiguration extends GridLinesBasicConfiguration { - - public GridLinesChartAreaConfiguration() { - super(); - - gridLines.setDisplay(true) - .setDrawBorder(true) - .setDrawOnChartArea(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Chart Area")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java deleted file mode 100644 index 171a41fe..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display grid lines. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesDisplayFalseConfiguration extends GridLinesBasicConfiguration { - - public GridLinesDisplayFalseConfiguration() { - super(); - - gridLines.setDisplay(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Display False")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java deleted file mode 100644 index 2893b59a..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display grid lines and axes. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesDisplayFalseNoBorderConfiguration extends GridLinesBasicConfiguration { - - public GridLinesDisplayFalseNoBorderConfiguration() { - super(); - - gridLines.setDisplay(false) - .setDrawBorder(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Display False No Border")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java deleted file mode 100644 index 9c05bfd8..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display the ticks. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesTicksConfiguration extends GridLinesBasicConfiguration { - - public GridLinesTicksConfiguration() { - super(); - - gridLines.setDisplay(true) - .setDrawBorder(true) - .setDrawOnChartArea(true) - .setDrawTicks(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Ticks")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java deleted file mode 100644 index c2839ec7..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect false the nearest item is used to determine the index. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class DatasetIntersectFalseConfiguration extends ShowcaseConfiguration { - public DatasetIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Dataset, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.DATASET) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java deleted file mode 100644 index 049bbbff..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If the intersect setting is true, the first intersecting item is used to determine the index in the data. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class DatasetIntersectTrueConfiguration extends ShowcaseConfiguration { - public DatasetIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Dataset, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.DATASET) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java deleted file mode 100644 index 3a6f231f..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect false the nearest item, in the x direction, is used to determine the index. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class IndexIntersectFalseConfiguration extends ShowcaseConfiguration { - public IndexIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Index, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java deleted file mode 100644 index 866e97d7..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If the intersect setting is true, the first intersecting item is used to determine the index in the data. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class IndexIntersectTrueConfiguration extends ShowcaseConfiguration { - public IndexIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Index, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java deleted file mode 100644 index e7f61e9d..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect is false, this is not triggered when the mouse position intersects an item in the graph. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class NearestIntersectFalseConfiguration extends ShowcaseConfiguration { - public NearestIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Nearest, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.NEAREST) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java deleted file mode 100644 index 0ae1de00..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect is true, this is only triggered when the mouse position intersects an item in the graph. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class NearestIntersectTrueConfiguration extends ShowcaseConfiguration { - public NearestIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Nearest, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java deleted file mode 100644 index 885b4b12..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Finds all of the items that intersect the point. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class PointIntersectTrueConfiguration extends ShowcaseConfiguration { - public PointIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Point, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.POINT) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java deleted file mode 100644 index 58113ff7..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Does not return all items that would intersect based on the X coordinate of the position only. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class xIntersectFalseConfiguration extends ShowcaseConfiguration { - public xIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: x, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.X) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java deleted file mode 100644 index afe5b960..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Returns all items that would intersect based on the X coordinate of the position only. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class xIntersectTrueConfiguration extends ShowcaseConfiguration { - public xIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: x, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.X) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java deleted file mode 100644 index c561e419..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Does not return all items that would intersect based on the Y coordinate of the position. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class yIntersectFalseConfiguration extends ShowcaseConfiguration { - public yIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: y, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.Y) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java deleted file mode 100644 index ea8de185..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Returns all items that would intersect based on the Y coordinate of the position. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class yIntersectTrueConfiguration extends ShowcaseConfiguration { - public yIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: y, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.Y) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java deleted file mode 100644 index bc02dee4..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position at the bottom - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionBottomConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionBottomConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN); - - getOptions().setLegend(new Legend().setPosition(Position.BOTTOM)); - - getOptions().getTitle().setText("Legend Position: Bottom"); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java deleted file mode 100644 index 1a8aecd5..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Base class for the other configurations for the legend position - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionChartBasicConfiguration extends ShowcaseConfiguration { - public LegendPositionChartBasicConfiguration() { - super(); - - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setData(IntegerValue.of(randomIntegerList(7))) - .setBorderWidth(1); - - data.setDatasets(Arrays.asList(dataset1)); - setData(data); - - Options options = new Options() - .setResponsive(true) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value"))) - ) - .setTitle(new Title() - .setDisplay(true)) - ; - setOptions(options); - - } -} - diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java deleted file mode 100644 index 910e34f8..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position on the left - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionLeftConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionLeftConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.YELLOW_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW); - - getOptions().setLegend(new Legend().setPosition(Position.LEFT)); - - getOptions().getTitle().setText("Legend Position: Left"); - } -} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java deleted file mode 100644 index 38dcecc9..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java +++ /dev/null @@ -1,29 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position on the right - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionRightConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionRightConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE); - - getOptions().setLegend(new Legend().setPosition(Position.RIGHT)); - - getOptions().getTitle().setText("Legend Position: Right"); - } -} - diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java deleted file mode 100644 index 711c225c..00000000 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java +++ /dev/null @@ -1,29 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position at the top - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionTopConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionTopConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED); - - getOptions().setLegend(new Legend().setPosition(Position.TOP)); - - getOptions().getTitle().setText("Legend Position: Top"); - } -} - diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java index 172a9dea..f4baf851 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java @@ -2,7 +2,7 @@ import de.adesso.wickedcharts.highcharts.options.Options; import de.adesso.wickedcharts.showcase.options.*; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.*; import de.adesso.wickedcharts.wicket7.highcharts.Chart; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.ChoiceRenderer; diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java index 40792423..a6e4f67f 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase.modalwindow; -import de.adesso.wickedcharts.showcase.options.BasicBarOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.BasicBarOptions; import de.adesso.wickedcharts.wicket7.highcharts.Chart; import org.apache.wicket.markup.html.panel.Panel; diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java index f41c8fc5..e413c50c 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java @@ -20,7 +20,7 @@ import de.adesso.wickedcharts.highcharts.options.livedata.LiveDataSeries; import de.adesso.wickedcharts.highcharts.options.livedata.LiveDataUpdateEvent; import de.adesso.wickedcharts.highcharts.options.series.Point; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import de.adesso.wickedcharts.wicket7.highcharts.features.livedata.WicketLiveDataUpdateEvent; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket7.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket7.java new file mode 100644 index 00000000..938f5397 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket7.java @@ -0,0 +1,25 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * + * A sample that shows how a line chart with a progress bar is configured. + * + * @see http://www.chartjs.org/samples/latest/advanced/progress-bar.html + * + * @author maximAtanasov + */ +@SuppressWarnings("serial") +public class LineChartProgressBarConfigurationWicket7 extends LineChartProgressBarConfiguration { + + public LineChartProgressBarConfigurationWicket7() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","progressBar", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket7.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket7.java new file mode 100644 index 00000000..a76d5023 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket7.java @@ -0,0 +1,26 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.Session; + +import java.util.Locale; + +/** + * Sample which displays a bar chart for the data distribution and a line chart for the time progression of datasets. + * + * @see http://www.chartjs.org/samples/latest/scales/time/combo.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TimeComboConfigurationWicket7 extends TimeComboConfiguration { + + + public TimeComboConfigurationWicket7() { + super(); + } + + @Override + public Locale getSessionLocale(){ + return Session.get().getLocale(); + } +} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket7.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket7.java new file mode 100644 index 00000000..a042e0e3 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket7.java @@ -0,0 +1,23 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * Sample that enables the use of custom html markup for tooltips in a pie chart. + * + * @see http://www.chartjs.org/samples/latest/tooltips/custom-pie.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TooltipHtmlPieConfigurationWicket7 extends TooltipHtmlPieConfiguration { + public TooltipHtmlPieConfigurationWicket7() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","pieTooltip", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket7.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket7.java new file mode 100644 index 00000000..aa520e41 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket7.java @@ -0,0 +1,23 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * Sample that enables the use of custom html markup for tooltip points. + * + * @see http://www.chartjs.org/samples/latest/tooltips/custom-points.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TooltipHtmlPointsConfigurationWicket7 extends TooltipHtmlPointsConfiguration { + public TooltipHtmlPointsConfigurationWicket7() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","pointTooltip", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java index d1ed8a78..76a71dd3 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ChartComponent.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.base.ShowcaseConfiguration; import de.adesso.wickedcharts.wicket8.chartjs.Chart; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.html.panel.Panel; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index fa8084d4..e5fbb169 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -15,13 +15,13 @@ */ -import de.adesso.wickedcharts.showcase.configurations.*; -import de.adesso.wickedcharts.showcase.configurations.gridlines.*; -import de.adesso.wickedcharts.showcase.configurations.interactions.*; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionBottomConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionLeftConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionRightConfiguration; -import de.adesso.wickedcharts.showcase.configurations.legendposition.LegendPositionTopConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.*; +import de.adesso.wickedcharts.showcase.options.chartjs.gridlines.*; +import de.adesso.wickedcharts.showcase.options.chartjs.interactions.*; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionBottomConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionLeftConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionRightConfiguration; +import de.adesso.wickedcharts.showcase.options.chartjs.legendposition.LegendPositionTopConfiguration; import de.adesso.wickedcharts.showcase.links.ChartjsShowcaseLink; import de.adesso.wickedcharts.showcase.links.HighchartsShowcaseLink; import de.adesso.wickedcharts.showcase.links.UpdateChartJsLink; @@ -168,12 +168,9 @@ private List getChartFromParams(final PageParameters params) { String chartString; List config = new ArrayList<>(); - //Get the parameters of the page - List pairs = params.getAllNamed(); - //If the showcase is started without any parameters //set the parameters to lineBasic and give us a line Chart - if(params.getAllNamed().size() == 0){ + if(params.getAllNamed().isEmpty()){ PageParameters temp = new PageParameters(); temp.add("chart", "lineBasic"); setResponsePage(HomepageChartJs.class, temp); @@ -315,7 +312,7 @@ private List getChartFromParams(final PageParameters params) { break; case "timeCombo": - config.add(new Chart("chart", new TimeComboConfiguration())); + config.add(new Chart("chart", new TimeComboConfigurationWicket8())); break; case "gridLines": @@ -359,8 +356,8 @@ private List getChartFromParams(final PageParameters params) { case "tooltipHtml": config.add(new Chart("chart", new TooltipHtmlLineConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPieConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPointsConfiguration())); + config.add(new Chart("chart", new TooltipHtmlPieConfigurationWicket8())); + config.add(new Chart("chart", new TooltipHtmlPointsConfigurationWicket8())); break; case "bubble": @@ -368,7 +365,7 @@ private List getChartFromParams(final PageParameters params) { break; case "lineProgressBar": - config.add(new Chart("chart", new LineChartProgressBarConfiguration())); + config.add(new Chart("chart", new LineChartProgressBarConfigurationWicket8())); break; case "dataLabelling": diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index ab6a4dbe..e709e212 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -20,6 +20,7 @@ import de.adesso.wickedcharts.showcase.links.UpdateHighchartLink; import de.adesso.wickedcharts.showcase.links.UpdateThemeLink; import de.adesso.wickedcharts.showcase.options.*; +import de.adesso.wickedcharts.showcase.options.highcharts.base.*; import de.adesso.wickedcharts.wicket8.highcharts.Chart; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java deleted file mode 100644 index 0ac5393a..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartFalseConfiguration.java +++ /dev/null @@ -1,63 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'false' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartFalseConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - False")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java deleted file mode 100644 index 7bca9aeb..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartOriginConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'origin' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartOriginConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartOriginConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.ORIGIN); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - Origin")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java deleted file mode 100644 index 8905576a..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/AreaLineBoundariesChartStartConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how the 'start' fill option works - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-boundaries.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class AreaLineBoundariesChartStartConfiguration extends ShowcaseConfiguration { - public AreaLineBoundariesChartStartConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.START); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setPlugins(new Plugins(). - setFiller(new Filler(). - setPropagate(false))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Boundaries Chart - Start")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setAutoSkip(false) - .setMaxRotation(0)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java deleted file mode 100644 index 7178325e..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartHorizontalConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a horizontal bar chart configuration looks. - */ - -/** - * - * A sample that shows how a horizontal bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/horizontal.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class BarChartHorizontalConfiguration extends ShowcaseConfiguration { - public BarChartHorizontalConfiguration() { - super(); - setType(ChartType.HORIZONTAL_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setElements(new Rectangle()) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Horizontal Bar Chart")) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java deleted file mode 100644 index 20a05db5..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedConfiguration.java +++ /dev/null @@ -1,88 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a stacked bar chart configuration looks. - */ - -/** - * - * A sample that shows how a stack bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/stacked.html - * - * @author anedomansky - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class BarChartStackedConfiguration extends ShowcaseConfiguration { - public BarChartStackedConfiguration() { - setType(ChartType.STACKED_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - Dataset dataset3 = new Dataset() - .setLabel("Dataset 3") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Stacked")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java deleted file mode 100644 index cd1cea4f..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartStackedGroupConfiguration.java +++ /dev/null @@ -1,86 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a stacked group bar chart configuration looks. - */ - -/** - * - * A sample that shows how a stacked bar chart group configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/stacked-group.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class BarChartStackedGroupConfiguration extends ShowcaseConfiguration { - public BarChartStackedGroupConfiguration() { - setType(ChartType.STACKED_BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("0"); - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("0"); - - Dataset dataset3 = new Dataset() - .setLabel("Dataset 3") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setStack("1"); - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart - Stacked Groups")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } - -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java deleted file mode 100644 index c0275a09..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BarChartVerticalConfiguration.java +++ /dev/null @@ -1,61 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a vertical bar chart configuration looks. - */ - -/** - * - * A sample that shows how a vertical bar chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/bar/vertical.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class BarChartVerticalConfiguration extends ShowcaseConfiguration { - public BarChartVerticalConfiguration() { - super(); - setType(ChartType.BAR); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(1) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bar Chart")) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java deleted file mode 100644 index ba8c44d3..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/BubbleChartConfiguration.java +++ /dev/null @@ -1,103 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.BubbleValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.Random; - -/** - * - * A sample that shows how a bubble chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scriptable/bubble.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class BubbleChartConfiguration extends ShowcaseConfiguration { - public BubbleChartConfiguration() { - super(); - setType(ChartType.BUBBLE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("My Third dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setHoverBackgroundColor(SimpleColor.WHITE) - .setHoverBorderColor(SimpleColor.RED) - .setHoverBorderWidth(10.0) - .setData(Arrays.asList( - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)), - new BubbleValue(randomDouble(100),randomDouble(100),randomDouble(100)) - )) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - - Options options = new Options() - .setResponsive(true) - .setAspectRatio((double)1) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Bubble Chart")) - ; - setOptions(options); - - - } - - private Double randomDouble(int bound) { - Random random = new Random(); - return (double)random.nextInt(bound)+1; - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java deleted file mode 100644 index 999a7bd3..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/DataLabellingChartConfiguration.java +++ /dev/null @@ -1,71 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.ArrayList; -import java.util.Arrays; - - -/** - * - * A sample that shows how a combo bar-line chart configuration with data labelling. - * - * @see http://www.chartjs.org/samples/latest/advanced/data-labelling.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class DataLabellingChartConfiguration extends ShowcaseConfiguration { - public DataLabellingChartConfiguration() { - super(); - setType(ChartType.BAR); - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/dataLabellingPlugin.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data(); - Dataset dataset1 = new Dataset(); - dataset1.setType(ChartType.LINE) - .setBorderColor(SimpleColor.BLUE) - .setBorderWidth(2) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 1"); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.WHITE) - .setBorderWidth(2) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 2"); - - Dataset dataset3 = new Dataset() - .setType(ChartType.BAR) - .setBackgroundColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setLabel("Dataset 3"); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Bar Line Chart")) - .setTooltips(new Tooltips() - .setIntersect(true) - .setMode(TooltipMode.INDEX)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java deleted file mode 100644 index 71103554..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/DoughnutChartConfiguration.java +++ /dev/null @@ -1,50 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a doughnut configuration looks. - * - * @see http://www.chartjs.org/samples/latest/charts/doughnut.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class DoughnutChartConfiguration extends ShowcaseConfiguration { - public DoughnutChartConfiguration() { - super(); - setType(ChartType.DOUGHNUT); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE, SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Doughnut Chart")) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setAnimation(new Animation() - .setAnimateScale(true) - .setAnimateRotate(true)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java deleted file mode 100644 index bc7a4aa4..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/FilteringLabelsConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a chart with label filtering is configured. - * - * @see http://www.chartjs.org/samples/latest/scales/filtering-labels.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class FilteringLabelsConfiguration extends ShowcaseConfiguration { - public FilteringLabelsConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart - X-Axis Filter")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")) - .setTicks(new Ticks() - .setCallback( - new CallbackFunction("function(dataLabel, index) {\r\n" + - " // Hide the label of every 2nd dataset. return null to hide the grid line too\r\n" + - " return index % 2 === 0 ? dataLabel : '';}")))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setBeginAtZero(true))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java deleted file mode 100644 index 14938151..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LegendPointStyleConfiguration.java +++ /dev/null @@ -1,71 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how different point style configurations look. - * - * @see http://www.chartjs.org/samples/latest/legend/point-style.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LegendPointStyleConfiguration extends ShowcaseConfiguration { - public LegendPointStyleConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setPointStyle(PointStyle.RECT_ROT) - .setPointRadius(10) - .setData(IntegerValue.of(-40, 20, 30, -70, 12, 60, -30)) - .setFill(BoundaryFillingMode.ORIGIN); - - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Point Style Legend")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setLabels(new LegendLabel() - .setUsePointStyle(true))) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java deleted file mode 100644 index af88eb23..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartAreaDatasetConfiguration.java +++ /dev/null @@ -1,143 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.AbsoluteIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.BoundaryFillingMode; -import de.adesso.wickedcharts.chartjs.chartoptions.fillingmodes.RelativeIndex; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a chart with different datasets can be configured. - * - * @see http://www.chartjs.org/samples/latest/charts/area/line-datasets.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartAreaDatasetConfiguration extends ShowcaseConfiguration { - public LineChartAreaDatasetConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset0 = new Dataset() - .setLabel("D0 (hidden), Fill: undefined") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(BoundaryFillingMode.UNDEFINED) - .setHidden(true); - - - Dataset dataset1 = new Dataset() - .setLabel("D1 Fill: -1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("-1")); - - - Dataset dataset2 = new Dataset() - .setLabel("D2 (hidden) Fill: 1") - .setBackgroundColor(SimpleColor.ORANGE_TRANSPARENT) - .setBorderColor(SimpleColor.ORANGE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setHidden(true) - .setFill(new AbsoluteIndex(1)); - - Dataset dataset3 = new Dataset() - .setLabel("D3 Fill: -1") - .setBackgroundColor(SimpleColor.YELLOW_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset4 = new Dataset() - .setLabel("D4 Fill: -1") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("-1")); - - Dataset dataset5 = new Dataset() - .setLabel("D5 Fill: +2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new RelativeIndex("+2")); - - - Dataset dataset6 = new Dataset() - .setLabel("D6 Fill: false") - .setBackgroundColor(SimpleColor.GREY_TRANSPARENT) - .setBorderColor(SimpleColor.GREY) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset7 = new Dataset() - .setLabel("D7 Fill: 8") - .setBackgroundColor(SimpleColor.PURPLE_TRANSPARENT) - .setBorderColor(SimpleColor.PURPLE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(new AbsoluteIndex(8)); - - - Dataset dataset8 = new Dataset() - .setLabel("D8 (hidden) Fill: end") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setHidden(true) - .setFill(BoundaryFillingMode.END); - - data.setDatasets(Arrays.asList(dataset0, dataset1, dataset2, dataset3, dataset4, - dataset5, dataset6, dataset7, dataset8)); - - Options options = new Options() - .setMaintainAspectRatio(true) - .setSpanGaps(false) - .setElements(new Element() - .setLine(new Line() - .setTension(0.000001))) - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Dataset Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setPlugins(new Plugins() - .setFiller(new Filler() - .setPropagate(false)) - .setSamples_filler_analyzer(new SamplesFillerAnalyzer() - .setTarget("chart-analyzer"))) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setStacked(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java deleted file mode 100644 index 49e6c1af..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartBasicConfiguration.java +++ /dev/null @@ -1,72 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample of a basic line chart configuration. - * - * @see http://www.chartjs.org/samples/latest/charts/line/basic.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LineChartBasicConfiguration extends ShowcaseConfiguration { - public LineChartBasicConfiguration() { - - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java deleted file mode 100644 index 5b51dafd..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartInterpolatedConfiguration.java +++ /dev/null @@ -1,84 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.List; - -/** - * - * A sample that shows how configuring interpolation of lines in a line chart is configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/interpolation-modes.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartInterpolatedConfiguration extends ShowcaseConfiguration { - public LineChartInterpolatedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - List datasetsData = IntegerValue.of(randomIntegerList(7)); - - Dataset dataset1 = new Dataset() - .setLabel("Cubic interpolation (monotone)") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(datasetsData) - .setFill(false) - .setCubicInterpolationMode(CubicInterpolationMode.MONOTONE); - - Dataset dataset2 = new Dataset() - .setLabel("Cubic interpolation (default)") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(datasetsData) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("Linear interpolation") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(datasetsData) - .setFill(false) - .setLineTension(0); - - - data.setDatasets(Arrays.asList(dataset1,dataset2, dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Interpolation")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java deleted file mode 100644 index fe82651a..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartMultiAxisConfiguration.java +++ /dev/null @@ -1,76 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how multiple axes in a line chart are configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/multi-axis.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartMultiAxisConfiguration extends ShowcaseConfiguration{ - public LineChartMultiAxisConfiguration() { - setType(ChartType.LINE); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-1"); - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setYAxisID("y-axis-2"); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart - Multi Axis")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setLegend(new Legend() - .setPosition(Position.TOP)) - .setScales(new Scales() - .setYAxes(Arrays.asList(new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.LEFT) - .setId("y-axis-1"), - new AxesScale() - .setType("linear") - .setDisplay(true) - .setPosition(Position.RIGHT) - .setId("y-axis-2") - .setGridLines(new GridLines() - .setDrawOnChartArea(false))))) - - ; - setOptions(options); - - } - -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java deleted file mode 100644 index cc3da325..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedAfterConfiguration.java +++ /dev/null @@ -1,66 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a stepped line chart configuration looks with stepped = after. - * - * @see http://www.chartjs.org/samples/latest/charts/line/stepped.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartSteppedAfterConfiguration extends ShowcaseConfiguration { - public LineChartSteppedAfterConfiguration() { - super(); - setType(ChartType.LINE); - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - - - Dataset dataset1 = new Dataset() - .setLabel("Stepped After") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setSteppedLine(SteppedLineValue.AFTER); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Stepped - After")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java deleted file mode 100644 index 4cfde004..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartSteppedBeforeConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a stepped line chart configuration looks with stepped = before. - * - * @see http://www.chartjs.org/samples/latest/charts/line/stepped.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartSteppedBeforeConfiguration extends ShowcaseConfiguration { - public LineChartSteppedBeforeConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Stepped Before") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false) - .setSteppedLine(SteppedLineValue.BEFORE); - - data.setDatasets(Arrays.asList(dataset1)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart Stepped - Before")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java deleted file mode 100644 index 205fbf11..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineChartWithDifferentPointSizesConfiguration.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; -import java.util.Collections; - -/** - * - * A sample that shows how a line chart can be configured to have different point sizes. - * - * @see http://www.chartjs.org/samples/latest/charts/line/point-sizes.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineChartWithDifferentPointSizesConfiguration extends ShowcaseConfiguration { - public LineChartWithDifferentPointSizesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("dataset - big points") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointRadius(Collections.nCopies(7, 15)) - .setPointHoverRadius(10) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("dataset - individual point sizes") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setBorderDash(Arrays.asList("5", "5")) - .setPointRadius(Arrays.asList(2, 4, 6, 18, 0, 12, 20)) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset3 = new Dataset() - .setLabel("dataset - large pointHoverRadius") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointHoverRadius(30) - .setFill(false); - - - Dataset dataset4 = new Dataset() - .setLabel("dataset - large pointHitRadius") - .setBackgroundColor(SimpleColor.YELLOW) - .setBorderColor(SimpleColor.YELLOW) - .setData(IntegerValue.of(randomIntegerList(7))) - .setPointHitRadius(20) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3, dataset4)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Chart with Different Point Sizes")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java deleted file mode 100644 index 0862c977..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LineStylesConfiguration.java +++ /dev/null @@ -1,80 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how different line styles can be configured. - * - * @see http://www.chartjs.org/samples/latest/charts/line/line-styles.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LineStylesConfiguration extends ShowcaseConfiguration { - public LineStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("Filled") - .setBackgroundColor(SimpleColor.GREEN) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setLabel("Unfilled") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset3 = new Dataset() - .setLabel("Dashed") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setBorderDash(Arrays.asList("5", "5")) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Line Styles")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java deleted file mode 100644 index 0924670d..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicLineChartConfiguration.java +++ /dev/null @@ -1,72 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * A sample that shows how a logarithmic line chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scales/logarithmic/line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LogarithmicLineChartConfiguration extends ShowcaseConfiguration { - public LogarithmicLineChartConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Logarithmic Line Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("logarithmic") - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java deleted file mode 100644 index db5c6709..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/LogarithmicScatterChartConfiguration.java +++ /dev/null @@ -1,85 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * A sample that shows how a logarithmic scatter chart configuration looks. - * - * @see http://www.chartjs.org/samples/latest/scales/logarithmic/scatter.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class LogarithmicScatterChartConfiguration extends ShowcaseConfiguration { - public LogarithmicScatterChartConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Logarithmic Scatter Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("logarithmic") - .setPosition(Position.BOTTOM) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Frequency"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Voltage")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java deleted file mode 100644 index b83ce23d..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MinMaxSuggestedConfiguration.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure suggestedMin and suggestedMax Ticks in the chart options. - * - * @see http://www.chartjs.org/samples/latest/scales/linear/min-max-suggested.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MinMaxSuggestedConfiguration extends ShowcaseConfiguration { - public MinMaxSuggestedConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 50, 20, 25, 44, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Min and Max - Suggested")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setTicks(new Ticks() - .setSuggestedMin(10) - .setSuggestedMax(50)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java deleted file mode 100644 index 85e23292..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/MultilineLabelsConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextListLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure multiline labels. - * - * @see http://www.chartjs.org/samples/latest/scales/multiline-labels.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class MultilineLabelsConfiguration extends ShowcaseConfiguration { - - public MultilineLabelsConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(Arrays.asList( - new TextListLabel("June","2015"), - new TextLabel("July"), - new TextLabel("August"), - new TextLabel("September"), - new TextLabel("October"), - new TextLabel("November"), - new TextLabel("December"), - new TextListLabel("January","2016"), - new TextLabel("February"), - new TextLabel("March"), - new TextLabel("April"), - new TextLabel("May") - )); - - Dataset dataset1 = new Dataset() - .setData(IntegerValue.of(randomIntegerList(12))) - .setLabel("My First dataset") - .setFill(false) - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED); - - Dataset dataset2 = new Dataset() - .setData(IntegerValue.of(randomIntegerList(12))) - .setLabel("My Second dataset") - .setFill(false) - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart with Multiline Labels")); - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java deleted file mode 100644 index a6f3c0e7..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/NonNumericConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.ConstLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ConstValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * A sample that shows how to configure non-numeric values in a chart. - * - * @see http://www.chartjs.org/samples/latest/scales/non-numeric-y.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class NonNumericConfiguration extends ShowcaseConfiguration { - - public NonNumericConfiguration() { - setType(ChartType.LINE); - - Data data = new Data() - .setXLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")) - .setYLabels(ConstLabel.of("", "Request Added", "Request Viewed", "Request Accepted", "Request Solved", "Solving Confirmed")) - ; - - Dataset dataset1 = new Dataset() - .setLabel("My First Dataset") - .setFill(false) - .setBorderColor(SimpleColor.RED) - .setBackgroundColor(SimpleColor.RED) - .setData(ConstValue.of("", "Request Added", "Request Added", "Request Added", "Request Viewed", "Request Viewed", "Request Viewed")) - ; - data.setDatasets(Arrays.asList(dataset1)); - setData(data); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart with Non Numeric Y Axis")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setType("category") - .setPosition(Position.LEFT) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Request State")) - .setTicks(new Ticks() - .setReverse(true)))) - ; - setOptions(options); - - - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java deleted file mode 100644 index 9301accc..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PieChartConfiguration.java +++ /dev/null @@ -1,44 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.ChartType; -import de.adesso.wickedcharts.chartjs.chartoptions.Data; -import de.adesso.wickedcharts.chartjs.chartoptions.Dataset; -import de.adesso.wickedcharts.chartjs.chartoptions.Options; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that displays a dataset as a pie chart. - * - * @see http://www.chartjs.org/samples/latest/charts/pie.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PieChartConfiguration extends ShowcaseConfiguration { - public PieChartConfiguration() { - super(); - setType(ChartType.PIE); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE, SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java deleted file mode 100644 index 03d581f6..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/PolarAreaChartConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that distributes data in a polar area chart. - * - * @see http://www.chartjs.org/samples/latest/charts/polar-area.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class PolarAreaChartConfiguration extends ShowcaseConfiguration { - public PolarAreaChartConfiguration() { - super(); - setType(ChartType.POLAR_AREA); - - Data data = new Data(); - - Dataset dataset = new Dataset() - .setData(IntegerValue.of(randomIntegerList(5))) - .setBackgroundColor( - Arrays.asList(SimpleColor.RED_TRANSPARENT,SimpleColor.ORANGE_TRANSPARENT, - SimpleColor.YELLOW_TRANSPARENT, SimpleColor.GREEN_TRANSPARENT, - SimpleColor.BLUE_TRANSPARENT)) - .setLabel("Dataset 1"); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - setData(data); - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Polar Area Chart")) - .setLegend(new Legend() - .setPosition(Position.RIGHT)) - .setScale(new Scale() - .setTicks(new Ticks() - .setBeginAtZero(true)) - .setReverse(false)) - .setAnimation(new Animation() - .setAnimateScale(true) - .setAnimateRotate(false)); - setOptions(options); - - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java deleted file mode 100644 index b9cee224..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/ScatterChartConfiguration.java +++ /dev/null @@ -1,79 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample which displays data as scattered points in the coordinate system. - * - * @see http://www.chartjs.org/samples/latest/charts/scatter/basic.html - * - * @author maximAtanasov - * @author anedomansky - */ -@SuppressWarnings("serial") -public class ScatterChartConfiguration extends ShowcaseConfiguration { - public ScatterChartConfiguration() { - super(); - setType(ChartType.SCATTER); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(Arrays.asList( - new PointValue(4,14), - new PointValue(40,42), - new PointValue(23,42), - new PointValue(40,22), - new PointValue(80,12), - new PointValue(30,32))) - .setFill(false); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(Arrays.asList( - new PointValue(7,56), - new PointValue(15,54), - new PointValue(46,34), - new PointValue(36,42), - new PointValue(78,64), - new PointValue(12,48))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Scatter Chart")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setHover(new Hover() - .setMode(HoverMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setType("linear") - .setPosition(Position.BOTTOM) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java deleted file mode 100644 index 102fdcd0..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeComboConfiguration.java +++ /dev/null @@ -1,87 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.Session; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Sample which displays a bar chart for the data distribution and a line chart for the time progression of datasets. - * - * @see http://www.chartjs.org/samples/latest/scales/time/combo.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeComboConfiguration extends ShowcaseConfiguration { - - - public TimeComboConfiguration() { - setType(ChartType.BAR); - - String timeFormat = "MM/DD/YYYY HH:mm"; - - List labels = new ArrayList(7); - - LocalDateTime now = LocalDateTime.now(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM/dd/uuuu HH:mm", Session.get().getLocale()); - - - for(int i = 0; i < 7; i++) { - labels.add(new TextLabel(now.plus(i,ChronoUnit.DAYS).format(formatter))); - } - - Dataset dataset1 = new Dataset() - .setType(ChartType.BAR) - .setLabel("Dataset 1") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setType(ChartType.BAR) - .setLabel("Dataset 2") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset3 = new Dataset() - .setType(ChartType.LINE) - .setLabel("Dataset 3") - .setFill(false) - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setData(IntegerValue.of(randomIntegerList(7))); - - - - setData( new Data() - .setLabels(labels) - .setDatasets(Arrays.asList(dataset1,dataset2,dataset3)) - ); - - - - setOptions( new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Combo Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDisplay(true) - .setTime(new TimeFormat() - .setFormat(timeFormat) -// .setRound(TimeFormatRound.DAY) - )))); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java deleted file mode 100644 index 1771cd0d..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeLineConfiguration.java +++ /dev/null @@ -1,126 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.PointValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.StringValue; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.ValueType; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -/** - * Sample which displays a time progression line for datasets. - * - * @see http://www.chartjs.org/samples/latest/scales/time/line.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeLineConfiguration extends ShowcaseConfiguration { - - public TimeLineConfiguration() { - setType(ChartType.LINE); - - Data data = new Data(); - - String timeFormat = "MM/DD/YYYY HH:mm"; - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(timeFormat); - - List dateList = new ArrayList(); - for(int i = 0; i < 7; i++) { - dateList.add(new DateTimeLabel(LocalDateTime.of(2018, 1,1, 8+i, 00))); - } - data.setLabels(dateList); - - Dataset dataset1 = new Dataset() - .setLabel("My First Dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - ; - - Dataset dataset2 = new Dataset() - .setLabel("My Second Dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setFill(false) - .setData(IntegerValue.of(randomIntegerList(7))) - ; - - Dataset dataset3 = new Dataset() - .setLabel("Dataset with point data") - .setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(0).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(1).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(2).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(3).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(4).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(5).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(6).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 15, 0)))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 16, 0)))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(LocalDateTime.of(2018, 1, 1, 17, 0)))) - .setY(randomInteger()) - )) - ; - - data.setDatasets(Arrays.asList(dataset1,dataset2,dataset3)); - setData(data); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setTime(new TimeFormat() - .setTimeFormat(timeFormat ) - .setTooltipFormat("ll HH:mm"))) - .setYAxes(new AxesScale() - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("value")))); - setOptions(options); - - - } - - private ValueType randomInteger() { - Random rng = new Random(); - return new IntegerValue(rng.nextInt(60)+1); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java deleted file mode 100644 index 9913c110..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimePointConfiguration.java +++ /dev/null @@ -1,138 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.StringValueColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.*; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -/** - * Sample which highlights the important points of the x-axis. - * - * @see http://www.chartjs.org/samples/latest/scales/time/line-point-data.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimePointConfiguration extends ShowcaseConfiguration { - - - public TimePointConfiguration() { - setType(ChartType.LINE); - - String timeFormat = "MM/DD/YYYY HH:mm"; - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(timeFormat); - - Data data = new Data(); - - List dateList = new ArrayList(); - for(int i = 0; i < 7; i++) { - dateList.add(new DateTimeLabel(LocalDateTime.of(2018, 1,1, 8+i, 00))); - } - data.setLabels(dateList); - - Dataset dataset1 = new Dataset() - .setLabel("Dataset with date object point data") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new DateTimeValue(dateList.get(0).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(1).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(2).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(3).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(4).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(5).getDate())) - .setY(randomInteger()), - new PointValue() - .setX(new DateTimeValue(dateList.get(6).getDate())) - .setY(randomInteger()) - )); - - - - - Dataset dataset2 = new Dataset() - .setLabel("Dataset with string point data") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE) - .setFill(false) - .setData(Arrays.asList( - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(0).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(1).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(2).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(3).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(4).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(5).getDate()))) - .setY(randomInteger()), - new PointValue() - .setX(new StringValue(formatter.format(dateList.get(6).getDate()))) - .setY(randomInteger()) - )) - ; - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - setData(data); - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("Chart.js Time Scale")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Date")) - .setTicks(new Ticks() - .setMajor(new TickStyle() - .setFontColor(new StringValueColor("red")) - .setFontStyle(FontStyle.BOLD)))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("value")))); - setOptions(options); - - - } - - private ValueType randomInteger() { - Random rng = new Random(); - return new IntegerValue(rng.nextInt(60)+1); - } - - -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java deleted file mode 100644 index b634b84d..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TimeSeriesConfiguration.java +++ /dev/null @@ -1,94 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.label.DateTimeLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.DoubleValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.time.LocalDateTime; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Sample that displays a progression of a dataset. - * - * @see http://www.chartjs.org/samples/latest/scales/time/financial.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TimeSeriesConfiguration extends ShowcaseConfiguration { - - public TimeSeriesConfiguration() { - - - Options options = new Options() - .setTitle(new Title() - .setDisplay(true) - .setText("ChartJs Time Series")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setType("time") - .setDistribution(DistributionType.SERIES) - .setTicks(new Ticks() - .setSource(TickSource.LABELS) - ) - ) - .setYAxes(new AxesScale() - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Closing price ($)")) - )); - - setOptions(options); - - setType(ChartType.LINE); - - LocalDateTime now = LocalDateTime.now(); - - - List labels = new ArrayList(60); - List randomData = new ArrayList(60); - - labels.add(new DateTimeLabel(now)); - randomData.add(randomBar(30)); - - - for(int i = 1; i < 60; i++) { - int dayOfTheWeek = now.plus(i, ChronoUnit.DAYS).getDayOfWeek().getValue(); - if( 1 <= dayOfTheWeek && dayOfTheWeek <= 5) { - labels.add(new DateTimeLabel(now.plus(i, ChronoUnit.DAYS))); - } - randomData.add(randomBar(randomData.get(i-1).getValue())); - } - - - - Data data = new Data() - .setLabels(labels) - .setDatasets(Arrays.asList(new Dataset() - .setLabel("My Dataset") - .setData(randomData) - .setType(ChartType.LINE) - .setPointRadius(0) - .setFill(false) - .setLineTension(0) - .setBorderWidth(2) - )); - setData(data); - } - - private DoubleValue randomBar(double lastClose) { - double open = randomNumber(lastClose * .95, lastClose *1.05); - double close = randomNumber(open * .95, open *1.05); -// double high = randomNumber(Math.max(open, close), Math.max(open, close) * 1.1); -// double low = randomNumber(Math.min(open, close) * .9, Math.min(open, close)); - return new DoubleValue(close); - } - - private double randomNumber(double min, double max) { - return Math.random() * (max - min) + min; - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java deleted file mode 100644 index 25664e15..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipAverageConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that enables tooltips to be at a average position to the data points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipAverageConfiguration extends ShowcaseConfiguration { - public TooltipAverageConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip Average Position")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.AVERAGE) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java deleted file mode 100644 index 87bb95eb..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipCallbacksConfiguration.java +++ /dev/null @@ -1,81 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Sample that enables the use of callback functions for tooltips. - * - * @see http://www.chartjs.org/samples/latest/tooltips/callbacks.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipCallbacksConfiguration extends ShowcaseConfiguration { - public TooltipCallbacksConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - String footerFunction = "function(tooltipItems, data) {\r\n" + - " var sum = 0;\r\n" + - "\r\n" + - " tooltipItems.forEach(function(tooltipItem) {\r\n" + - " sum += data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];\r\n" + - " });\r\n" + - " return 'Sum: ' + sum;\r\n" + - " }"; - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Custom Information in Tooltip")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setCallbacks(new TooltipCallbacks() - .setFooter(new CallbackFunction(footerFunction))) - .setFooterFontStyle(FontStyle.NORMAL)) - .setHover(new Hover() - .setMode(HoverMode.INDEX) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java deleted file mode 100644 index f6ba2261..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPieConfiguration.java +++ /dev/null @@ -1,59 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Sample that enables the use of custom html markup for tooltips in a pie chart. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-pie.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlPieConfiguration extends ShowcaseConfiguration { - public TooltipHtmlPieConfiguration() { - setType(ChartType.PIE); - - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/customTooltip-Pie.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data(); - setData(data); - - Dataset dataset = new Dataset() - .setLabel("My Dataset") - .setBackgroundColor(Arrays.asList(SimpleColor.RED,SimpleColor.ORANGE,SimpleColor.YELLOW, SimpleColor.GREEN, SimpleColor.BLUE)) - .setData(IntegerValue.of(300, 50, 100, 40, 10)); - - data.setDatasets(Arrays.asList(dataset)).setLabels(TextLabel.of("Red", "Orange", "Yellow", "Green", "Blue")); - - Options options = new Options() - .setResponsive(true) - .setLegend(new Legend() - .setDisplay(true)) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Pie")) - .setTooltips(new Tooltips() - .setEnabled(false) -// .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","pieTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java deleted file mode 100644 index 247c5dbd..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipHtmlPointsConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * Sample that enables the use of custom html markup for tooltip points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/custom-points.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipHtmlPointsConfiguration extends ShowcaseConfiguration { - public TooltipHtmlPointsConfiguration() { - setType(ChartType.LINE); - - String optionalJavascript=readFile("de/adesso/wickedcharts/showcase/customTooltip-Point.js"); - - setOptionalJavascript(new ArrayList()); - addOptionalJavascript(optionalJavascript); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setPointBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))); - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setPointBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("HTML Tooltip - Points")) - .setTooltips(new Tooltips() - .setEnabled(false) - .setIntersect(false) - .setMode(TooltipMode.INDEX) - .setCustom(new JavaScriptReference("customTooltips")) - ); - setOptions(options); - } - - @Override - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","pointTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java deleted file mode 100644 index 81ef4a14..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/TooltipNearestConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * Sample that enables tooltips to be at the nearest possible position to the data points. - * - * @see http://www.chartjs.org/samples/latest/tooltips/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class TooltipNearestConfiguration extends ShowcaseConfiguration { - public TooltipNearestConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Tooltip Nearest Position")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setPosition(TooltipPosition.NEAREST) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java deleted file mode 100644 index c0f36337..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/base/ShowcaseConfiguration.java +++ /dev/null @@ -1,57 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.base; - -import de.adesso.wickedcharts.chartjs.ChartConfiguration; -import org.apache.wicket.markup.html.panel.Fragment; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Scanner; - -/** - * The base class for all chart configurations for the showcase - */ -@SuppressWarnings("serial") -public abstract class ShowcaseConfiguration extends ChartConfiguration { - - protected List randomIntegerList(int size) { - List dataList = new ArrayList<>(); - Random rng = new Random(); - for (int i = 0; i < size; i++) { - dataList.add(rng.nextInt(60) + 1); - } - return dataList; - } - - protected String readFile(String fileName) { - - StringBuilder result = new StringBuilder(""); - - // Get file from resources folder - ClassLoader classLoader = getClass().getClassLoader(); - File file = new File(classLoader.getResource(fileName).getFile()); - - try (Scanner scanner = new Scanner(file)) { - - while (scanner.hasNextLine()) { - String line = scanner.nextLine(); - result.append(line).append("\n"); - } - - scanner.close(); - - } catch (IOException e) { - e.printStackTrace(); - } - - return result.toString(); - - } - - public void modfiyIndividualMarkup(Fragment optionalMarkup) { - Fragment frag = new Fragment("optionalMarkup","defaultTooltip",optionalMarkup.getParent()); - optionalMarkup.replaceWith(frag); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java deleted file mode 100644 index c54b2548..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLineStylesConfiguration.java +++ /dev/null @@ -1,74 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.StringValueColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - - -/** - * - * Chart configuration for different grid line styles. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-style.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLineStylesConfiguration extends ShowcaseConfiguration { - public GridLineStylesConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(Arrays.asList(10, 30, 39, 20, 25, 34, -10))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Styles")) - .setScales(new Scales() - .setYAxes(new AxesScale() - .setGridLines(new GridLines() - .setDrawBorder(true) - .setColor(Arrays.asList( - new StringValueColor("pink"), - new StringValueColor("red"), - new StringValueColor("orange"), - new StringValueColor("yellow"), - new StringValueColor("green"), - new StringValueColor("blue"), - new StringValueColor("indigo"), - new StringValueColor("purple")))) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(10)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java deleted file mode 100644 index ea0a665c..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesBasicConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * - * Chart configuration for the basic grid line layout. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesBasicConfiguration extends ShowcaseConfiguration { - - protected GridLines gridLines; - - public GridLinesBasicConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(10, 30, 39, 20, 25, 34, -10)) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(Arrays.asList(18, 33, 22, 19, 11, 39, 30))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - gridLines = new GridLines() - .setDisplay(true); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Basic")) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setGridLines(gridLines)) - .setYAxes(new AxesScale() - .setGridLines(gridLines) - .setTicks(new Ticks() - .setMin(0) - .setMax(100) - .setStepSize(10)))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java deleted file mode 100644 index b45bc4c9..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesChartAreaConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration for the area chart grid line layout. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesChartAreaConfiguration extends GridLinesBasicConfiguration { - - public GridLinesChartAreaConfiguration() { - super(); - - gridLines.setDisplay(true) - .setDrawBorder(true) - .setDrawOnChartArea(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Chart Area")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java deleted file mode 100644 index 171a41fe..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseConfiguration.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display grid lines. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesDisplayFalseConfiguration extends GridLinesBasicConfiguration { - - public GridLinesDisplayFalseConfiguration() { - super(); - - gridLines.setDisplay(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Display False")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java deleted file mode 100644 index 2893b59a..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesDisplayFalseNoBorderConfiguration.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display grid lines and axes. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesDisplayFalseNoBorderConfiguration extends GridLinesBasicConfiguration { - - public GridLinesDisplayFalseNoBorderConfiguration() { - super(); - - gridLines.setDisplay(false) - .setDrawBorder(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Display False No Border")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java deleted file mode 100644 index 9c05bfd8..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/gridlines/GridLinesTicksConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.gridlines; - - -import de.adesso.wickedcharts.chartjs.chartoptions.Title; - -/** - * - * Chart configuration in order to not display the ticks. - * - * @see http://www.chartjs.org/samples/latest/scales/gridlines-display.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class GridLinesTicksConfiguration extends GridLinesBasicConfiguration { - - public GridLinesTicksConfiguration() { - super(); - - gridLines.setDisplay(true) - .setDrawBorder(true) - .setDrawOnChartArea(true) - .setDrawTicks(false); - getOptions().setTitle(new Title() - .setDisplay(true) - .setText("Gridlines - Ticks")); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java deleted file mode 100644 index c2839ec7..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect false the nearest item is used to determine the index. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class DatasetIntersectFalseConfiguration extends ShowcaseConfiguration { - public DatasetIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Dataset, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.DATASET) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java deleted file mode 100644 index 049bbbff..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/DatasetIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If the intersect setting is true, the first intersecting item is used to determine the index in the data. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class DatasetIntersectTrueConfiguration extends ShowcaseConfiguration { - public DatasetIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Dataset, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.DATASET) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java deleted file mode 100644 index 3a6f231f..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect false the nearest item, in the x direction, is used to determine the index. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class IndexIntersectFalseConfiguration extends ShowcaseConfiguration { - public IndexIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Index, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java deleted file mode 100644 index 866e97d7..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/IndexIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If the intersect setting is true, the first intersecting item is used to determine the index in the data. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class IndexIntersectTrueConfiguration extends ShowcaseConfiguration { - public IndexIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Index, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.INDEX) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java deleted file mode 100644 index e7f61e9d..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect is false, this is not triggered when the mouse position intersects an item in the graph. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class NearestIntersectFalseConfiguration extends ShowcaseConfiguration { - public NearestIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Nearest, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.NEAREST) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java deleted file mode 100644 index 0ae1de00..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/NearestIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * If intersect is true, this is only triggered when the mouse position intersects an item in the graph. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class NearestIntersectTrueConfiguration extends ShowcaseConfiguration { - public NearestIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Nearest, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.NEAREST) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java deleted file mode 100644 index 91cec1ba..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Finds no items that intersect the point. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class PointIntersectFalseConfiguration extends ShowcaseConfiguration { - public PointIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Point, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.POINT) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java deleted file mode 100644 index 885b4b12..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/PointIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Finds all of the items that intersect the point. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class PointIntersectTrueConfiguration extends ShowcaseConfiguration { - public PointIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: Point, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.POINT) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java deleted file mode 100644 index 58113ff7..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Does not return all items that would intersect based on the X coordinate of the position only. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class xIntersectFalseConfiguration extends ShowcaseConfiguration { - public xIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: x, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.X) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java deleted file mode 100644 index afe5b960..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/xIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Returns all items that would intersect based on the X coordinate of the position only. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class xIntersectTrueConfiguration extends ShowcaseConfiguration { - public xIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: x, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.X) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java deleted file mode 100644 index c561e419..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectFalseConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Does not return all items that would intersect based on the Y coordinate of the position. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class yIntersectFalseConfiguration extends ShowcaseConfiguration { - public yIntersectFalseConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: y, intersect: false")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.Y) - .setIntersect(false)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java deleted file mode 100644 index ea8de185..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/interactions/yIntersectTrueConfiguration.java +++ /dev/null @@ -1,68 +0,0 @@ -package de.adesso.wickedcharts.showcase.configurations.interactions; - - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Returns all items that would intersect based on the Y coordinate of the position. - * - * @see http://www.chartjs.org/samples/latest/tooltips/interactions.html - * - * @author maximAtanasov - */ -@SuppressWarnings("serial") -public class yIntersectTrueConfiguration extends ShowcaseConfiguration { - public yIntersectTrueConfiguration() { - super(); - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - setData(data); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setBackgroundColor(SimpleColor.RED) - .setBorderColor(SimpleColor.RED) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - - Dataset dataset2 = new Dataset() - .setLabel("My Second dataset") - .setBackgroundColor(SimpleColor.BLUE) - .setBorderColor(SimpleColor.BLUE) - .setData(IntegerValue.of(randomIntegerList(7))) - .setFill(false); - - data.setDatasets(Arrays.asList(dataset1,dataset2)); - - Options options = new Options() - .setResponsive(true) - .setTitle(new Title() - .setDisplay(true) - .setText("Mode: y, intersect: true")) - .setTooltips(new Tooltips() - .setMode(TooltipMode.Y) - .setIntersect(true)) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setYAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value")))) - ; - setOptions(options); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java deleted file mode 100644 index bc02dee4..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionBottomConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position at the bottom - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionBottomConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionBottomConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.GREEN_TRANSPARENT) - .setBorderColor(SimpleColor.GREEN); - - getOptions().setLegend(new Legend().setPosition(Position.BOTTOM)); - - getOptions().getTitle().setText("Legend Position: Bottom"); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java deleted file mode 100644 index 1a8aecd5..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionChartBasicConfiguration.java +++ /dev/null @@ -1,55 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.*; -import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import de.adesso.wickedcharts.chartjs.chartoptions.valueType.IntegerValue; -import de.adesso.wickedcharts.showcase.configurations.base.ShowcaseConfiguration; - -import java.util.Arrays; - -/** - * Base class for the other configurations for the legend position - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionChartBasicConfiguration extends ShowcaseConfiguration { - public LegendPositionChartBasicConfiguration() { - super(); - - setType(ChartType.LINE); - - Data data = new Data() - .setLabels(TextLabel.of("January", "February", "March", "April", "May", "June", "July")); - - Dataset dataset1 = new Dataset() - .setLabel("My First dataset") - .setData(IntegerValue.of(randomIntegerList(7))) - .setBorderWidth(1); - - data.setDatasets(Arrays.asList(dataset1)); - setData(data); - - Options options = new Options() - .setResponsive(true) - .setScales(new Scales() - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Month"))) - .setXAxes(new AxesScale() - .setDisplay(true) - .setScaleLabel(new ScaleLabel() - .setDisplay(true) - .setLabelString("Value"))) - ) - .setTitle(new Title() - .setDisplay(true)) - ; - setOptions(options); - - } -} - diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java deleted file mode 100644 index 910e34f8..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionLeftConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position on the left - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionLeftConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionLeftConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.YELLOW_TRANSPARENT) - .setBorderColor(SimpleColor.YELLOW); - - getOptions().setLegend(new Legend().setPosition(Position.LEFT)); - - getOptions().getTitle().setText("Legend Position: Left"); - } -} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java deleted file mode 100644 index 38dcecc9..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionRightConfiguration.java +++ /dev/null @@ -1,29 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position on the right - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionRightConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionRightConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.BLUE_TRANSPARENT) - .setBorderColor(SimpleColor.BLUE); - - getOptions().setLegend(new Legend().setPosition(Position.RIGHT)); - - getOptions().getTitle().setText("Legend Position: Right"); - } -} - diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java deleted file mode 100644 index 711c225c..00000000 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/configurations/legendposition/LegendPositionTopConfiguration.java +++ /dev/null @@ -1,29 +0,0 @@ - -package de.adesso.wickedcharts.showcase.configurations.legendposition; - -import de.adesso.wickedcharts.chartjs.chartoptions.Legend; -import de.adesso.wickedcharts.chartjs.chartoptions.Position; -import de.adesso.wickedcharts.chartjs.chartoptions.colors.SimpleColor; - -/** - * Shows how to configure a chart with the legend position at the top - * - * @see http://www.chartjs.org/samples/latest/legend/positioning.html - * - * @author SvenWirz - */ -@SuppressWarnings("serial") -public class LegendPositionTopConfiguration extends LegendPositionChartBasicConfiguration { - - public LegendPositionTopConfiguration() { - super(); - - getData().getDatasets().get(0).setBackgroundColor(SimpleColor.RED_TRANSPARENT) - .setBorderColor(SimpleColor.RED); - - getOptions().setLegend(new Legend().setPosition(Position.TOP)); - - getOptions().getTitle().setText("Legend Position: Top"); - } -} - diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java index 3cd85afb..30e6bb14 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ie/SimplePage.java @@ -2,7 +2,7 @@ import de.adesso.wickedcharts.highcharts.options.Options; import de.adesso.wickedcharts.showcase.options.*; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.*; import de.adesso.wickedcharts.wicket8.highcharts.Chart; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.ChoiceRenderer; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java index 92e0f6df..ab1ef8f8 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/modalwindow/ChartPanel.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase.modalwindow; -import de.adesso.wickedcharts.showcase.options.BasicBarOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.BasicBarOptions; import de.adesso.wickedcharts.wicket8.highcharts.Chart; import org.apache.wicket.markup.html.panel.Panel; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java index 530dca76..3dc15765 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java @@ -20,7 +20,7 @@ import de.adesso.wickedcharts.highcharts.options.livedata.LiveDataSeries; import de.adesso.wickedcharts.highcharts.options.livedata.LiveDataUpdateEvent; import de.adesso.wickedcharts.highcharts.options.series.Point; -import de.adesso.wickedcharts.showcase.options.base.ShowcaseOptions; +import de.adesso.wickedcharts.showcase.options.highcharts.base.ShowcaseOptions; import de.adesso.wickedcharts.wicket8.highcharts.features.livedata.WicketLiveDataUpdateEvent; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket8.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket8.java new file mode 100644 index 00000000..073121ff --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/LineChartProgressBarConfigurationWicket8.java @@ -0,0 +1,25 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * + * A sample that shows how a line chart with a progress bar is configured. + * + * @see http://www.chartjs.org/samples/latest/advanced/progress-bar.html + * + * @author maximAtanasov + */ +@SuppressWarnings("serial") +public class LineChartProgressBarConfigurationWicket8 extends LineChartProgressBarConfiguration { + + public LineChartProgressBarConfigurationWicket8() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","progressBar", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket8.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket8.java new file mode 100644 index 00000000..dd0d36c7 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TimeComboConfigurationWicket8.java @@ -0,0 +1,26 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.Session; + +import java.util.Locale; + +/** + * Sample which displays a bar chart for the data distribution and a line chart for the time progression of datasets. + * + * @see http://www.chartjs.org/samples/latest/scales/time/combo.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TimeComboConfigurationWicket8 extends TimeComboConfiguration { + + + public TimeComboConfigurationWicket8() { + super(); + } + + @Override + public Locale getSessionLocale(){ + return Session.get().getLocale(); + } +} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket8.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket8.java new file mode 100644 index 00000000..eb840815 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPieConfigurationWicket8.java @@ -0,0 +1,23 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * Sample that enables the use of custom html markup for tooltips in a pie chart. + * + * @see http://www.chartjs.org/samples/latest/tooltips/custom-pie.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TooltipHtmlPieConfigurationWicket8 extends TooltipHtmlPieConfiguration { + public TooltipHtmlPieConfigurationWicket8() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","pieTooltip", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket8.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket8.java new file mode 100644 index 00000000..83f15e66 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/TooltipHtmlPointsConfigurationWicket8.java @@ -0,0 +1,23 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import org.apache.wicket.markup.html.panel.Fragment; + +/** + * Sample that enables the use of custom html markup for tooltip points. + * + * @see http://www.chartjs.org/samples/latest/tooltips/custom-points.html + * + * @author SvenWirz + */ +@SuppressWarnings("serial") +public class TooltipHtmlPointsConfigurationWicket8 extends TooltipHtmlPointsConfiguration { + public TooltipHtmlPointsConfigurationWicket8() { + super(); + } + + @Override + public void modfiyIndividualMarkup(Object optionalMarkup) { + Fragment frag = new Fragment("optionalMarkup","pointTooltip", ((Fragment)optionalMarkup).getParent()); + ((Fragment)optionalMarkup).replaceWith(frag); + } +} From 72014ef5589f8c6490609cd0d2321e3d4dba1292 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Tue, 2 Oct 2018 09:33:47 +0200 Subject: [PATCH 24/38] updated wicket versions --- showcase/wicked-charts-showcase-wicket7/gradle.properties | 2 +- showcase/wicked-charts-showcase-wicket8/gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/showcase/wicked-charts-showcase-wicket7/gradle.properties b/showcase/wicked-charts-showcase-wicket7/gradle.properties index c59e4089..e9376703 100644 --- a/showcase/wicked-charts-showcase-wicket7/gradle.properties +++ b/showcase/wicked-charts-showcase-wicket7/gradle.properties @@ -1 +1 @@ -wicket_spring_version=7.9.0 \ No newline at end of file +wicket_spring_version=7.10.0 diff --git a/showcase/wicked-charts-showcase-wicket8/gradle.properties b/showcase/wicked-charts-showcase-wicket8/gradle.properties index b9945fe9..a37d66e5 100644 --- a/showcase/wicked-charts-showcase-wicket8/gradle.properties +++ b/showcase/wicked-charts-showcase-wicket8/gradle.properties @@ -1 +1 @@ -wicket_spring_version=8.0.0 \ No newline at end of file +wicket_spring_version=8.1.0 From 7110430df2cc11699068905ecff44e75f238203b Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Tue, 23 Oct 2018 09:41:22 +0200 Subject: [PATCH 25/38] removed javax.servlet from library dependencies --- .../build.gradle | 25 +++++++++---------- wicket/wicked-charts-wicket14/build.gradle | 2 +- wicket/wicked-charts-wicket6/build.gradle | 1 - wicket/wicked-charts-wicket7/build.gradle | 3 +-- wicket/wicked-charts-wicket8/build.gradle | 3 +-- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/showcase/wicked-charts-showcase-wicket7/build.gradle b/showcase/wicked-charts-showcase-wicket7/build.gradle index a3fafa4f..3c182f22 100644 --- a/showcase/wicked-charts-showcase-wicket7/build.gradle +++ b/showcase/wicked-charts-showcase-wicket7/build.gradle @@ -1,20 +1,19 @@ import org.apache.tools.ant.filters.ReplaceTokens dependencies { - compile group: 'org.apache.wicket', name: 'wicket-core', version: "${wicket_spring_version}" - compile project(':wicked-charts-showcase-options') - testCompile 'junit:junit:4.12' - compile 'commons-io:commons-io:2.4' + compile group: 'org.apache.wicket', name: 'wicket-core', version: "${wicket_spring_version}" + compile project(':wicked-charts-showcase-options') + testCompile 'junit:junit:4.12' + compile 'commons-io:commons-io:2.4' compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_spring_version}" - compile( - [group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'], - [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_spring_version}"], - [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket7', version: "${wickedcharts_version}"], - ) - compile( - - [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${spring_boot_version}"], - ) + compile( + [group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'], + [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_spring_version}"], + [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket7', version: "${wickedcharts_version}"], + ) + compile( + [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${spring_boot_version}"], + ) } buildscript { diff --git a/wicket/wicked-charts-wicket14/build.gradle b/wicket/wicked-charts-wicket14/build.gradle index b9e3a5a7..57b54b9e 100644 --- a/wicket/wicked-charts-wicket14/build.gradle +++ b/wicket/wicked-charts-wicket14/build.gradle @@ -2,5 +2,5 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') compile 'org.apache.wicket:wicket:1.4.23' - testCompile 'junit:junit:4.12' //we had a mistake here too + testCompile 'junit:junit:4.12' } \ No newline at end of file diff --git a/wicket/wicked-charts-wicket6/build.gradle b/wicket/wicked-charts-wicket6/build.gradle index edc2b07c..f21e8851 100644 --- a/wicket/wicked-charts-wicket6/build.gradle +++ b/wicket/wicked-charts-wicket6/build.gradle @@ -3,5 +3,4 @@ dependencies { compile project(':chartjs-wrapper') compile 'org.apache.wicket:wicket-core:6.29.0' testCompile 'junit:junit:4.12' - compile 'javax.servlet:servlet-api:2.5' } \ No newline at end of file diff --git a/wicket/wicked-charts-wicket7/build.gradle b/wicket/wicked-charts-wicket7/build.gradle index 59b08b91..393e0a19 100644 --- a/wicket/wicked-charts-wicket7/build.gradle +++ b/wicket/wicked-charts-wicket7/build.gradle @@ -1,8 +1,7 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') - compile 'org.apache.wicket:wicket-core:7.9.0' + compile 'org.apache.wicket:wicket-core:7.10.0' testCompile 'junit:junit:4.12' - compile 'javax.servlet:javax.servlet-api:3.0.1' } diff --git a/wicket/wicked-charts-wicket8/build.gradle b/wicket/wicked-charts-wicket8/build.gradle index 6772806a..62363b6d 100644 --- a/wicket/wicked-charts-wicket8/build.gradle +++ b/wicket/wicked-charts-wicket8/build.gradle @@ -1,8 +1,7 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') - compile 'org.apache.wicket:wicket-core:8.0.0' + compile 'org.apache.wicket:wicket-core:8.1.0' testCompile 'junit:junit:4.12' - compile 'javax.servlet:javax.servlet-api:3.0.1' } From 27f0f55fda357c05eaf6d61cd7e8921a8b85bb8e Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Wed, 24 Oct 2018 09:38:27 +0200 Subject: [PATCH 26/38] removed javax.servlet from libraries and added tests to showcases --- .../chartjs/chartoptions/ChartType.java | 2 +- showcase/build.gradle | 6 +- showcase/gradle.properties | 3 +- .../chartjs/ChartjsConfigurations.java | 70 ++++ .../showcase/HomepageChartJs.java | 243 +++++------ .../showcase/HomepageChartsJsTest.java | 395 ++++++++++++++++++ .../showcase/HomepageChartJs.java | 241 +++++------ .../showcase/HomepageChartsJsTest.java | 395 ++++++++++++++++++ .../showcase/HomepageChartJs.java | 239 +++++------ .../showcase/HomepageChartsJsTest.java | 395 ++++++++++++++++++ .../showcase/HomepageChartJs.java | 243 +++++------ .../showcase/HomepageChartsJsTest.java | 395 ++++++++++++++++++ .../build.gradle | 4 +- .../showcase/HomepageChartJs.java | 241 +++++------ .../showcase/HomepageChartsJsTest.java | 395 ++++++++++++++++++ .../src/test/resources/keystore | Bin 1481 -> 0 bytes 16 files changed, 2657 insertions(+), 610 deletions(-) create mode 100644 showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ChartjsConfigurations.java create mode 100644 showcase/wicked-charts-showcase-wicket14/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java create mode 100644 showcase/wicked-charts-showcase-wicket15/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java create mode 100644 showcase/wicked-charts-showcase-wicket6/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java create mode 100644 showcase/wicked-charts-showcase-wicket7/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java create mode 100644 showcase/wicked-charts-showcase-wicket8/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java delete mode 100644 showcase/wicked-charts-showcase-wicket8/src/test/resources/keystore diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java index 261d0cae..83a14a9e 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/ChartType.java @@ -24,7 +24,7 @@ public enum ChartType implements JsonValueEnum, Serializable { DOUGHNUT("doughnut"), POLAR_AREA("polarArea"), BUBBLE("bubble"); - + private String jsonValue; private ChartType(String jsonValue) { diff --git a/showcase/build.gradle b/showcase/build.gradle index da2cd38b..fb610bc6 100644 --- a/showcase/build.gradle +++ b/showcase/build.gradle @@ -52,14 +52,10 @@ ext { buildNumber = System.getProperty("build.number") } -sourceSets.main.resources { -srcDirs = ["src/main/java","src/main/resources","src/main/webapp","src/test/java"]; -} - task sourcesJar(type: Jar, dependsOn: classes) { classifier = 'sources' from sourceSets.main.output - from sourceSets.main.allSource + from sourceSets.main.allSource } javadoc.failOnError = false diff --git a/showcase/gradle.properties b/showcase/gradle.properties index 4177773d..94640ebd 100644 --- a/showcase/gradle.properties +++ b/showcase/gradle.properties @@ -1,3 +1,4 @@ spring_boot_version = 2.0.3.RELEASE spring_version = 5.0.7.RELEASE -wickedcharts_version = 3.2.0-SNAPSHOT \ No newline at end of file +wickedcharts_version = 3.2.0-SNAPSHOT +junit5_version=5.2.0 diff --git a/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ChartjsConfigurations.java b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ChartjsConfigurations.java new file mode 100644 index 00000000..2d39f24d --- /dev/null +++ b/showcase/wicked-charts-showcase-options/src/main/java/de/adesso/wickedcharts/showcase/options/chartjs/ChartjsConfigurations.java @@ -0,0 +1,70 @@ +package de.adesso.wickedcharts.showcase.options.chartjs; + +import java.io.Serializable; + +public enum ChartjsConfigurations implements Serializable { + BAR_VERTICAL("barVertical"), + BAR_HORIZONTAL("barHorizontal"), + BAR_MULTI_AXIS("barMultiAxis"), + BAR_STACKED("barStacked"), + BAR_STACKED_GROUP("barStackedGroup"), + + LINE_BASIC("lineBaisc"), + LINE_MULTI_AXIS("lineMultiAxis"), + LINE_STEPPED("lineStepped"), + LINE_INTERPOLATED("lineInterpolated"), + LINE_STYLES("lineStyles"), + POINT_STYLES("pointStyles"), + POINT_SIZES("pointSizes"), + + AREA_LINE_BOUNDARIES("areaLineBoundaries"), + LINE_DATASET("lineDataset"), + LINE_STACKED("lineStacked"), + RADAR("radar"), + + SCATTER("scatter"), + SCATTER_MULTI_AXIS("scatterMultiAxis"), + DOUGHNUT("doughnut"), + PIE("pie"), + POLAR_AREA("polarArea"), + RADAR_2("radar2"), + COMBO_BAR_LINE("comboBarLine"), + + STEP_SIZE("stepSize"), + MIN_MAX("minMax"), + + LINE_LOGARITHMIC("lineLogarithmic"), + SCATTER_LOGARITHMIC("scatterLogarithmic"), + + TIME_LINE("timeLine"), + TIME_POINT("timePoint"), + TIME_SERIES("timeSeries"), + TIME_COMBO("timeCombo"), + + GRID_LINES("gridLines"), + MULTILINE_LABELS("multiLineLabels"), + FILTERING_LABELS("filteringLables"), + NON_NUMERIC("nonNumeric"), + + LEGEND_POSITION("legendPosition"), + LEGEND_POINT_STYLE("legendPointStyle"), + + TOOLTIP("tooltip"), + TOOLTIP_HTML("tooltipHtml"), + TOOLTIP_INTERACTIONS("tooltipInteractions"), + + BUBBLE("bubble"), + LINE_PROGRESS_BAR("lineProgressBar"), + DATA_LABELLING("dataLabelling"); + + private String value; + + ChartjsConfigurations(String value) { + this.value = value; + } + + @Override + public String toString() { + return this.value; + } +} \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index c6900067..1c24d480 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -116,51 +116,51 @@ private void addNavigationLinks() { /** * Adds links to the charts in the navigation sidebar */ - private void addChartLinks() { - this.add(new UpdateChartJsLink("LineChartBasic", "lineBasic")); - this.add(new UpdateChartJsLink("BarChartVertical" , "barVertical")); - this.add(new UpdateChartJsLink("LineChartMultiAxis", "lineMultiAxis")); - this.add(new UpdateChartJsLink("LineChartStepped", "lineStepped")); - this.add(new UpdateChartJsLink("LineChartInterpolated", "lineInterpolated")); - this.add(new UpdateChartJsLink("LineStyles", "lineStyles")); - this.add(new UpdateChartJsLink("PointStyles", "pointStyles")); - this.add(new UpdateChartJsLink("PointSizes", "pointSizes")); - this.add(new UpdateChartJsLink("BarChartHorizontal", "barHorizontal")); - this.add(new UpdateChartJsLink("BarChartStacked", "barStacked")); - this.add(new UpdateChartJsLink("BarChartStackedGroup", "barStackedGroup")); - this.add(new UpdateChartJsLink("BarChartMultiAxis", "barMultiAxis")); - this.add(new UpdateChartJsLink("PieChart", "pie")); - this.add(new UpdateChartJsLink("AreaLineBoundariesChart", "areaLineBoundaries")); - this.add(new UpdateChartJsLink("LineChartStacked", "lineStacked")); - this.add(new UpdateChartJsLink("LineChartDataset", "lineDataset")); - this.add(new UpdateChartJsLink("RadarChart", "radar")); - this.add(new UpdateChartJsLink("DoughnutChart", "doughnut")); - this.add(new UpdateChartJsLink("PolarAreaChart", "polarArea")); - this.add(new UpdateChartJsLink("ScatterChart", "scatter")); - this.add(new UpdateChartJsLink("ScatterChartMultiAxis", "scatterMultiAxis")); - this.add(new UpdateChartJsLink("ComboBarLineChart", "comboBarLine")); - this.add(new UpdateChartJsLink("LegendPosition", "legendPosition")); - this.add(new UpdateChartJsLink("StepSize", "stepSize")); - this.add(new UpdateChartJsLink("MinMax", "minMax")); - this.add(new UpdateChartJsLink("GridLines", "gridLines")); - this.add(new UpdateChartJsLink("MultilineLabels", "multiLineLabels")); - this.add(new UpdateChartJsLink("LogarithmicLineChart", "lineLogarithmic")); - this.add(new UpdateChartJsLink("LogarithmicScatterChart", "scatterLogarithmic")); - this.add(new UpdateChartJsLink("BubbleChart", "bubble")); - this.add(new UpdateChartJsLink("FilteringLabels", "filteringLabels")); - this.add(new UpdateChartJsLink("TimeLine", "timeLine")); - this.add(new UpdateChartJsLink("NonNumeric", "nonNumeric")); - this.add(new UpdateChartJsLink("TimePoint", "timePoint")); - this.add(new UpdateChartJsLink("TimeSeries", "timeSeries")); - this.add(new UpdateChartJsLink("TimeCombo", "timeCombo")); - this.add(new UpdateChartJsLink("OtherRadar", "radar2")); - this.add(new UpdateChartJsLink("Tooltip", "tooltip")); - this.add(new UpdateChartJsLink("TooltipHtml", "tooltipHtml")); - this.add(new UpdateChartJsLink("LegendPointStyle", "legendPointStyle")); - this.add(new UpdateChartJsLink("LineChartProgressBar", "lineProgressBar")); - this.add(new UpdateChartJsLink("DataLabellingChart", "dataLabelling")); - this.add(new UpdateChartJsLink("TooltipInteractions", "tooltipInteractions")); - } + private void addChartLinks() { + this.add(new UpdateChartJsLink("LineChartBasic", ChartjsConfigurations.LINE_BASIC.toString())); + this.add(new UpdateChartJsLink("BarChartVertical" , ChartjsConfigurations.BAR_VERTICAL.toString())); + this.add(new UpdateChartJsLink("LineChartMultiAxis", ChartjsConfigurations.LINE_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("LineChartStepped", ChartjsConfigurations.LINE_STEPPED.toString())); + this.add(new UpdateChartJsLink("LineChartInterpolated", ChartjsConfigurations.LINE_INTERPOLATED.toString())); + this.add(new UpdateChartJsLink("LineStyles", ChartjsConfigurations.LINE_STYLES.toString())); + this.add(new UpdateChartJsLink("PointStyles", ChartjsConfigurations.POINT_STYLES.toString())); + this.add(new UpdateChartJsLink("PointSizes", ChartjsConfigurations.POINT_SIZES.toString())); + this.add(new UpdateChartJsLink("BarChartHorizontal", ChartjsConfigurations.BAR_HORIZONTAL.toString())); + this.add(new UpdateChartJsLink("BarChartStacked", ChartjsConfigurations.BAR_STACKED.toString())); + this.add(new UpdateChartJsLink("BarChartStackedGroup", ChartjsConfigurations.BAR_STACKED_GROUP.toString())); + this.add(new UpdateChartJsLink("BarChartMultiAxis", ChartjsConfigurations.BAR_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("PieChart", ChartjsConfigurations.PIE.toString())); + this.add(new UpdateChartJsLink("AreaLineBoundariesChart", ChartjsConfigurations.AREA_LINE_BOUNDARIES.toString())); + this.add(new UpdateChartJsLink("LineChartStacked", ChartjsConfigurations.LINE_STACKED.toString())); + this.add(new UpdateChartJsLink("LineChartDataset", ChartjsConfigurations.LINE_DATASET.toString())); + this.add(new UpdateChartJsLink("RadarChart", ChartjsConfigurations.RADAR.toString())); + this.add(new UpdateChartJsLink("DoughnutChart", ChartjsConfigurations.DOUGHNUT.toString())); + this.add(new UpdateChartJsLink("PolarAreaChart", ChartjsConfigurations.POLAR_AREA.toString())); + this.add(new UpdateChartJsLink("ScatterChart", ChartjsConfigurations.SCATTER.toString())); + this.add(new UpdateChartJsLink("ScatterChartMultiAxis", ChartjsConfigurations.SCATTER_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("ComboBarLineChart", ChartjsConfigurations.COMBO_BAR_LINE.toString())); + this.add(new UpdateChartJsLink("LegendPosition", ChartjsConfigurations.LEGEND_POSITION.toString())); + this.add(new UpdateChartJsLink("StepSize", ChartjsConfigurations.STEP_SIZE.toString())); + this.add(new UpdateChartJsLink("MinMax", ChartjsConfigurations.MIN_MAX.toString())); + this.add(new UpdateChartJsLink("GridLines", ChartjsConfigurations.GRID_LINES.toString())); + this.add(new UpdateChartJsLink("MultilineLabels", ChartjsConfigurations.MULTILINE_LABELS.toString())); + this.add(new UpdateChartJsLink("LogarithmicLineChart", ChartjsConfigurations.LINE_LOGARITHMIC.toString())); + this.add(new UpdateChartJsLink("LogarithmicScatterChart", ChartjsConfigurations.SCATTER_LOGARITHMIC.toString())); + this.add(new UpdateChartJsLink("BubbleChart", ChartjsConfigurations.BUBBLE.toString())); + this.add(new UpdateChartJsLink("FilteringLabels", ChartjsConfigurations.FILTERING_LABELS.toString())); + this.add(new UpdateChartJsLink("TimeLine", ChartjsConfigurations.TIME_LINE.toString())); + this.add(new UpdateChartJsLink("NonNumeric", ChartjsConfigurations.NON_NUMERIC.toString())); + this.add(new UpdateChartJsLink("TimePoint", ChartjsConfigurations.TIME_POINT.toString())); + this.add(new UpdateChartJsLink("TimeSeries", ChartjsConfigurations.TIME_SERIES.toString())); + this.add(new UpdateChartJsLink("TimeCombo", ChartjsConfigurations.TIME_COMBO.toString())); + this.add(new UpdateChartJsLink("OtherRadar", ChartjsConfigurations.RADAR_2.toString())); + this.add(new UpdateChartJsLink("Tooltip", ChartjsConfigurations.TOOLTIP.toString())); + this.add(new UpdateChartJsLink("TooltipHtml", ChartjsConfigurations.TOOLTIP_HTML.toString())); + this.add(new UpdateChartJsLink("LegendPointStyle", ChartjsConfigurations.LEGEND_POINT_STYLE.toString())); + this.add(new UpdateChartJsLink("LineChartProgressBar", ChartjsConfigurations.LINE_PROGRESS_BAR.toString())); + this.add(new UpdateChartJsLink("DataLabellingChart", ChartjsConfigurations.DATA_LABELLING.toString())); + this.add(new UpdateChartJsLink("TooltipInteractions", ChartjsConfigurations.TOOLTIP_INTERACTIONS.toString())); + } /** * Returns a List of Chart objects from the current page parameters. @@ -173,225 +173,226 @@ private List getChartFromParams(final PageParameters params) { //If the showcase is started without any parameters //set the parameters to lineBasic and give us a line Chart + final String chartComponentID = "chart"; if(params.keySet().isEmpty()){ PageParameters temp = new PageParameters(); temp.add("chart", "lineBasic"); setResponsePage(HomepageChartJs.class, temp); - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); return config; } - chartString = params.get("chart").toString(); + chartString = params.get(chartComponentID).toString(); if(chartString == null) { - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); return config; } switch(chartString) { case "barVertical": - config.add(new Chart("chart", new BarChartVerticalConfiguration())); + config.add(new Chart(chartComponentID, new BarChartVerticalConfiguration())); break; case "barHorizontal": - config.add(new Chart("chart", new BarChartHorizontalConfiguration())); + config.add(new Chart(chartComponentID, new BarChartHorizontalConfiguration())); break; case "barMultiAxis": - config.add(new Chart("chart", new BarChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new BarChartMultiAxisConfiguration())); break; case "barStacked": - config.add(new Chart("chart", new BarChartStackedConfiguration())); + config.add(new Chart(chartComponentID, new BarChartStackedConfiguration())); break; case "barStackedGroup": - config.add(new Chart("chart", new BarChartStackedGroupConfiguration())); + config.add(new Chart(chartComponentID, new BarChartStackedGroupConfiguration())); break; case "lineBasic": - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); break; case "lineMultiAxis": - config.add(new Chart("chart", new LineChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new LineChartMultiAxisConfiguration())); break; case "lineStepped": - config.add(new Chart("chart", new LineChartSteppedBeforeConfiguration())); - config.add(new Chart("chart", new LineChartSteppedAfterConfiguration())); + config.add(new Chart(chartComponentID, new LineChartSteppedBeforeConfiguration())); + config.add(new Chart(chartComponentID, new LineChartSteppedAfterConfiguration())); break; case "lineInterpolated": - config.add(new Chart("chart", new LineChartInterpolatedConfiguration())); + config.add(new Chart(chartComponentID, new LineChartInterpolatedConfiguration())); break; case "lineStyles": - config.add(new Chart("chart", new LineStylesConfiguration())); + config.add(new Chart(chartComponentID, new LineStylesConfiguration())); break; case "pointStyles": - config.add(new Chart("chart", new PointStylesConfiguration())); + config.add(new Chart(chartComponentID, new PointStylesConfiguration())); break; case "pointSizes": - config.add(new Chart("chart", new LineChartWithDifferentPointSizesConfiguration())); + config.add(new Chart(chartComponentID, new LineChartWithDifferentPointSizesConfiguration())); break; case "areaLineBoundaries": - config.add(new Chart("chart", new AreaLineBoundariesChartStartConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartEndConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartOriginConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartFalseConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartStartConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartEndConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartOriginConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartFalseConfiguration())); break; case "lineDataset": - config.add(new Chart("chart", new LineChartAreaDatasetConfiguration())); + config.add(new Chart(chartComponentID, new LineChartAreaDatasetConfiguration())); break; case "lineStacked": - config.add(new Chart("chart", new LineChartStackedConfiguration())); + config.add(new Chart(chartComponentID, new LineChartStackedConfiguration())); break; case "radar": - config.add(new Chart("chart", new RadarChartConfiguration())); + config.add(new Chart(chartComponentID, new RadarChartConfiguration())); break; case "scatter": - config.add(new Chart("chart", new ScatterChartConfiguration())); + config.add(new Chart(chartComponentID, new ScatterChartConfiguration())); break; case "scatterMultiAxis": - config.add(new Chart("chart", new ScatterChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new ScatterChartMultiAxisConfiguration())); break; case "doughnut": - config.add(new Chart("chart", new DoughnutChartConfiguration())); + config.add(new Chart(chartComponentID, new DoughnutChartConfiguration())); break; case "pie": - config.add(new Chart("chart", new PieChartConfiguration())); + config.add(new Chart(chartComponentID, new PieChartConfiguration())); break; case "polarArea": - config.add(new Chart("chart", new PolarAreaChartConfiguration())); + config.add(new Chart(chartComponentID, new PolarAreaChartConfiguration())); break; case "radar2": - config.add(new Chart("chart", new OtherRadarChartConfiguration())); + config.add(new Chart(chartComponentID, new OtherRadarChartConfiguration())); break; case "comboBarLine": - config.add(new Chart("chart", new ComboBarLineChartConfiguration())); + config.add(new Chart(chartComponentID, new ComboBarLineChartConfiguration())); break; case "stepSize": - config.add(new Chart("chart", new LinearStepSizeConfiguration())); + config.add(new Chart(chartComponentID, new LinearStepSizeConfiguration())); break; case "minMax": - config.add(new Chart("chart", new MinMaxConfiguration())); - config.add(new Chart("chart", new MinMaxSuggestedConfiguration())); + config.add(new Chart(chartComponentID, new MinMaxConfiguration())); + config.add(new Chart(chartComponentID, new MinMaxSuggestedConfiguration())); break; case "lineLogarithmic": - config.add(new Chart("chart", new LogarithmicLineChartConfiguration())); + config.add(new Chart(chartComponentID, new LogarithmicLineChartConfiguration())); break; case "scatterLogarithmic": - config.add(new Chart("chart", new LogarithmicScatterChartConfiguration())); + config.add(new Chart(chartComponentID, new LogarithmicScatterChartConfiguration())); break; case "timeLine": - config.add(new Chart("chart", new TimeLineConfiguration())); + config.add(new Chart(chartComponentID, new TimeLineConfiguration())); break; case "timePoint": - config.add(new Chart("chart", new TimePointConfiguration())); + config.add(new Chart(chartComponentID, new TimePointConfiguration())); break; case "timeSeries": - config.add(new Chart("chart", new TimeSeriesConfiguration())); + config.add(new Chart(chartComponentID, new TimeSeriesConfiguration())); break; case "timeCombo": - config.add(new Chart("chart", new TimeComboConfigurationWicket14())); + config.add(new Chart(chartComponentID, new TimeComboConfigurationWicket14())); break; case "gridLines": - config.add(new Chart("chart", new GridLinesBasicConfiguration())); - config.add(new Chart("chart", new GridLinesDisplayFalseConfiguration())); - config.add(new Chart("chart", new GridLinesDisplayFalseNoBorderConfiguration())); - config.add(new Chart("chart", new GridLinesChartAreaConfiguration())); - config.add(new Chart("chart", new GridLinesTicksConfiguration())); - config.add(new Chart("chart", new GridLineStylesConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesBasicConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesDisplayFalseConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesDisplayFalseNoBorderConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesChartAreaConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesTicksConfiguration())); + config.add(new Chart(chartComponentID, new GridLineStylesConfiguration())); break; case "multiLineLabels": - config.add(new Chart("chart", new MultilineLabelsConfiguration())); + config.add(new Chart(chartComponentID, new MultilineLabelsConfiguration())); break; case "filteringLabels": - config.add(new Chart("chart", new FilteringLabelsConfiguration())); + config.add(new Chart(chartComponentID, new FilteringLabelsConfiguration())); break; case "nonNumeric": - config.add(new Chart("chart", new NonNumericConfiguration())); + config.add(new Chart(chartComponentID, new NonNumericConfiguration())); break; case "legendPosition": - config.add(new Chart("chart", new LegendPositionTopConfiguration())); - config.add(new Chart("chart", new LegendPositionRightConfiguration())); - config.add(new Chart("chart", new LegendPositionBottomConfiguration())); - config.add(new Chart("chart", new LegendPositionLeftConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionTopConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionRightConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionBottomConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionLeftConfiguration())); break; case "legendPointStyle": - config.add(new Chart("chart", new LegendPointStyleConfiguration())); + config.add(new Chart(chartComponentID, new LegendPointStyleConfiguration())); break; case "tooltip": - config.add(new Chart("chart", new TooltipBorderConfiguration())); - config.add(new Chart("chart", new TooltipCallbacksConfiguration())); - config.add(new Chart("chart", new TooltipAverageConfiguration())); - config.add(new Chart("chart", new TooltipNearestConfiguration())); + config.add(new Chart(chartComponentID, new TooltipBorderConfiguration())); + config.add(new Chart(chartComponentID, new TooltipCallbacksConfiguration())); + config.add(new Chart(chartComponentID, new TooltipAverageConfiguration())); + config.add(new Chart(chartComponentID, new TooltipNearestConfiguration())); break; case "tooltipHtml": - config.add(new Chart("chart", new TooltipHtmlLineConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPieConfigurationWicket14())); - config.add(new Chart("chart", new TooltipHtmlPointsConfigurationWicket14())); + config.add(new Chart(chartComponentID, new TooltipHtmlLineConfiguration())); + config.add(new Chart(chartComponentID, new TooltipHtmlPieConfigurationWicket14())); + config.add(new Chart(chartComponentID, new TooltipHtmlPointsConfigurationWicket14())); break; case "bubble": - config.add(new Chart("chart", new BubbleChartConfiguration())); + config.add(new Chart(chartComponentID, new BubbleChartConfiguration())); break; case "lineProgressBar": - config.add(new Chart("chart", new LineChartProgressBarConfigurationWicket14())); + config.add(new Chart(chartComponentID, new LineChartProgressBarConfigurationWicket14())); break; case "dataLabelling": - config.add(new Chart("chart", new DataLabellingChartConfiguration())); + config.add(new Chart(chartComponentID, new DataLabellingChartConfiguration())); break; case "tooltipInteractions": - config.add(new Chart("chart", new DatasetIntersectFalseConfiguration())); - config.add(new Chart("chart", new DatasetIntersectTrueConfiguration())); - config.add(new Chart("chart", new IndexIntersectFalseConfiguration())); - config.add(new Chart("chart", new IndexIntersectTrueConfiguration())); - config.add(new Chart("chart", new NearestIntersectFalseConfiguration())); - config.add(new Chart("chart", new NearestIntersectTrueConfiguration())); - config.add(new Chart("chart", new PointIntersectFalseConfiguration())); - config.add(new Chart("chart", new PointIntersectTrueConfiguration())); - config.add(new Chart("chart", new xIntersectFalseConfiguration())); - config.add(new Chart("chart", new xIntersectTrueConfiguration())); - config.add(new Chart("chart", new yIntersectFalseConfiguration())); - config.add(new Chart("chart", new yIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new DatasetIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new DatasetIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new IndexIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new IndexIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new NearestIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new NearestIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new PointIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new PointIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new xIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new xIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new yIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new yIntersectTrueConfiguration())); break; default: - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); break; } return config; diff --git a/showcase/wicked-charts-showcase-wicket14/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java b/showcase/wicked-charts-showcase-wicket14/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java new file mode 100644 index 00000000..55e3a8d4 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket14/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java @@ -0,0 +1,395 @@ +package de.adesso.wickedcharts.showcase; + +import de.adesso.wickedcharts.showcase.options.chartjs.ChartjsConfigurations; +import org.apache.wicket.PageParameters; +import org.apache.wicket.util.tester.WicketTester; +import org.junit.Test; + +public class HomepageChartsJsTest { + + @Test + public void renderBarVerticalTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_VERTICAL.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarHorizontalTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_HORIZONTAL.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarMutliAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_MULTI_AXIS.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarStackedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_STACKED.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + @Test + public void renderBarStackedGroupTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_STACKED_GROUP.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineBasicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_BASIC.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineMultiAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_MULTI_AXIS.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineSteppedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STEPPED.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineInterpolatedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_INTERPOLATED.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineStylesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STYLES.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPointStylesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POINT_STYLES.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPointSizesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POINT_SIZES.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderAreaLineBoundariesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.AREA_LINE_BOUNDARIES.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineDatasetTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_DATASET.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineStackedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STACKED.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderRadarTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.RADAR.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterMultiAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER_MULTI_AXIS.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderDoughnutTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.DOUGHNUT.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPieTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.PIE.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPolarAreaTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POLAR_AREA.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderRadar2Test(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.RADAR_2.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderComboBarLineTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.COMBO_BAR_LINE.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderStepSizeTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.STEP_SIZE.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderMinMaxTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.MIN_MAX.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineLogarithmicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_LOGARITHMIC.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterLogarithmicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER_LOGARITHMIC.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeLineTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_LINE.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimePointTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_POINT.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeSeriesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_SERIES.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeComboTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_COMBO.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderGridLinesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.GRID_LINES.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderMultilineLabelsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.MULTILINE_LABELS.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderFilteringLabelsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.FILTERING_LABELS.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderNonNumericTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.NON_NUMERIC.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLegendPositionTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LEGEND_POSITION.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLegendPointStyleTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LEGEND_POINT_STYLE.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipHTMLTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP_HTML.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipInteractionsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP_INTERACTIONS.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBubbleTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BUBBLE.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineProgressBarTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_PROGRESS_BAR.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderDataLabellingTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.DATA_LABELLING.toString()); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } +} diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index 774c09d8..123e3927 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -112,51 +112,51 @@ private void addNavigationLinks() { /** * Adds links to the charts in the navigation sidebar */ - private void addChartLinks() { - this.add(new UpdateChartJsLink("LineChartBasic", "lineBasic")); - this.add(new UpdateChartJsLink("BarChartVertical" , "barVertical")); - this.add(new UpdateChartJsLink("LineChartMultiAxis", "lineMultiAxis")); - this.add(new UpdateChartJsLink("LineChartStepped", "lineStepped")); - this.add(new UpdateChartJsLink("LineChartInterpolated", "lineInterpolated")); - this.add(new UpdateChartJsLink("LineStyles", "lineStyles")); - this.add(new UpdateChartJsLink("PointStyles", "pointStyles")); - this.add(new UpdateChartJsLink("PointSizes", "pointSizes")); - this.add(new UpdateChartJsLink("BarChartHorizontal", "barHorizontal")); - this.add(new UpdateChartJsLink("BarChartStacked", "barStacked")); - this.add(new UpdateChartJsLink("BarChartStackedGroup", "barStackedGroup")); - this.add(new UpdateChartJsLink("BarChartMultiAxis", "barMultiAxis")); - this.add(new UpdateChartJsLink("PieChart", "pie")); - this.add(new UpdateChartJsLink("AreaLineBoundariesChart", "areaLineBoundaries")); - this.add(new UpdateChartJsLink("LineChartStacked", "lineStacked")); - this.add(new UpdateChartJsLink("LineChartDataset", "lineDataset")); - this.add(new UpdateChartJsLink("RadarChart", "radar")); - this.add(new UpdateChartJsLink("DoughnutChart", "doughnut")); - this.add(new UpdateChartJsLink("PolarAreaChart", "polarArea")); - this.add(new UpdateChartJsLink("ScatterChart", "scatter")); - this.add(new UpdateChartJsLink("ScatterChartMultiAxis", "scatterMultiAxis")); - this.add(new UpdateChartJsLink("ComboBarLineChart", "comboBarLine")); - this.add(new UpdateChartJsLink("LegendPosition", "legendPosition")); - this.add(new UpdateChartJsLink("StepSize", "stepSize")); - this.add(new UpdateChartJsLink("MinMax", "minMax")); - this.add(new UpdateChartJsLink("GridLines", "gridLines")); - this.add(new UpdateChartJsLink("MultilineLabels", "multiLineLabels")); - this.add(new UpdateChartJsLink("LogarithmicLineChart", "lineLogarithmic")); - this.add(new UpdateChartJsLink("LogarithmicScatterChart", "scatterLogarithmic")); - this.add(new UpdateChartJsLink("BubbleChart", "bubble")); - this.add(new UpdateChartJsLink("FilteringLabels", "filteringLabels")); - this.add(new UpdateChartJsLink("TimeLine", "timeLine")); - this.add(new UpdateChartJsLink("NonNumeric", "nonNumeric")); - this.add(new UpdateChartJsLink("TimePoint", "timePoint")); - this.add(new UpdateChartJsLink("TimeSeries", "timeSeries")); - this.add(new UpdateChartJsLink("TimeCombo", "timeCombo")); - this.add(new UpdateChartJsLink("OtherRadar", "radar2")); - this.add(new UpdateChartJsLink("Tooltip", "tooltip")); - this.add(new UpdateChartJsLink("TooltipHtml", "tooltipHtml")); - this.add(new UpdateChartJsLink("LegendPointStyle", "legendPointStyle")); - this.add(new UpdateChartJsLink("LineChartProgressBar", "lineProgressBar")); - this.add(new UpdateChartJsLink("DataLabellingChart", "dataLabelling")); - this.add(new UpdateChartJsLink("TooltipInteractions", "tooltipInteractions")); - } + private void addChartLinks() { + this.add(new UpdateChartJsLink("LineChartBasic", ChartjsConfigurations.LINE_BASIC.toString())); + this.add(new UpdateChartJsLink("BarChartVertical" , ChartjsConfigurations.BAR_VERTICAL.toString())); + this.add(new UpdateChartJsLink("LineChartMultiAxis", ChartjsConfigurations.LINE_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("LineChartStepped", ChartjsConfigurations.LINE_STEPPED.toString())); + this.add(new UpdateChartJsLink("LineChartInterpolated", ChartjsConfigurations.LINE_INTERPOLATED.toString())); + this.add(new UpdateChartJsLink("LineStyles", ChartjsConfigurations.LINE_STYLES.toString())); + this.add(new UpdateChartJsLink("PointStyles", ChartjsConfigurations.POINT_STYLES.toString())); + this.add(new UpdateChartJsLink("PointSizes", ChartjsConfigurations.POINT_SIZES.toString())); + this.add(new UpdateChartJsLink("BarChartHorizontal", ChartjsConfigurations.BAR_HORIZONTAL.toString())); + this.add(new UpdateChartJsLink("BarChartStacked", ChartjsConfigurations.BAR_STACKED.toString())); + this.add(new UpdateChartJsLink("BarChartStackedGroup", ChartjsConfigurations.BAR_STACKED_GROUP.toString())); + this.add(new UpdateChartJsLink("BarChartMultiAxis", ChartjsConfigurations.BAR_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("PieChart", ChartjsConfigurations.PIE.toString())); + this.add(new UpdateChartJsLink("AreaLineBoundariesChart", ChartjsConfigurations.AREA_LINE_BOUNDARIES.toString())); + this.add(new UpdateChartJsLink("LineChartStacked", ChartjsConfigurations.LINE_STACKED.toString())); + this.add(new UpdateChartJsLink("LineChartDataset", ChartjsConfigurations.LINE_DATASET.toString())); + this.add(new UpdateChartJsLink("RadarChart", ChartjsConfigurations.RADAR.toString())); + this.add(new UpdateChartJsLink("DoughnutChart", ChartjsConfigurations.DOUGHNUT.toString())); + this.add(new UpdateChartJsLink("PolarAreaChart", ChartjsConfigurations.POLAR_AREA.toString())); + this.add(new UpdateChartJsLink("ScatterChart", ChartjsConfigurations.SCATTER.toString())); + this.add(new UpdateChartJsLink("ScatterChartMultiAxis", ChartjsConfigurations.SCATTER_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("ComboBarLineChart", ChartjsConfigurations.COMBO_BAR_LINE.toString())); + this.add(new UpdateChartJsLink("LegendPosition", ChartjsConfigurations.LEGEND_POSITION.toString())); + this.add(new UpdateChartJsLink("StepSize", ChartjsConfigurations.STEP_SIZE.toString())); + this.add(new UpdateChartJsLink("MinMax", ChartjsConfigurations.MIN_MAX.toString())); + this.add(new UpdateChartJsLink("GridLines", ChartjsConfigurations.GRID_LINES.toString())); + this.add(new UpdateChartJsLink("MultilineLabels", ChartjsConfigurations.MULTILINE_LABELS.toString())); + this.add(new UpdateChartJsLink("LogarithmicLineChart", ChartjsConfigurations.LINE_LOGARITHMIC.toString())); + this.add(new UpdateChartJsLink("LogarithmicScatterChart", ChartjsConfigurations.SCATTER_LOGARITHMIC.toString())); + this.add(new UpdateChartJsLink("BubbleChart", ChartjsConfigurations.BUBBLE.toString())); + this.add(new UpdateChartJsLink("FilteringLabels", ChartjsConfigurations.FILTERING_LABELS.toString())); + this.add(new UpdateChartJsLink("TimeLine", ChartjsConfigurations.TIME_LINE.toString())); + this.add(new UpdateChartJsLink("NonNumeric", ChartjsConfigurations.NON_NUMERIC.toString())); + this.add(new UpdateChartJsLink("TimePoint", ChartjsConfigurations.TIME_POINT.toString())); + this.add(new UpdateChartJsLink("TimeSeries", ChartjsConfigurations.TIME_SERIES.toString())); + this.add(new UpdateChartJsLink("TimeCombo", ChartjsConfigurations.TIME_COMBO.toString())); + this.add(new UpdateChartJsLink("OtherRadar", ChartjsConfigurations.RADAR_2.toString())); + this.add(new UpdateChartJsLink("Tooltip", ChartjsConfigurations.TOOLTIP.toString())); + this.add(new UpdateChartJsLink("TooltipHtml", ChartjsConfigurations.TOOLTIP_HTML.toString())); + this.add(new UpdateChartJsLink("LegendPointStyle", ChartjsConfigurations.LEGEND_POINT_STYLE.toString())); + this.add(new UpdateChartJsLink("LineChartProgressBar", ChartjsConfigurations.LINE_PROGRESS_BAR.toString())); + this.add(new UpdateChartJsLink("DataLabellingChart", ChartjsConfigurations.DATA_LABELLING.toString())); + this.add(new UpdateChartJsLink("TooltipInteractions", ChartjsConfigurations.TOOLTIP_INTERACTIONS.toString())); + } /** * Returns a List of Chart objects from the current page parameters. @@ -169,225 +169,226 @@ private List getChartFromParams(final PageParameters params) { //If the showcase is started without any parameters //set the parameters to lineBasic and give us a line Chart + final String chartComponentID = "chart"; if(params.getAllNamed().isEmpty()){ PageParameters temp = new PageParameters(); temp.add("chart", "lineBasic"); setResponsePage(HomepageChartJs.class, temp); - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); return config; } chartString = params.getAllNamed().get(0).getValue(); if(chartString == null) { - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); return config; } switch(chartString) { case "barVertical": - config.add(new Chart("chart", new BarChartVerticalConfiguration())); + config.add(new Chart(chartComponentID, new BarChartVerticalConfiguration())); break; case "barHorizontal": - config.add(new Chart("chart", new BarChartHorizontalConfiguration())); + config.add(new Chart(chartComponentID, new BarChartHorizontalConfiguration())); break; case "barMultiAxis": - config.add(new Chart("chart", new BarChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new BarChartMultiAxisConfiguration())); break; case "barStacked": - config.add(new Chart("chart", new BarChartStackedConfiguration())); + config.add(new Chart(chartComponentID, new BarChartStackedConfiguration())); break; case "barStackedGroup": - config.add(new Chart("chart", new BarChartStackedGroupConfiguration())); + config.add(new Chart(chartComponentID, new BarChartStackedGroupConfiguration())); break; case "lineBasic": - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); break; case "lineMultiAxis": - config.add(new Chart("chart", new LineChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new LineChartMultiAxisConfiguration())); break; case "lineStepped": - config.add(new Chart("chart", new LineChartSteppedBeforeConfiguration())); - config.add(new Chart("chart", new LineChartSteppedAfterConfiguration())); + config.add(new Chart(chartComponentID, new LineChartSteppedBeforeConfiguration())); + config.add(new Chart(chartComponentID, new LineChartSteppedAfterConfiguration())); break; case "lineInterpolated": - config.add(new Chart("chart", new LineChartInterpolatedConfiguration())); + config.add(new Chart(chartComponentID, new LineChartInterpolatedConfiguration())); break; case "lineStyles": - config.add(new Chart("chart", new LineStylesConfiguration())); + config.add(new Chart(chartComponentID, new LineStylesConfiguration())); break; case "pointStyles": - config.add(new Chart("chart", new PointStylesConfiguration())); + config.add(new Chart(chartComponentID, new PointStylesConfiguration())); break; case "pointSizes": - config.add(new Chart("chart", new LineChartWithDifferentPointSizesConfiguration())); + config.add(new Chart(chartComponentID, new LineChartWithDifferentPointSizesConfiguration())); break; case "areaLineBoundaries": - config.add(new Chart("chart", new AreaLineBoundariesChartStartConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartEndConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartOriginConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartFalseConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartStartConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartEndConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartOriginConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartFalseConfiguration())); break; case "lineDataset": - config.add(new Chart("chart", new LineChartAreaDatasetConfiguration())); + config.add(new Chart(chartComponentID, new LineChartAreaDatasetConfiguration())); break; case "lineStacked": - config.add(new Chart("chart", new LineChartStackedConfiguration())); + config.add(new Chart(chartComponentID, new LineChartStackedConfiguration())); break; case "radar": - config.add(new Chart("chart", new RadarChartConfiguration())); + config.add(new Chart(chartComponentID, new RadarChartConfiguration())); break; case "scatter": - config.add(new Chart("chart", new ScatterChartConfiguration())); + config.add(new Chart(chartComponentID, new ScatterChartConfiguration())); break; case "scatterMultiAxis": - config.add(new Chart("chart", new ScatterChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new ScatterChartMultiAxisConfiguration())); break; case "doughnut": - config.add(new Chart("chart", new DoughnutChartConfiguration())); + config.add(new Chart(chartComponentID, new DoughnutChartConfiguration())); break; case "pie": - config.add(new Chart("chart", new PieChartConfiguration())); + config.add(new Chart(chartComponentID, new PieChartConfiguration())); break; case "polarArea": - config.add(new Chart("chart", new PolarAreaChartConfiguration())); + config.add(new Chart(chartComponentID, new PolarAreaChartConfiguration())); break; case "radar2": - config.add(new Chart("chart", new OtherRadarChartConfiguration())); + config.add(new Chart(chartComponentID, new OtherRadarChartConfiguration())); break; case "comboBarLine": - config.add(new Chart("chart", new ComboBarLineChartConfiguration())); + config.add(new Chart(chartComponentID, new ComboBarLineChartConfiguration())); break; case "stepSize": - config.add(new Chart("chart", new LinearStepSizeConfiguration())); + config.add(new Chart(chartComponentID, new LinearStepSizeConfiguration())); break; case "minMax": - config.add(new Chart("chart", new MinMaxConfiguration())); - config.add(new Chart("chart", new MinMaxSuggestedConfiguration())); + config.add(new Chart(chartComponentID, new MinMaxConfiguration())); + config.add(new Chart(chartComponentID, new MinMaxSuggestedConfiguration())); break; case "lineLogarithmic": - config.add(new Chart("chart", new LogarithmicLineChartConfiguration())); + config.add(new Chart(chartComponentID, new LogarithmicLineChartConfiguration())); break; case "scatterLogarithmic": - config.add(new Chart("chart", new LogarithmicScatterChartConfiguration())); + config.add(new Chart(chartComponentID, new LogarithmicScatterChartConfiguration())); break; case "timeLine": - config.add(new Chart("chart", new TimeLineConfiguration())); + config.add(new Chart(chartComponentID, new TimeLineConfiguration())); break; case "timePoint": - config.add(new Chart("chart", new TimePointConfiguration())); + config.add(new Chart(chartComponentID, new TimePointConfiguration())); break; case "timeSeries": - config.add(new Chart("chart", new TimeSeriesConfiguration())); + config.add(new Chart(chartComponentID, new TimeSeriesConfiguration())); break; case "timeCombo": - config.add(new Chart("chart", new TimeComboConfiguration())); + config.add(new Chart(chartComponentID, new TimeComboConfigurationWicket15())); break; case "gridLines": - config.add(new Chart("chart", new GridLinesBasicConfiguration())); - config.add(new Chart("chart", new GridLinesDisplayFalseConfiguration())); - config.add(new Chart("chart", new GridLinesDisplayFalseNoBorderConfiguration())); - config.add(new Chart("chart", new GridLinesChartAreaConfiguration())); - config.add(new Chart("chart", new GridLinesTicksConfiguration())); - config.add(new Chart("chart", new GridLineStylesConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesBasicConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesDisplayFalseConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesDisplayFalseNoBorderConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesChartAreaConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesTicksConfiguration())); + config.add(new Chart(chartComponentID, new GridLineStylesConfiguration())); break; case "multiLineLabels": - config.add(new Chart("chart", new MultilineLabelsConfiguration())); + config.add(new Chart(chartComponentID, new MultilineLabelsConfiguration())); break; case "filteringLabels": - config.add(new Chart("chart", new FilteringLabelsConfiguration())); + config.add(new Chart(chartComponentID, new FilteringLabelsConfiguration())); break; case "nonNumeric": - config.add(new Chart("chart", new NonNumericConfiguration())); + config.add(new Chart(chartComponentID, new NonNumericConfiguration())); break; case "legendPosition": - config.add(new Chart("chart", new LegendPositionTopConfiguration())); - config.add(new Chart("chart", new LegendPositionRightConfiguration())); - config.add(new Chart("chart", new LegendPositionBottomConfiguration())); - config.add(new Chart("chart", new LegendPositionLeftConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionTopConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionRightConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionBottomConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionLeftConfiguration())); break; case "legendPointStyle": - config.add(new Chart("chart", new LegendPointStyleConfiguration())); + config.add(new Chart(chartComponentID, new LegendPointStyleConfiguration())); break; case "tooltip": - config.add(new Chart("chart", new TooltipBorderConfiguration())); - config.add(new Chart("chart", new TooltipCallbacksConfiguration())); - config.add(new Chart("chart", new TooltipAverageConfiguration())); - config.add(new Chart("chart", new TooltipNearestConfiguration())); + config.add(new Chart(chartComponentID, new TooltipBorderConfiguration())); + config.add(new Chart(chartComponentID, new TooltipCallbacksConfiguration())); + config.add(new Chart(chartComponentID, new TooltipAverageConfiguration())); + config.add(new Chart(chartComponentID, new TooltipNearestConfiguration())); break; case "tooltipHtml": - config.add(new Chart("chart", new TooltipHtmlLineConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPieConfigurationWicket15())); - config.add(new Chart("chart", new TooltipHtmlPointsConfigurationWicket15())); + config.add(new Chart(chartComponentID, new TooltipHtmlLineConfiguration())); + config.add(new Chart(chartComponentID, new TooltipHtmlPieConfigurationWicket15())); + config.add(new Chart(chartComponentID, new TooltipHtmlPointsConfigurationWicket15())); break; case "bubble": - config.add(new Chart("chart", new BubbleChartConfiguration())); + config.add(new Chart(chartComponentID, new BubbleChartConfiguration())); break; case "lineProgressBar": - config.add(new Chart("chart", new LineChartProgressBarConfigurationWicket15())); + config.add(new Chart(chartComponentID, new LineChartProgressBarConfigurationWicket15())); break; case "dataLabelling": - config.add(new Chart("chart", new DataLabellingChartConfiguration())); + config.add(new Chart(chartComponentID, new DataLabellingChartConfiguration())); break; case "tooltipInteractions": - config.add(new Chart("chart", new DatasetIntersectFalseConfiguration())); - config.add(new Chart("chart", new DatasetIntersectTrueConfiguration())); - config.add(new Chart("chart", new IndexIntersectFalseConfiguration())); - config.add(new Chart("chart", new IndexIntersectTrueConfiguration())); - config.add(new Chart("chart", new NearestIntersectFalseConfiguration())); - config.add(new Chart("chart", new NearestIntersectTrueConfiguration())); - config.add(new Chart("chart", new PointIntersectFalseConfiguration())); - config.add(new Chart("chart", new PointIntersectTrueConfiguration())); - config.add(new Chart("chart", new xIntersectFalseConfiguration())); - config.add(new Chart("chart", new xIntersectTrueConfiguration())); - config.add(new Chart("chart", new yIntersectFalseConfiguration())); - config.add(new Chart("chart", new yIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new DatasetIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new DatasetIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new IndexIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new IndexIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new NearestIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new NearestIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new PointIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new PointIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new xIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new xIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new yIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new yIntersectTrueConfiguration())); break; default: - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); break; } return config; diff --git a/showcase/wicked-charts-showcase-wicket15/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java b/showcase/wicked-charts-showcase-wicket15/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java new file mode 100644 index 00000000..e070b551 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket15/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java @@ -0,0 +1,395 @@ +package de.adesso.wickedcharts.showcase; + +import de.adesso.wickedcharts.showcase.options.chartjs.ChartjsConfigurations; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.util.tester.WicketTester; +import org.junit.Test; + +public class HomepageChartsJsTest { + + @Test + public void renderBarVerticalTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_VERTICAL); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarHorizontalTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_HORIZONTAL); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarMutliAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarStackedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_STACKED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + @Test + public void renderBarStackedGroupTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_STACKED_GROUP); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineBasicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_BASIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineMultiAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineSteppedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STEPPED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineInterpolatedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_INTERPOLATED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineStylesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STYLES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPointStylesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POINT_STYLES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPointSizesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POINT_SIZES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderAreaLineBoundariesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.AREA_LINE_BOUNDARIES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineDatasetTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_DATASET); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineStackedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STACKED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderRadarTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.RADAR); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterMultiAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderDoughnutTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.DOUGHNUT); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPieTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.PIE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPolarAreaTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POLAR_AREA); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderRadar2Test(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.RADAR_2); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderComboBarLineTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.COMBO_BAR_LINE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderStepSizeTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.STEP_SIZE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderMinMaxTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.MIN_MAX); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineLogarithmicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_LOGARITHMIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterLogarithmicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER_LOGARITHMIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeLineTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_LINE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimePointTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_POINT); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeSeriesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_SERIES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeComboTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_COMBO); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderGridLinesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.GRID_LINES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderMultilineLabelsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.MULTILINE_LABELS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderFilteringLabelsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.FILTERING_LABELS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderNonNumericTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.NON_NUMERIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLegendPositionTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LEGEND_POSITION); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLegendPointStyleTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LEGEND_POINT_STYLE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipHTMLTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP_HTML); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipInteractionsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP_INTERACTIONS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBubbleTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BUBBLE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineProgressBarTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_PROGRESS_BAR); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderDataLabellingTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.DATA_LABELLING); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } +} diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index 2aedc488..c7494edc 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -113,49 +113,49 @@ private void addNavigationLinks() { * Adds links to the charts in the navigation sidebar */ private void addChartLinks() { - this.add(new UpdateChartJsLink("LineChartBasic", "lineBasic")); - this.add(new UpdateChartJsLink("BarChartVertical" , "barVertical")); - this.add(new UpdateChartJsLink("LineChartMultiAxis", "lineMultiAxis")); - this.add(new UpdateChartJsLink("LineChartStepped", "lineStepped")); - this.add(new UpdateChartJsLink("LineChartInterpolated", "lineInterpolated")); - this.add(new UpdateChartJsLink("LineStyles", "lineStyles")); - this.add(new UpdateChartJsLink("PointStyles", "pointStyles")); - this.add(new UpdateChartJsLink("PointSizes", "pointSizes")); - this.add(new UpdateChartJsLink("BarChartHorizontal", "barHorizontal")); - this.add(new UpdateChartJsLink("BarChartStacked", "barStacked")); - this.add(new UpdateChartJsLink("BarChartStackedGroup", "barStackedGroup")); - this.add(new UpdateChartJsLink("BarChartMultiAxis", "barMultiAxis")); - this.add(new UpdateChartJsLink("PieChart", "pie")); - this.add(new UpdateChartJsLink("AreaLineBoundariesChart", "areaLineBoundaries")); - this.add(new UpdateChartJsLink("LineChartStacked", "lineStacked")); - this.add(new UpdateChartJsLink("LineChartDataset", "lineDataset")); - this.add(new UpdateChartJsLink("RadarChart", "radar")); - this.add(new UpdateChartJsLink("DoughnutChart", "doughnut")); - this.add(new UpdateChartJsLink("PolarAreaChart", "polarArea")); - this.add(new UpdateChartJsLink("ScatterChart", "scatter")); - this.add(new UpdateChartJsLink("ScatterChartMultiAxis", "scatterMultiAxis")); - this.add(new UpdateChartJsLink("ComboBarLineChart", "comboBarLine")); - this.add(new UpdateChartJsLink("LegendPosition", "legendPosition")); - this.add(new UpdateChartJsLink("StepSize", "stepSize")); - this.add(new UpdateChartJsLink("MinMax", "minMax")); - this.add(new UpdateChartJsLink("GridLines", "gridLines")); - this.add(new UpdateChartJsLink("MultilineLabels", "multiLineLabels")); - this.add(new UpdateChartJsLink("LogarithmicLineChart", "lineLogarithmic")); - this.add(new UpdateChartJsLink("LogarithmicScatterChart", "scatterLogarithmic")); - this.add(new UpdateChartJsLink("BubbleChart", "bubble")); - this.add(new UpdateChartJsLink("FilteringLabels", "filteringLabels")); - this.add(new UpdateChartJsLink("TimeLine", "timeLine")); - this.add(new UpdateChartJsLink("NonNumeric", "nonNumeric")); - this.add(new UpdateChartJsLink("TimePoint", "timePoint")); - this.add(new UpdateChartJsLink("TimeSeries", "timeSeries")); - this.add(new UpdateChartJsLink("TimeCombo", "timeCombo")); - this.add(new UpdateChartJsLink("OtherRadar", "radar2")); - this.add(new UpdateChartJsLink("Tooltip", "tooltip")); - this.add(new UpdateChartJsLink("TooltipHtml", "tooltipHtml")); - this.add(new UpdateChartJsLink("LegendPointStyle", "legendPointStyle")); - this.add(new UpdateChartJsLink("LineChartProgressBar", "lineProgressBar")); - this.add(new UpdateChartJsLink("DataLabellingChart", "dataLabelling")); - this.add(new UpdateChartJsLink("TooltipInteractions", "tooltipInteractions")); + this.add(new UpdateChartJsLink("LineChartBasic", ChartjsConfigurations.LINE_BASIC.toString())); + this.add(new UpdateChartJsLink("BarChartVertical" , ChartjsConfigurations.BAR_VERTICAL.toString())); + this.add(new UpdateChartJsLink("LineChartMultiAxis", ChartjsConfigurations.LINE_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("LineChartStepped", ChartjsConfigurations.LINE_STEPPED.toString())); + this.add(new UpdateChartJsLink("LineChartInterpolated", ChartjsConfigurations.LINE_INTERPOLATED.toString())); + this.add(new UpdateChartJsLink("LineStyles", ChartjsConfigurations.LINE_STYLES.toString())); + this.add(new UpdateChartJsLink("PointStyles", ChartjsConfigurations.POINT_STYLES.toString())); + this.add(new UpdateChartJsLink("PointSizes", ChartjsConfigurations.POINT_SIZES.toString())); + this.add(new UpdateChartJsLink("BarChartHorizontal", ChartjsConfigurations.BAR_HORIZONTAL.toString())); + this.add(new UpdateChartJsLink("BarChartStacked", ChartjsConfigurations.BAR_STACKED.toString())); + this.add(new UpdateChartJsLink("BarChartStackedGroup", ChartjsConfigurations.BAR_STACKED_GROUP.toString())); + this.add(new UpdateChartJsLink("BarChartMultiAxis", ChartjsConfigurations.BAR_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("PieChart", ChartjsConfigurations.PIE.toString())); + this.add(new UpdateChartJsLink("AreaLineBoundariesChart", ChartjsConfigurations.AREA_LINE_BOUNDARIES.toString())); + this.add(new UpdateChartJsLink("LineChartStacked", ChartjsConfigurations.LINE_STACKED.toString())); + this.add(new UpdateChartJsLink("LineChartDataset", ChartjsConfigurations.LINE_DATASET.toString())); + this.add(new UpdateChartJsLink("RadarChart", ChartjsConfigurations.RADAR.toString())); + this.add(new UpdateChartJsLink("DoughnutChart", ChartjsConfigurations.DOUGHNUT.toString())); + this.add(new UpdateChartJsLink("PolarAreaChart", ChartjsConfigurations.POLAR_AREA.toString())); + this.add(new UpdateChartJsLink("ScatterChart", ChartjsConfigurations.SCATTER.toString())); + this.add(new UpdateChartJsLink("ScatterChartMultiAxis", ChartjsConfigurations.SCATTER_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("ComboBarLineChart", ChartjsConfigurations.COMBO_BAR_LINE.toString())); + this.add(new UpdateChartJsLink("LegendPosition", ChartjsConfigurations.LEGEND_POSITION.toString())); + this.add(new UpdateChartJsLink("StepSize", ChartjsConfigurations.STEP_SIZE.toString())); + this.add(new UpdateChartJsLink("MinMax", ChartjsConfigurations.MIN_MAX.toString())); + this.add(new UpdateChartJsLink("GridLines", ChartjsConfigurations.GRID_LINES.toString())); + this.add(new UpdateChartJsLink("MultilineLabels", ChartjsConfigurations.MULTILINE_LABELS.toString())); + this.add(new UpdateChartJsLink("LogarithmicLineChart", ChartjsConfigurations.LINE_LOGARITHMIC.toString())); + this.add(new UpdateChartJsLink("LogarithmicScatterChart", ChartjsConfigurations.SCATTER_LOGARITHMIC.toString())); + this.add(new UpdateChartJsLink("BubbleChart", ChartjsConfigurations.BUBBLE.toString())); + this.add(new UpdateChartJsLink("FilteringLabels", ChartjsConfigurations.FILTERING_LABELS.toString())); + this.add(new UpdateChartJsLink("TimeLine", ChartjsConfigurations.TIME_LINE.toString())); + this.add(new UpdateChartJsLink("NonNumeric", ChartjsConfigurations.NON_NUMERIC.toString())); + this.add(new UpdateChartJsLink("TimePoint", ChartjsConfigurations.TIME_POINT.toString())); + this.add(new UpdateChartJsLink("TimeSeries", ChartjsConfigurations.TIME_SERIES.toString())); + this.add(new UpdateChartJsLink("TimeCombo", ChartjsConfigurations.TIME_COMBO.toString())); + this.add(new UpdateChartJsLink("OtherRadar", ChartjsConfigurations.RADAR_2.toString())); + this.add(new UpdateChartJsLink("Tooltip", ChartjsConfigurations.TOOLTIP.toString())); + this.add(new UpdateChartJsLink("TooltipHtml", ChartjsConfigurations.TOOLTIP_HTML.toString())); + this.add(new UpdateChartJsLink("LegendPointStyle", ChartjsConfigurations.LEGEND_POINT_STYLE.toString())); + this.add(new UpdateChartJsLink("LineChartProgressBar", ChartjsConfigurations.LINE_PROGRESS_BAR.toString())); + this.add(new UpdateChartJsLink("DataLabellingChart", ChartjsConfigurations.DATA_LABELLING.toString())); + this.add(new UpdateChartJsLink("TooltipInteractions", ChartjsConfigurations.TOOLTIP_INTERACTIONS.toString())); } /** @@ -169,225 +169,226 @@ private List getChartFromParams(final PageParameters params) { //If the showcase is started without any parameters //set the parameters to lineBasic and give us a line Chart + final String chartComponentID = "chart"; if(params.getAllNamed().isEmpty()){ PageParameters temp = new PageParameters(); - temp.add("chart", "lineBasic"); + temp.add(chartComponentID, "lineBasic"); setResponsePage(HomepageChartJs.class, temp); - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); return config; } chartString = params.getAllNamed().get(0).getValue(); if(chartString == null) { - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); return config; } switch(chartString) { case "barVertical": - config.add(new Chart("chart", new BarChartVerticalConfiguration())); + config.add(new Chart(chartComponentID, new BarChartVerticalConfiguration())); break; case "barHorizontal": - config.add(new Chart("chart", new BarChartHorizontalConfiguration())); + config.add(new Chart(chartComponentID, new BarChartHorizontalConfiguration())); break; case "barMultiAxis": - config.add(new Chart("chart", new BarChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new BarChartMultiAxisConfiguration())); break; case "barStacked": - config.add(new Chart("chart", new BarChartStackedConfiguration())); + config.add(new Chart(chartComponentID, new BarChartStackedConfiguration())); break; case "barStackedGroup": - config.add(new Chart("chart", new BarChartStackedGroupConfiguration())); + config.add(new Chart(chartComponentID, new BarChartStackedGroupConfiguration())); break; case "lineBasic": - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); break; case "lineMultiAxis": - config.add(new Chart("chart", new LineChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new LineChartMultiAxisConfiguration())); break; case "lineStepped": - config.add(new Chart("chart", new LineChartSteppedBeforeConfiguration())); - config.add(new Chart("chart", new LineChartSteppedAfterConfiguration())); + config.add(new Chart(chartComponentID, new LineChartSteppedBeforeConfiguration())); + config.add(new Chart(chartComponentID, new LineChartSteppedAfterConfiguration())); break; case "lineInterpolated": - config.add(new Chart("chart", new LineChartInterpolatedConfiguration())); + config.add(new Chart(chartComponentID, new LineChartInterpolatedConfiguration())); break; case "lineStyles": - config.add(new Chart("chart", new LineStylesConfiguration())); + config.add(new Chart(chartComponentID, new LineStylesConfiguration())); break; case "pointStyles": - config.add(new Chart("chart", new PointStylesConfiguration())); + config.add(new Chart(chartComponentID, new PointStylesConfiguration())); break; case "pointSizes": - config.add(new Chart("chart", new LineChartWithDifferentPointSizesConfiguration())); + config.add(new Chart(chartComponentID, new LineChartWithDifferentPointSizesConfiguration())); break; case "areaLineBoundaries": - config.add(new Chart("chart", new AreaLineBoundariesChartStartConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartEndConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartOriginConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartFalseConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartStartConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartEndConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartOriginConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartFalseConfiguration())); break; case "lineDataset": - config.add(new Chart("chart", new LineChartAreaDatasetConfiguration())); + config.add(new Chart(chartComponentID, new LineChartAreaDatasetConfiguration())); break; case "lineStacked": - config.add(new Chart("chart", new LineChartStackedConfiguration())); + config.add(new Chart(chartComponentID, new LineChartStackedConfiguration())); break; case "radar": - config.add(new Chart("chart", new RadarChartConfiguration())); + config.add(new Chart(chartComponentID, new RadarChartConfiguration())); break; case "scatter": - config.add(new Chart("chart", new ScatterChartConfiguration())); + config.add(new Chart(chartComponentID, new ScatterChartConfiguration())); break; case "scatterMultiAxis": - config.add(new Chart("chart", new ScatterChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new ScatterChartMultiAxisConfiguration())); break; case "doughnut": - config.add(new Chart("chart", new DoughnutChartConfiguration())); + config.add(new Chart(chartComponentID, new DoughnutChartConfiguration())); break; case "pie": - config.add(new Chart("chart", new PieChartConfiguration())); + config.add(new Chart(chartComponentID, new PieChartConfiguration())); break; case "polarArea": - config.add(new Chart("chart", new PolarAreaChartConfiguration())); + config.add(new Chart(chartComponentID, new PolarAreaChartConfiguration())); break; case "radar2": - config.add(new Chart("chart", new OtherRadarChartConfiguration())); + config.add(new Chart(chartComponentID, new OtherRadarChartConfiguration())); break; case "comboBarLine": - config.add(new Chart("chart", new ComboBarLineChartConfiguration())); + config.add(new Chart(chartComponentID, new ComboBarLineChartConfiguration())); break; case "stepSize": - config.add(new Chart("chart", new LinearStepSizeConfiguration())); + config.add(new Chart(chartComponentID, new LinearStepSizeConfiguration())); break; case "minMax": - config.add(new Chart("chart", new MinMaxConfiguration())); - config.add(new Chart("chart", new MinMaxSuggestedConfiguration())); + config.add(new Chart(chartComponentID, new MinMaxConfiguration())); + config.add(new Chart(chartComponentID, new MinMaxSuggestedConfiguration())); break; case "lineLogarithmic": - config.add(new Chart("chart", new LogarithmicLineChartConfiguration())); + config.add(new Chart(chartComponentID, new LogarithmicLineChartConfiguration())); break; case "scatterLogarithmic": - config.add(new Chart("chart", new LogarithmicScatterChartConfiguration())); + config.add(new Chart(chartComponentID, new LogarithmicScatterChartConfiguration())); break; case "timeLine": - config.add(new Chart("chart", new TimeLineConfiguration())); + config.add(new Chart(chartComponentID, new TimeLineConfiguration())); break; case "timePoint": - config.add(new Chart("chart", new TimePointConfiguration())); + config.add(new Chart(chartComponentID, new TimePointConfiguration())); break; case "timeSeries": - config.add(new Chart("chart", new TimeSeriesConfiguration())); + config.add(new Chart(chartComponentID, new TimeSeriesConfiguration())); break; case "timeCombo": - config.add(new Chart("chart", new TimeComboConfigurationWicket6())); + config.add(new Chart(chartComponentID, new TimeComboConfigurationWicket6())); break; case "gridLines": - config.add(new Chart("chart", new GridLinesBasicConfiguration())); - config.add(new Chart("chart", new GridLinesDisplayFalseConfiguration())); - config.add(new Chart("chart", new GridLinesDisplayFalseNoBorderConfiguration())); - config.add(new Chart("chart", new GridLinesChartAreaConfiguration())); - config.add(new Chart("chart", new GridLinesTicksConfiguration())); - config.add(new Chart("chart", new GridLineStylesConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesBasicConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesDisplayFalseConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesDisplayFalseNoBorderConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesChartAreaConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesTicksConfiguration())); + config.add(new Chart(chartComponentID, new GridLineStylesConfiguration())); break; case "multiLineLabels": - config.add(new Chart("chart", new MultilineLabelsConfiguration())); + config.add(new Chart(chartComponentID, new MultilineLabelsConfiguration())); break; case "filteringLabels": - config.add(new Chart("chart", new FilteringLabelsConfiguration())); + config.add(new Chart(chartComponentID, new FilteringLabelsConfiguration())); break; case "nonNumeric": - config.add(new Chart("chart", new NonNumericConfiguration())); + config.add(new Chart(chartComponentID, new NonNumericConfiguration())); break; case "legendPosition": - config.add(new Chart("chart", new LegendPositionTopConfiguration())); - config.add(new Chart("chart", new LegendPositionRightConfiguration())); - config.add(new Chart("chart", new LegendPositionBottomConfiguration())); - config.add(new Chart("chart", new LegendPositionLeftConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionTopConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionRightConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionBottomConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionLeftConfiguration())); break; case "legendPointStyle": - config.add(new Chart("chart", new LegendPointStyleConfiguration())); + config.add(new Chart(chartComponentID, new LegendPointStyleConfiguration())); break; case "tooltip": - config.add(new Chart("chart", new TooltipBorderConfiguration())); - config.add(new Chart("chart", new TooltipCallbacksConfiguration())); - config.add(new Chart("chart", new TooltipAverageConfiguration())); - config.add(new Chart("chart", new TooltipNearestConfiguration())); + config.add(new Chart(chartComponentID, new TooltipBorderConfiguration())); + config.add(new Chart(chartComponentID, new TooltipCallbacksConfiguration())); + config.add(new Chart(chartComponentID, new TooltipAverageConfiguration())); + config.add(new Chart(chartComponentID, new TooltipNearestConfiguration())); break; case "tooltipHtml": - config.add(new Chart("chart", new TooltipHtmlLineConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPieConfigurationWicket6())); - config.add(new Chart("chart", new TooltipHtmlPointsConfigurationWicket6())); + config.add(new Chart(chartComponentID, new TooltipHtmlLineConfiguration())); + config.add(new Chart(chartComponentID, new TooltipHtmlPieConfigurationWicket6())); + config.add(new Chart(chartComponentID, new TooltipHtmlPointsConfigurationWicket6())); break; case "bubble": - config.add(new Chart("chart", new BubbleChartConfiguration())); + config.add(new Chart(chartComponentID, new BubbleChartConfiguration())); break; case "lineProgressBar": - config.add(new Chart("chart", new LineChartProgressBarConfigurationWicket6())); + config.add(new Chart(chartComponentID, new LineChartProgressBarConfigurationWicket6())); break; case "dataLabelling": - config.add(new Chart("chart", new DataLabellingChartConfiguration())); + config.add(new Chart(chartComponentID, new DataLabellingChartConfiguration())); break; case "tooltipInteractions": - config.add(new Chart("chart", new DatasetIntersectFalseConfiguration())); - config.add(new Chart("chart", new DatasetIntersectTrueConfiguration())); - config.add(new Chart("chart", new IndexIntersectFalseConfiguration())); - config.add(new Chart("chart", new IndexIntersectTrueConfiguration())); - config.add(new Chart("chart", new NearestIntersectFalseConfiguration())); - config.add(new Chart("chart", new NearestIntersectTrueConfiguration())); - config.add(new Chart("chart", new PointIntersectFalseConfiguration())); - config.add(new Chart("chart", new PointIntersectTrueConfiguration())); - config.add(new Chart("chart", new xIntersectFalseConfiguration())); - config.add(new Chart("chart", new xIntersectTrueConfiguration())); - config.add(new Chart("chart", new yIntersectFalseConfiguration())); - config.add(new Chart("chart", new yIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new DatasetIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new DatasetIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new IndexIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new IndexIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new NearestIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new NearestIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new PointIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new PointIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new xIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new xIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new yIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new yIntersectTrueConfiguration())); break; default: - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); break; } return config; diff --git a/showcase/wicked-charts-showcase-wicket6/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java b/showcase/wicked-charts-showcase-wicket6/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java new file mode 100644 index 00000000..e070b551 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket6/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java @@ -0,0 +1,395 @@ +package de.adesso.wickedcharts.showcase; + +import de.adesso.wickedcharts.showcase.options.chartjs.ChartjsConfigurations; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.util.tester.WicketTester; +import org.junit.Test; + +public class HomepageChartsJsTest { + + @Test + public void renderBarVerticalTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_VERTICAL); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarHorizontalTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_HORIZONTAL); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarMutliAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarStackedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_STACKED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + @Test + public void renderBarStackedGroupTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_STACKED_GROUP); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineBasicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_BASIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineMultiAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineSteppedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STEPPED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineInterpolatedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_INTERPOLATED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineStylesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STYLES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPointStylesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POINT_STYLES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPointSizesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POINT_SIZES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderAreaLineBoundariesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.AREA_LINE_BOUNDARIES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineDatasetTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_DATASET); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineStackedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STACKED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderRadarTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.RADAR); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterMultiAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderDoughnutTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.DOUGHNUT); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPieTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.PIE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPolarAreaTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POLAR_AREA); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderRadar2Test(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.RADAR_2); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderComboBarLineTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.COMBO_BAR_LINE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderStepSizeTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.STEP_SIZE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderMinMaxTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.MIN_MAX); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineLogarithmicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_LOGARITHMIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterLogarithmicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER_LOGARITHMIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeLineTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_LINE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimePointTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_POINT); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeSeriesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_SERIES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeComboTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_COMBO); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderGridLinesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.GRID_LINES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderMultilineLabelsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.MULTILINE_LABELS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderFilteringLabelsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.FILTERING_LABELS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderNonNumericTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.NON_NUMERIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLegendPositionTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LEGEND_POSITION); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLegendPointStyleTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LEGEND_POINT_STYLE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipHTMLTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP_HTML); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipInteractionsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP_INTERACTIONS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBubbleTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BUBBLE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineProgressBarTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_PROGRESS_BAR); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderDataLabellingTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.DATA_LABELLING); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } +} diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index 61856369..d1578e6a 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -112,51 +112,51 @@ private void addNavigationLinks() { /** * Adds links to the charts in the navigation sidebar */ - private void addChartLinks() { - this.add(new UpdateChartJsLink("LineChartBasic", "lineBasic")); - this.add(new UpdateChartJsLink("BarChartVertical" , "barVertical")); - this.add(new UpdateChartJsLink("LineChartMultiAxis", "lineMultiAxis")); - this.add(new UpdateChartJsLink("LineChartStepped", "lineStepped")); - this.add(new UpdateChartJsLink("LineChartInterpolated", "lineInterpolated")); - this.add(new UpdateChartJsLink("LineStyles", "lineStyles")); - this.add(new UpdateChartJsLink("PointStyles", "pointStyles")); - this.add(new UpdateChartJsLink("PointSizes", "pointSizes")); - this.add(new UpdateChartJsLink("BarChartHorizontal", "barHorizontal")); - this.add(new UpdateChartJsLink("BarChartStacked", "barStacked")); - this.add(new UpdateChartJsLink("BarChartStackedGroup", "barStackedGroup")); - this.add(new UpdateChartJsLink("BarChartMultiAxis", "barMultiAxis")); - this.add(new UpdateChartJsLink("PieChart", "pie")); - this.add(new UpdateChartJsLink("AreaLineBoundariesChart", "areaLineBoundaries")); - this.add(new UpdateChartJsLink("LineChartStacked", "lineStacked")); - this.add(new UpdateChartJsLink("LineChartDataset", "lineDataset")); - this.add(new UpdateChartJsLink("RadarChart", "radar")); - this.add(new UpdateChartJsLink("DoughnutChart", "doughnut")); - this.add(new UpdateChartJsLink("PolarAreaChart", "polarArea")); - this.add(new UpdateChartJsLink("ScatterChart", "scatter")); - this.add(new UpdateChartJsLink("ScatterChartMultiAxis", "scatterMultiAxis")); - this.add(new UpdateChartJsLink("ComboBarLineChart", "comboBarLine")); - this.add(new UpdateChartJsLink("LegendPosition", "legendPosition")); - this.add(new UpdateChartJsLink("StepSize", "stepSize")); - this.add(new UpdateChartJsLink("MinMax", "minMax")); - this.add(new UpdateChartJsLink("GridLines", "gridLines")); - this.add(new UpdateChartJsLink("MultilineLabels", "multiLineLabels")); - this.add(new UpdateChartJsLink("LogarithmicLineChart", "lineLogarithmic")); - this.add(new UpdateChartJsLink("LogarithmicScatterChart", "scatterLogarithmic")); - this.add(new UpdateChartJsLink("BubbleChart", "bubble")); - this.add(new UpdateChartJsLink("FilteringLabels", "filteringLabels")); - this.add(new UpdateChartJsLink("TimeLine", "timeLine")); - this.add(new UpdateChartJsLink("NonNumeric", "nonNumeric")); - this.add(new UpdateChartJsLink("TimePoint", "timePoint")); - this.add(new UpdateChartJsLink("TimeSeries", "timeSeries")); - this.add(new UpdateChartJsLink("TimeCombo", "timeCombo")); - this.add(new UpdateChartJsLink("OtherRadar", "radar2")); - this.add(new UpdateChartJsLink("Tooltip", "tooltip")); - this.add(new UpdateChartJsLink("TooltipHtml", "tooltipHtml")); - this.add(new UpdateChartJsLink("LegendPointStyle", "legendPointStyle")); - this.add(new UpdateChartJsLink("LineChartProgressBar", "lineProgressBar")); - this.add(new UpdateChartJsLink("DataLabellingChart", "dataLabelling")); - this.add(new UpdateChartJsLink("TooltipInteractions", "tooltipInteractions")); - } + private void addChartLinks() { + this.add(new UpdateChartJsLink("LineChartBasic", ChartjsConfigurations.LINE_BASIC.toString())); + this.add(new UpdateChartJsLink("BarChartVertical" , ChartjsConfigurations.BAR_VERTICAL.toString())); + this.add(new UpdateChartJsLink("LineChartMultiAxis", ChartjsConfigurations.LINE_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("LineChartStepped", ChartjsConfigurations.LINE_STEPPED.toString())); + this.add(new UpdateChartJsLink("LineChartInterpolated", ChartjsConfigurations.LINE_INTERPOLATED.toString())); + this.add(new UpdateChartJsLink("LineStyles", ChartjsConfigurations.LINE_STYLES.toString())); + this.add(new UpdateChartJsLink("PointStyles", ChartjsConfigurations.POINT_STYLES.toString())); + this.add(new UpdateChartJsLink("PointSizes", ChartjsConfigurations.POINT_SIZES.toString())); + this.add(new UpdateChartJsLink("BarChartHorizontal", ChartjsConfigurations.BAR_HORIZONTAL.toString())); + this.add(new UpdateChartJsLink("BarChartStacked", ChartjsConfigurations.BAR_STACKED.toString())); + this.add(new UpdateChartJsLink("BarChartStackedGroup", ChartjsConfigurations.BAR_STACKED_GROUP.toString())); + this.add(new UpdateChartJsLink("BarChartMultiAxis", ChartjsConfigurations.BAR_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("PieChart", ChartjsConfigurations.PIE.toString())); + this.add(new UpdateChartJsLink("AreaLineBoundariesChart", ChartjsConfigurations.AREA_LINE_BOUNDARIES.toString())); + this.add(new UpdateChartJsLink("LineChartStacked", ChartjsConfigurations.LINE_STACKED.toString())); + this.add(new UpdateChartJsLink("LineChartDataset", ChartjsConfigurations.LINE_DATASET.toString())); + this.add(new UpdateChartJsLink("RadarChart", ChartjsConfigurations.RADAR.toString())); + this.add(new UpdateChartJsLink("DoughnutChart", ChartjsConfigurations.DOUGHNUT.toString())); + this.add(new UpdateChartJsLink("PolarAreaChart", ChartjsConfigurations.POLAR_AREA.toString())); + this.add(new UpdateChartJsLink("ScatterChart", ChartjsConfigurations.SCATTER.toString())); + this.add(new UpdateChartJsLink("ScatterChartMultiAxis", ChartjsConfigurations.SCATTER_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("ComboBarLineChart", ChartjsConfigurations.COMBO_BAR_LINE.toString())); + this.add(new UpdateChartJsLink("LegendPosition", ChartjsConfigurations.LEGEND_POSITION.toString())); + this.add(new UpdateChartJsLink("StepSize", ChartjsConfigurations.STEP_SIZE.toString())); + this.add(new UpdateChartJsLink("MinMax", ChartjsConfigurations.MIN_MAX.toString())); + this.add(new UpdateChartJsLink("GridLines", ChartjsConfigurations.GRID_LINES.toString())); + this.add(new UpdateChartJsLink("MultilineLabels", ChartjsConfigurations.MULTILINE_LABELS.toString())); + this.add(new UpdateChartJsLink("LogarithmicLineChart", ChartjsConfigurations.LINE_LOGARITHMIC.toString())); + this.add(new UpdateChartJsLink("LogarithmicScatterChart", ChartjsConfigurations.SCATTER_LOGARITHMIC.toString())); + this.add(new UpdateChartJsLink("BubbleChart", ChartjsConfigurations.BUBBLE.toString())); + this.add(new UpdateChartJsLink("FilteringLabels", ChartjsConfigurations.FILTERING_LABELS.toString())); + this.add(new UpdateChartJsLink("TimeLine", ChartjsConfigurations.TIME_LINE.toString())); + this.add(new UpdateChartJsLink("NonNumeric", ChartjsConfigurations.NON_NUMERIC.toString())); + this.add(new UpdateChartJsLink("TimePoint", ChartjsConfigurations.TIME_POINT.toString())); + this.add(new UpdateChartJsLink("TimeSeries", ChartjsConfigurations.TIME_SERIES.toString())); + this.add(new UpdateChartJsLink("TimeCombo", ChartjsConfigurations.TIME_COMBO.toString())); + this.add(new UpdateChartJsLink("OtherRadar", ChartjsConfigurations.RADAR_2.toString())); + this.add(new UpdateChartJsLink("Tooltip", ChartjsConfigurations.TOOLTIP.toString())); + this.add(new UpdateChartJsLink("TooltipHtml", ChartjsConfigurations.TOOLTIP_HTML.toString())); + this.add(new UpdateChartJsLink("LegendPointStyle", ChartjsConfigurations.LEGEND_POINT_STYLE.toString())); + this.add(new UpdateChartJsLink("LineChartProgressBar", ChartjsConfigurations.LINE_PROGRESS_BAR.toString())); + this.add(new UpdateChartJsLink("DataLabellingChart", ChartjsConfigurations.DATA_LABELLING.toString())); + this.add(new UpdateChartJsLink("TooltipInteractions", ChartjsConfigurations.TOOLTIP_INTERACTIONS.toString())); + } /** * Returns a List of Chart objects from the current page parameters. @@ -169,225 +169,226 @@ private List getChartFromParams(final PageParameters params) { //If the showcase is started without any parameters //set the parameters to lineBasic and give us a line Chart + final String chartComponentID = "chart"; if(params.getAllNamed().isEmpty()){ PageParameters temp = new PageParameters(); temp.add("chart", "lineBasic"); setResponsePage(HomepageChartJs.class, temp); - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); return config; } chartString = params.getAllNamed().get(0).getValue(); if(chartString == null) { - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); return config; } switch(chartString) { case "barVertical": - config.add(new Chart("chart", new BarChartVerticalConfiguration())); + config.add(new Chart(chartComponentID, new BarChartVerticalConfiguration())); break; case "barHorizontal": - config.add(new Chart("chart", new BarChartHorizontalConfiguration())); + config.add(new Chart(chartComponentID, new BarChartHorizontalConfiguration())); break; case "barMultiAxis": - config.add(new Chart("chart", new BarChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new BarChartMultiAxisConfiguration())); break; case "barStacked": - config.add(new Chart("chart", new BarChartStackedConfiguration())); + config.add(new Chart(chartComponentID, new BarChartStackedConfiguration())); break; case "barStackedGroup": - config.add(new Chart("chart", new BarChartStackedGroupConfiguration())); + config.add(new Chart(chartComponentID, new BarChartStackedGroupConfiguration())); break; case "lineBasic": - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); break; case "lineMultiAxis": - config.add(new Chart("chart", new LineChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new LineChartMultiAxisConfiguration())); break; case "lineStepped": - config.add(new Chart("chart", new LineChartSteppedBeforeConfiguration())); - config.add(new Chart("chart", new LineChartSteppedAfterConfiguration())); + config.add(new Chart(chartComponentID, new LineChartSteppedBeforeConfiguration())); + config.add(new Chart(chartComponentID, new LineChartSteppedAfterConfiguration())); break; case "lineInterpolated": - config.add(new Chart("chart", new LineChartInterpolatedConfiguration())); + config.add(new Chart(chartComponentID, new LineChartInterpolatedConfiguration())); break; case "lineStyles": - config.add(new Chart("chart", new LineStylesConfiguration())); + config.add(new Chart(chartComponentID, new LineStylesConfiguration())); break; case "pointStyles": - config.add(new Chart("chart", new PointStylesConfiguration())); + config.add(new Chart(chartComponentID, new PointStylesConfiguration())); break; case "pointSizes": - config.add(new Chart("chart", new LineChartWithDifferentPointSizesConfiguration())); + config.add(new Chart(chartComponentID, new LineChartWithDifferentPointSizesConfiguration())); break; case "areaLineBoundaries": - config.add(new Chart("chart", new AreaLineBoundariesChartStartConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartEndConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartOriginConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartFalseConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartStartConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartEndConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartOriginConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartFalseConfiguration())); break; case "lineDataset": - config.add(new Chart("chart", new LineChartAreaDatasetConfiguration())); + config.add(new Chart(chartComponentID, new LineChartAreaDatasetConfiguration())); break; case "lineStacked": - config.add(new Chart("chart", new LineChartStackedConfiguration())); + config.add(new Chart(chartComponentID, new LineChartStackedConfiguration())); break; case "radar": - config.add(new Chart("chart", new RadarChartConfiguration())); + config.add(new Chart(chartComponentID, new RadarChartConfiguration())); break; case "scatter": - config.add(new Chart("chart", new ScatterChartConfiguration())); + config.add(new Chart(chartComponentID, new ScatterChartConfiguration())); break; case "scatterMultiAxis": - config.add(new Chart("chart", new ScatterChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new ScatterChartMultiAxisConfiguration())); break; case "doughnut": - config.add(new Chart("chart", new DoughnutChartConfiguration())); + config.add(new Chart(chartComponentID, new DoughnutChartConfiguration())); break; case "pie": - config.add(new Chart("chart", new PieChartConfiguration())); + config.add(new Chart(chartComponentID, new PieChartConfiguration())); break; case "polarArea": - config.add(new Chart("chart", new PolarAreaChartConfiguration())); + config.add(new Chart(chartComponentID, new PolarAreaChartConfiguration())); break; case "radar2": - config.add(new Chart("chart", new OtherRadarChartConfiguration())); + config.add(new Chart(chartComponentID, new OtherRadarChartConfiguration())); break; case "comboBarLine": - config.add(new Chart("chart", new ComboBarLineChartConfiguration())); + config.add(new Chart(chartComponentID, new ComboBarLineChartConfiguration())); break; case "stepSize": - config.add(new Chart("chart", new LinearStepSizeConfiguration())); + config.add(new Chart(chartComponentID, new LinearStepSizeConfiguration())); break; case "minMax": - config.add(new Chart("chart", new MinMaxConfiguration())); - config.add(new Chart("chart", new MinMaxSuggestedConfiguration())); + config.add(new Chart(chartComponentID, new MinMaxConfiguration())); + config.add(new Chart(chartComponentID, new MinMaxSuggestedConfiguration())); break; case "lineLogarithmic": - config.add(new Chart("chart", new LogarithmicLineChartConfiguration())); + config.add(new Chart(chartComponentID, new LogarithmicLineChartConfiguration())); break; case "scatterLogarithmic": - config.add(new Chart("chart", new LogarithmicScatterChartConfiguration())); + config.add(new Chart(chartComponentID, new LogarithmicScatterChartConfiguration())); break; case "timeLine": - config.add(new Chart("chart", new TimeLineConfiguration())); + config.add(new Chart(chartComponentID, new TimeLineConfiguration())); break; case "timePoint": - config.add(new Chart("chart", new TimePointConfiguration())); + config.add(new Chart(chartComponentID, new TimePointConfiguration())); break; case "timeSeries": - config.add(new Chart("chart", new TimeSeriesConfiguration())); + config.add(new Chart(chartComponentID, new TimeSeriesConfiguration())); break; case "timeCombo": - config.add(new Chart("chart", new TimeComboConfigurationWicket7())); + config.add(new Chart(chartComponentID, new TimeComboConfigurationWicket7())); break; case "gridLines": - config.add(new Chart("chart", new GridLinesBasicConfiguration())); - config.add(new Chart("chart", new GridLinesDisplayFalseConfiguration())); - config.add(new Chart("chart", new GridLinesDisplayFalseNoBorderConfiguration())); - config.add(new Chart("chart", new GridLinesChartAreaConfiguration())); - config.add(new Chart("chart", new GridLinesTicksConfiguration())); - config.add(new Chart("chart", new GridLineStylesConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesBasicConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesDisplayFalseConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesDisplayFalseNoBorderConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesChartAreaConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesTicksConfiguration())); + config.add(new Chart(chartComponentID, new GridLineStylesConfiguration())); break; case "multiLineLabels": - config.add(new Chart("chart", new MultilineLabelsConfiguration())); + config.add(new Chart(chartComponentID, new MultilineLabelsConfiguration())); break; case "filteringLabels": - config.add(new Chart("chart", new FilteringLabelsConfiguration())); + config.add(new Chart(chartComponentID, new FilteringLabelsConfiguration())); break; case "nonNumeric": - config.add(new Chart("chart", new NonNumericConfiguration())); + config.add(new Chart(chartComponentID, new NonNumericConfiguration())); break; case "legendPosition": - config.add(new Chart("chart", new LegendPositionTopConfiguration())); - config.add(new Chart("chart", new LegendPositionRightConfiguration())); - config.add(new Chart("chart", new LegendPositionBottomConfiguration())); - config.add(new Chart("chart", new LegendPositionLeftConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionTopConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionRightConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionBottomConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionLeftConfiguration())); break; case "legendPointStyle": - config.add(new Chart("chart", new LegendPointStyleConfiguration())); + config.add(new Chart(chartComponentID, new LegendPointStyleConfiguration())); break; case "tooltip": - config.add(new Chart("chart", new TooltipBorderConfiguration())); - config.add(new Chart("chart", new TooltipCallbacksConfiguration())); - config.add(new Chart("chart", new TooltipAverageConfiguration())); - config.add(new Chart("chart", new TooltipNearestConfiguration())); + config.add(new Chart(chartComponentID, new TooltipBorderConfiguration())); + config.add(new Chart(chartComponentID, new TooltipCallbacksConfiguration())); + config.add(new Chart(chartComponentID, new TooltipAverageConfiguration())); + config.add(new Chart(chartComponentID, new TooltipNearestConfiguration())); break; case "tooltipHtml": - config.add(new Chart("chart", new TooltipHtmlLineConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPieConfigurationWicket7())); - config.add(new Chart("chart", new TooltipHtmlPointsConfigurationWicket7())); + config.add(new Chart(chartComponentID, new TooltipHtmlLineConfiguration())); + config.add(new Chart(chartComponentID, new TooltipHtmlPieConfigurationWicket7())); + config.add(new Chart(chartComponentID, new TooltipHtmlPointsConfigurationWicket7())); break; case "bubble": - config.add(new Chart("chart", new BubbleChartConfiguration())); - break; + config.add(new Chart(chartComponentID, new BubbleChartConfiguration())); + break; case "lineProgressBar": - config.add(new Chart("chart", new LineChartProgressBarConfigurationWicket7())); + config.add(new Chart(chartComponentID, new LineChartProgressBarConfigurationWicket7())); break; case "dataLabelling": - config.add(new Chart("chart", new DataLabellingChartConfiguration())); + config.add(new Chart(chartComponentID, new DataLabellingChartConfiguration())); break; case "tooltipInteractions": - config.add(new Chart("chart", new DatasetIntersectFalseConfiguration())); - config.add(new Chart("chart", new DatasetIntersectTrueConfiguration())); - config.add(new Chart("chart", new IndexIntersectFalseConfiguration())); - config.add(new Chart("chart", new IndexIntersectTrueConfiguration())); - config.add(new Chart("chart", new NearestIntersectFalseConfiguration())); - config.add(new Chart("chart", new NearestIntersectTrueConfiguration())); - config.add(new Chart("chart", new PointIntersectFalseConfiguration())); - config.add(new Chart("chart", new PointIntersectTrueConfiguration())); - config.add(new Chart("chart", new xIntersectFalseConfiguration())); - config.add(new Chart("chart", new xIntersectTrueConfiguration())); - config.add(new Chart("chart", new yIntersectFalseConfiguration())); - config.add(new Chart("chart", new yIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new DatasetIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new DatasetIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new IndexIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new IndexIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new NearestIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new NearestIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new PointIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new PointIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new xIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new xIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new yIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new yIntersectTrueConfiguration())); break; default: - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); break; } return config; diff --git a/showcase/wicked-charts-showcase-wicket7/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java b/showcase/wicked-charts-showcase-wicket7/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java new file mode 100644 index 00000000..e070b551 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket7/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java @@ -0,0 +1,395 @@ +package de.adesso.wickedcharts.showcase; + +import de.adesso.wickedcharts.showcase.options.chartjs.ChartjsConfigurations; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.util.tester.WicketTester; +import org.junit.Test; + +public class HomepageChartsJsTest { + + @Test + public void renderBarVerticalTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_VERTICAL); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarHorizontalTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_HORIZONTAL); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarMutliAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarStackedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_STACKED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + @Test + public void renderBarStackedGroupTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_STACKED_GROUP); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineBasicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_BASIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineMultiAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineSteppedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STEPPED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineInterpolatedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_INTERPOLATED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineStylesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STYLES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPointStylesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POINT_STYLES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPointSizesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POINT_SIZES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderAreaLineBoundariesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.AREA_LINE_BOUNDARIES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineDatasetTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_DATASET); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineStackedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STACKED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderRadarTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.RADAR); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterMultiAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderDoughnutTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.DOUGHNUT); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPieTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.PIE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPolarAreaTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POLAR_AREA); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderRadar2Test(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.RADAR_2); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderComboBarLineTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.COMBO_BAR_LINE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderStepSizeTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.STEP_SIZE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderMinMaxTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.MIN_MAX); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineLogarithmicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_LOGARITHMIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterLogarithmicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER_LOGARITHMIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeLineTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_LINE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimePointTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_POINT); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeSeriesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_SERIES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeComboTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_COMBO); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderGridLinesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.GRID_LINES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderMultilineLabelsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.MULTILINE_LABELS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderFilteringLabelsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.FILTERING_LABELS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderNonNumericTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.NON_NUMERIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLegendPositionTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LEGEND_POSITION); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLegendPointStyleTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LEGEND_POINT_STYLE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipHTMLTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP_HTML); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipInteractionsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP_INTERACTIONS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBubbleTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BUBBLE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineProgressBarTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_PROGRESS_BAR); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderDataLabellingTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.DATA_LABELLING); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } +} diff --git a/showcase/wicked-charts-showcase-wicket8/build.gradle b/showcase/wicked-charts-showcase-wicket8/build.gradle index fe5cbbdb..6e0711ed 100644 --- a/showcase/wicked-charts-showcase-wicket8/build.gradle +++ b/showcase/wicked-charts-showcase-wicket8/build.gradle @@ -17,6 +17,8 @@ buildscript { dependencies { compile group: 'org.apache.wicket', name: 'wicket-core', version: "${wicket_spring_version}" compile project(':wicked-charts-showcase-options') + + testCompile 'junit:junit:4.12' compile 'commons-io:commons-io:2.4' compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_spring_version}" @@ -28,8 +30,6 @@ dependencies { compile( [group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${spring_boot_version}"], ) - - } apply plugin: 'war' diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index e5fbb169..f59d5924 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -113,51 +113,51 @@ private void addNavigationLinks() { /** * Adds links to the charts in the navigation sidebar */ - private void addChartLinks() { - this.add(new UpdateChartJsLink("LineChartBasic", "lineBasic")); - this.add(new UpdateChartJsLink("BarChartVertical" , "barVertical")); - this.add(new UpdateChartJsLink("LineChartMultiAxis", "lineMultiAxis")); - this.add(new UpdateChartJsLink("LineChartStepped", "lineStepped")); - this.add(new UpdateChartJsLink("LineChartInterpolated", "lineInterpolated")); - this.add(new UpdateChartJsLink("LineStyles", "lineStyles")); - this.add(new UpdateChartJsLink("PointStyles", "pointStyles")); - this.add(new UpdateChartJsLink("PointSizes", "pointSizes")); - this.add(new UpdateChartJsLink("BarChartHorizontal", "barHorizontal")); - this.add(new UpdateChartJsLink("BarChartStacked", "barStacked")); - this.add(new UpdateChartJsLink("BarChartStackedGroup", "barStackedGroup")); - this.add(new UpdateChartJsLink("BarChartMultiAxis", "barMultiAxis")); - this.add(new UpdateChartJsLink("PieChart", "pie")); - this.add(new UpdateChartJsLink("AreaLineBoundariesChart", "areaLineBoundaries")); - this.add(new UpdateChartJsLink("LineChartStacked", "lineStacked")); - this.add(new UpdateChartJsLink("LineChartDataset", "lineDataset")); - this.add(new UpdateChartJsLink("RadarChart", "radar")); - this.add(new UpdateChartJsLink("DoughnutChart", "doughnut")); - this.add(new UpdateChartJsLink("PolarAreaChart", "polarArea")); - this.add(new UpdateChartJsLink("ScatterChart", "scatter")); - this.add(new UpdateChartJsLink("ScatterChartMultiAxis", "scatterMultiAxis")); - this.add(new UpdateChartJsLink("ComboBarLineChart", "comboBarLine")); - this.add(new UpdateChartJsLink("LegendPosition", "legendPosition")); - this.add(new UpdateChartJsLink("StepSize", "stepSize")); - this.add(new UpdateChartJsLink("MinMax", "minMax")); - this.add(new UpdateChartJsLink("GridLines", "gridLines")); - this.add(new UpdateChartJsLink("MultilineLabels", "multiLineLabels")); - this.add(new UpdateChartJsLink("LogarithmicLineChart", "lineLogarithmic")); - this.add(new UpdateChartJsLink("LogarithmicScatterChart", "scatterLogarithmic")); - this.add(new UpdateChartJsLink("BubbleChart", "bubble")); - this.add(new UpdateChartJsLink("FilteringLabels", "filteringLabels")); - this.add(new UpdateChartJsLink("TimeLine", "timeLine")); - this.add(new UpdateChartJsLink("NonNumeric", "nonNumeric")); - this.add(new UpdateChartJsLink("TimePoint", "timePoint")); - this.add(new UpdateChartJsLink("TimeSeries", "timeSeries")); - this.add(new UpdateChartJsLink("TimeCombo", "timeCombo")); - this.add(new UpdateChartJsLink("OtherRadar", "radar2")); - this.add(new UpdateChartJsLink("Tooltip", "tooltip")); - this.add(new UpdateChartJsLink("TooltipHtml", "tooltipHtml")); - this.add(new UpdateChartJsLink("LegendPointStyle", "legendPointStyle")); - this.add(new UpdateChartJsLink("LineChartProgressBar", "lineProgressBar")); - this.add(new UpdateChartJsLink("DataLabellingChart", "dataLabelling")); - this.add(new UpdateChartJsLink("TooltipInteractions", "tooltipInteractions")); - } + private void addChartLinks() { + this.add(new UpdateChartJsLink("LineChartBasic", ChartjsConfigurations.LINE_BASIC.toString())); + this.add(new UpdateChartJsLink("BarChartVertical" , ChartjsConfigurations.BAR_VERTICAL.toString())); + this.add(new UpdateChartJsLink("LineChartMultiAxis", ChartjsConfigurations.LINE_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("LineChartStepped", ChartjsConfigurations.LINE_STEPPED.toString())); + this.add(new UpdateChartJsLink("LineChartInterpolated", ChartjsConfigurations.LINE_INTERPOLATED.toString())); + this.add(new UpdateChartJsLink("LineStyles", ChartjsConfigurations.LINE_STYLES.toString())); + this.add(new UpdateChartJsLink("PointStyles", ChartjsConfigurations.POINT_STYLES.toString())); + this.add(new UpdateChartJsLink("PointSizes", ChartjsConfigurations.POINT_SIZES.toString())); + this.add(new UpdateChartJsLink("BarChartHorizontal", ChartjsConfigurations.BAR_HORIZONTAL.toString())); + this.add(new UpdateChartJsLink("BarChartStacked", ChartjsConfigurations.BAR_STACKED.toString())); + this.add(new UpdateChartJsLink("BarChartStackedGroup", ChartjsConfigurations.BAR_STACKED_GROUP.toString())); + this.add(new UpdateChartJsLink("BarChartMultiAxis", ChartjsConfigurations.BAR_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("PieChart", ChartjsConfigurations.PIE.toString())); + this.add(new UpdateChartJsLink("AreaLineBoundariesChart", ChartjsConfigurations.AREA_LINE_BOUNDARIES.toString())); + this.add(new UpdateChartJsLink("LineChartStacked", ChartjsConfigurations.LINE_STACKED.toString())); + this.add(new UpdateChartJsLink("LineChartDataset", ChartjsConfigurations.LINE_DATASET.toString())); + this.add(new UpdateChartJsLink("RadarChart", ChartjsConfigurations.RADAR.toString())); + this.add(new UpdateChartJsLink("DoughnutChart", ChartjsConfigurations.DOUGHNUT.toString())); + this.add(new UpdateChartJsLink("PolarAreaChart", ChartjsConfigurations.POLAR_AREA.toString())); + this.add(new UpdateChartJsLink("ScatterChart", ChartjsConfigurations.SCATTER.toString())); + this.add(new UpdateChartJsLink("ScatterChartMultiAxis", ChartjsConfigurations.SCATTER_MULTI_AXIS.toString())); + this.add(new UpdateChartJsLink("ComboBarLineChart", ChartjsConfigurations.COMBO_BAR_LINE.toString())); + this.add(new UpdateChartJsLink("LegendPosition", ChartjsConfigurations.LEGEND_POSITION.toString())); + this.add(new UpdateChartJsLink("StepSize", ChartjsConfigurations.STEP_SIZE.toString())); + this.add(new UpdateChartJsLink("MinMax", ChartjsConfigurations.MIN_MAX.toString())); + this.add(new UpdateChartJsLink("GridLines", ChartjsConfigurations.GRID_LINES.toString())); + this.add(new UpdateChartJsLink("MultilineLabels", ChartjsConfigurations.MULTILINE_LABELS.toString())); + this.add(new UpdateChartJsLink("LogarithmicLineChart", ChartjsConfigurations.LINE_LOGARITHMIC.toString())); + this.add(new UpdateChartJsLink("LogarithmicScatterChart", ChartjsConfigurations.SCATTER_LOGARITHMIC.toString())); + this.add(new UpdateChartJsLink("BubbleChart", ChartjsConfigurations.BUBBLE.toString())); + this.add(new UpdateChartJsLink("FilteringLabels", ChartjsConfigurations.FILTERING_LABELS.toString())); + this.add(new UpdateChartJsLink("TimeLine", ChartjsConfigurations.TIME_LINE.toString())); + this.add(new UpdateChartJsLink("NonNumeric", ChartjsConfigurations.NON_NUMERIC.toString())); + this.add(new UpdateChartJsLink("TimePoint", ChartjsConfigurations.TIME_POINT.toString())); + this.add(new UpdateChartJsLink("TimeSeries", ChartjsConfigurations.TIME_SERIES.toString())); + this.add(new UpdateChartJsLink("TimeCombo", ChartjsConfigurations.TIME_COMBO.toString())); + this.add(new UpdateChartJsLink("OtherRadar", ChartjsConfigurations.RADAR_2.toString())); + this.add(new UpdateChartJsLink("Tooltip", ChartjsConfigurations.TOOLTIP.toString())); + this.add(new UpdateChartJsLink("TooltipHtml", ChartjsConfigurations.TOOLTIP_HTML.toString())); + this.add(new UpdateChartJsLink("LegendPointStyle", ChartjsConfigurations.LEGEND_POINT_STYLE.toString())); + this.add(new UpdateChartJsLink("LineChartProgressBar", ChartjsConfigurations.LINE_PROGRESS_BAR.toString())); + this.add(new UpdateChartJsLink("DataLabellingChart", ChartjsConfigurations.DATA_LABELLING.toString())); + this.add(new UpdateChartJsLink("TooltipInteractions", ChartjsConfigurations.TOOLTIP_INTERACTIONS.toString())); + } /** * Returns a List of Chart objects from the current page parameters. @@ -170,225 +170,226 @@ private List getChartFromParams(final PageParameters params) { //If the showcase is started without any parameters //set the parameters to lineBasic and give us a line Chart + final String chartComponentID = "chart"; if(params.getAllNamed().isEmpty()){ PageParameters temp = new PageParameters(); temp.add("chart", "lineBasic"); setResponsePage(HomepageChartJs.class, temp); - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); return config; } chartString = params.getAllNamed().get(0).getValue(); if(chartString == null) { - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); return config; } switch(chartString) { case "barVertical": - config.add(new Chart("chart", new BarChartVerticalConfiguration())); + config.add(new Chart(chartComponentID, new BarChartVerticalConfiguration())); break; case "barHorizontal": - config.add(new Chart("chart", new BarChartHorizontalConfiguration())); + config.add(new Chart(chartComponentID, new BarChartHorizontalConfiguration())); break; case "barMultiAxis": - config.add(new Chart("chart", new BarChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new BarChartMultiAxisConfiguration())); break; case "barStacked": - config.add(new Chart("chart", new BarChartStackedConfiguration())); + config.add(new Chart(chartComponentID, new BarChartStackedConfiguration())); break; case "barStackedGroup": - config.add(new Chart("chart", new BarChartStackedGroupConfiguration())); + config.add(new Chart(chartComponentID, new BarChartStackedGroupConfiguration())); break; case "lineBasic": - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); break; case "lineMultiAxis": - config.add(new Chart("chart", new LineChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new LineChartMultiAxisConfiguration())); break; case "lineStepped": - config.add(new Chart("chart", new LineChartSteppedBeforeConfiguration())); - config.add(new Chart("chart", new LineChartSteppedAfterConfiguration())); + config.add(new Chart(chartComponentID, new LineChartSteppedBeforeConfiguration())); + config.add(new Chart(chartComponentID, new LineChartSteppedAfterConfiguration())); break; case "lineInterpolated": - config.add(new Chart("chart", new LineChartInterpolatedConfiguration())); + config.add(new Chart(chartComponentID, new LineChartInterpolatedConfiguration())); break; case "lineStyles": - config.add(new Chart("chart", new LineStylesConfiguration())); + config.add(new Chart(chartComponentID, new LineStylesConfiguration())); break; case "pointStyles": - config.add(new Chart("chart", new PointStylesConfiguration())); + config.add(new Chart(chartComponentID, new PointStylesConfiguration())); break; case "pointSizes": - config.add(new Chart("chart", new LineChartWithDifferentPointSizesConfiguration())); + config.add(new Chart(chartComponentID, new LineChartWithDifferentPointSizesConfiguration())); break; case "areaLineBoundaries": - config.add(new Chart("chart", new AreaLineBoundariesChartStartConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartEndConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartOriginConfiguration())); - config.add(new Chart("chart", new AreaLineBoundariesChartFalseConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartStartConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartEndConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartOriginConfiguration())); + config.add(new Chart(chartComponentID, new AreaLineBoundariesChartFalseConfiguration())); break; case "lineDataset": - config.add(new Chart("chart", new LineChartAreaDatasetConfiguration())); + config.add(new Chart(chartComponentID, new LineChartAreaDatasetConfiguration())); break; case "lineStacked": - config.add(new Chart("chart", new LineChartStackedConfiguration())); + config.add(new Chart(chartComponentID, new LineChartStackedConfiguration())); break; case "radar": - config.add(new Chart("chart", new RadarChartConfiguration())); + config.add(new Chart(chartComponentID, new RadarChartConfiguration())); break; case "scatter": - config.add(new Chart("chart", new ScatterChartConfiguration())); + config.add(new Chart(chartComponentID, new ScatterChartConfiguration())); break; case "scatterMultiAxis": - config.add(new Chart("chart", new ScatterChartMultiAxisConfiguration())); + config.add(new Chart(chartComponentID, new ScatterChartMultiAxisConfiguration())); break; case "doughnut": - config.add(new Chart("chart", new DoughnutChartConfiguration())); + config.add(new Chart(chartComponentID, new DoughnutChartConfiguration())); break; case "pie": - config.add(new Chart("chart", new PieChartConfiguration())); + config.add(new Chart(chartComponentID, new PieChartConfiguration())); break; case "polarArea": - config.add(new Chart("chart", new PolarAreaChartConfiguration())); + config.add(new Chart(chartComponentID, new PolarAreaChartConfiguration())); break; case "radar2": - config.add(new Chart("chart", new OtherRadarChartConfiguration())); + config.add(new Chart(chartComponentID, new OtherRadarChartConfiguration())); break; case "comboBarLine": - config.add(new Chart("chart", new ComboBarLineChartConfiguration())); + config.add(new Chart(chartComponentID, new ComboBarLineChartConfiguration())); break; case "stepSize": - config.add(new Chart("chart", new LinearStepSizeConfiguration())); + config.add(new Chart(chartComponentID, new LinearStepSizeConfiguration())); break; case "minMax": - config.add(new Chart("chart", new MinMaxConfiguration())); - config.add(new Chart("chart", new MinMaxSuggestedConfiguration())); + config.add(new Chart(chartComponentID, new MinMaxConfiguration())); + config.add(new Chart(chartComponentID, new MinMaxSuggestedConfiguration())); break; case "lineLogarithmic": - config.add(new Chart("chart", new LogarithmicLineChartConfiguration())); + config.add(new Chart(chartComponentID, new LogarithmicLineChartConfiguration())); break; case "scatterLogarithmic": - config.add(new Chart("chart", new LogarithmicScatterChartConfiguration())); + config.add(new Chart(chartComponentID, new LogarithmicScatterChartConfiguration())); break; case "timeLine": - config.add(new Chart("chart", new TimeLineConfiguration())); + config.add(new Chart(chartComponentID, new TimeLineConfiguration())); break; case "timePoint": - config.add(new Chart("chart", new TimePointConfiguration())); + config.add(new Chart(chartComponentID, new TimePointConfiguration())); break; case "timeSeries": - config.add(new Chart("chart", new TimeSeriesConfiguration())); + config.add(new Chart(chartComponentID, new TimeSeriesConfiguration())); break; case "timeCombo": - config.add(new Chart("chart", new TimeComboConfigurationWicket8())); + config.add(new Chart(chartComponentID, new TimeComboConfigurationWicket8())); break; case "gridLines": - config.add(new Chart("chart", new GridLinesBasicConfiguration())); - config.add(new Chart("chart", new GridLinesDisplayFalseConfiguration())); - config.add(new Chart("chart", new GridLinesDisplayFalseNoBorderConfiguration())); - config.add(new Chart("chart", new GridLinesChartAreaConfiguration())); - config.add(new Chart("chart", new GridLinesTicksConfiguration())); - config.add(new Chart("chart", new GridLineStylesConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesBasicConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesDisplayFalseConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesDisplayFalseNoBorderConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesChartAreaConfiguration())); + config.add(new Chart(chartComponentID, new GridLinesTicksConfiguration())); + config.add(new Chart(chartComponentID, new GridLineStylesConfiguration())); break; case "multiLineLabels": - config.add(new Chart("chart", new MultilineLabelsConfiguration())); + config.add(new Chart(chartComponentID, new MultilineLabelsConfiguration())); break; case "filteringLabels": - config.add(new Chart("chart", new FilteringLabelsConfiguration())); + config.add(new Chart(chartComponentID, new FilteringLabelsConfiguration())); break; case "nonNumeric": - config.add(new Chart("chart", new NonNumericConfiguration())); + config.add(new Chart(chartComponentID, new NonNumericConfiguration())); break; case "legendPosition": - config.add(new Chart("chart", new LegendPositionTopConfiguration())); - config.add(new Chart("chart", new LegendPositionRightConfiguration())); - config.add(new Chart("chart", new LegendPositionBottomConfiguration())); - config.add(new Chart("chart", new LegendPositionLeftConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionTopConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionRightConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionBottomConfiguration())); + config.add(new Chart(chartComponentID, new LegendPositionLeftConfiguration())); break; case "legendPointStyle": - config.add(new Chart("chart", new LegendPointStyleConfiguration())); + config.add(new Chart(chartComponentID, new LegendPointStyleConfiguration())); break; case "tooltip": - config.add(new Chart("chart", new TooltipBorderConfiguration())); - config.add(new Chart("chart", new TooltipCallbacksConfiguration())); - config.add(new Chart("chart", new TooltipAverageConfiguration())); - config.add(new Chart("chart", new TooltipNearestConfiguration())); + config.add(new Chart(chartComponentID, new TooltipBorderConfiguration())); + config.add(new Chart(chartComponentID, new TooltipCallbacksConfiguration())); + config.add(new Chart(chartComponentID, new TooltipAverageConfiguration())); + config.add(new Chart(chartComponentID, new TooltipNearestConfiguration())); break; case "tooltipHtml": - config.add(new Chart("chart", new TooltipHtmlLineConfiguration())); - config.add(new Chart("chart", new TooltipHtmlPieConfigurationWicket8())); - config.add(new Chart("chart", new TooltipHtmlPointsConfigurationWicket8())); + config.add(new Chart(chartComponentID, new TooltipHtmlLineConfiguration())); + config.add(new Chart(chartComponentID, new TooltipHtmlPieConfigurationWicket8())); + config.add(new Chart(chartComponentID, new TooltipHtmlPointsConfigurationWicket8())); break; case "bubble": - config.add(new Chart("chart", new BubbleChartConfiguration())); + config.add(new Chart(chartComponentID, new BubbleChartConfiguration())); break; case "lineProgressBar": - config.add(new Chart("chart", new LineChartProgressBarConfigurationWicket8())); + config.add(new Chart(chartComponentID, new LineChartProgressBarConfigurationWicket8())); break; case "dataLabelling": - config.add(new Chart("chart", new DataLabellingChartConfiguration())); + config.add(new Chart(chartComponentID, new DataLabellingChartConfiguration())); break; case "tooltipInteractions": - config.add(new Chart("chart", new DatasetIntersectFalseConfiguration())); - config.add(new Chart("chart", new DatasetIntersectTrueConfiguration())); - config.add(new Chart("chart", new IndexIntersectFalseConfiguration())); - config.add(new Chart("chart", new IndexIntersectTrueConfiguration())); - config.add(new Chart("chart", new NearestIntersectFalseConfiguration())); - config.add(new Chart("chart", new NearestIntersectTrueConfiguration())); - config.add(new Chart("chart", new PointIntersectFalseConfiguration())); - config.add(new Chart("chart", new PointIntersectTrueConfiguration())); - config.add(new Chart("chart", new xIntersectFalseConfiguration())); - config.add(new Chart("chart", new xIntersectTrueConfiguration())); - config.add(new Chart("chart", new yIntersectFalseConfiguration())); - config.add(new Chart("chart", new yIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new DatasetIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new DatasetIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new IndexIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new IndexIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new NearestIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new NearestIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new PointIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new PointIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new xIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new xIntersectTrueConfiguration())); + config.add(new Chart(chartComponentID, new yIntersectFalseConfiguration())); + config.add(new Chart(chartComponentID, new yIntersectTrueConfiguration())); break; default: - config.add(new Chart("chart", new LineChartBasicConfiguration())); + config.add(new Chart(chartComponentID, new LineChartBasicConfiguration())); break; } return config; diff --git a/showcase/wicked-charts-showcase-wicket8/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java b/showcase/wicked-charts-showcase-wicket8/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java new file mode 100644 index 00000000..e070b551 --- /dev/null +++ b/showcase/wicked-charts-showcase-wicket8/src/test/java/de/adesso/wickedcharts/showcase/HomepageChartsJsTest.java @@ -0,0 +1,395 @@ +package de.adesso.wickedcharts.showcase; + +import de.adesso.wickedcharts.showcase.options.chartjs.ChartjsConfigurations; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.util.tester.WicketTester; +import org.junit.Test; + +public class HomepageChartsJsTest { + + @Test + public void renderBarVerticalTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_VERTICAL); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarHorizontalTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_HORIZONTAL); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarMutliAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBarStackedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_STACKED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + @Test + public void renderBarStackedGroupTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BAR_STACKED_GROUP); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineBasicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_BASIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineMultiAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineSteppedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STEPPED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineInterpolatedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_INTERPOLATED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineStylesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STYLES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPointStylesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POINT_STYLES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPointSizesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POINT_SIZES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderAreaLineBoundariesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.AREA_LINE_BOUNDARIES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineDatasetTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_DATASET); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineStackedTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_STACKED); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderRadarTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.RADAR); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterMultiAxisTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER_MULTI_AXIS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderDoughnutTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.DOUGHNUT); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPieTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.PIE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderPolarAreaTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.POLAR_AREA); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderRadar2Test(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.RADAR_2); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderComboBarLineTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.COMBO_BAR_LINE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderStepSizeTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.STEP_SIZE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderMinMaxTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.MIN_MAX); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineLogarithmicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_LOGARITHMIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderScatterLogarithmicTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.SCATTER_LOGARITHMIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeLineTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_LINE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimePointTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_POINT); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeSeriesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_SERIES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTimeComboTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TIME_COMBO); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderGridLinesTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.GRID_LINES); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderMultilineLabelsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.MULTILINE_LABELS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderFilteringLabelsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.FILTERING_LABELS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderNonNumericTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.NON_NUMERIC); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLegendPositionTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LEGEND_POSITION); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLegendPointStyleTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LEGEND_POINT_STYLE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipHTMLTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP_HTML); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderTooltipInteractionsTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.TOOLTIP_INTERACTIONS); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderBubbleTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.BUBBLE); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderLineProgressBarTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.LINE_PROGRESS_BAR); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } + + @Test + public void renderDataLabellingTest(){ + WicketTester tester = new WicketTester(); + PageParameters pageParameters = new PageParameters(); + pageParameters.add("chart", ChartjsConfigurations.DATA_LABELLING); + tester.startPage(HomepageChartJs.class, pageParameters); + tester.assertRenderedPage(HomepageChartJs.class); + } +} diff --git a/showcase/wicked-charts-showcase-wicket8/src/test/resources/keystore b/showcase/wicked-charts-showcase-wicket8/src/test/resources/keystore deleted file mode 100644 index 30bbc90ccffcc2745adf09077df16fc3db9c0b47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1481 zcmezO_TO6u1_mY|W&~r_tkjZ{N+8cDIXV0qP-d4w6Vo;WJ~l3GHbxdkEha%mMpg!v zCZXF+L+yeb(_D>eh5NdK;{zR}$;>(o{ zE3dg|o8B)~5ILLXvtIl5>N#JOOd1Wnqs3o|CH&_3)%k6yk>9%q<*Th*+pP{h`8MfJ zi*YvUmF+Z?t0^x!WMEPBj(9H=gC$Rl(ii9d&)j3 zbTLZUo^$C9pTUfx#bzsWYP%dfFaJ7`%~pJY<=Y|t;J>bqocFORJ8`)y%bsft`MuQV z>{(ffqGR9Jv){6}VE@M8vig|blV9STFXpbA!u05_iEyhlhqkKZ;q9M!rpxs*tJ<*3 zhiWIa`fr}ezEJ&I{ND#6cX8iNm8;zH2RodQ=n#@cCCOr| zTXCYzlEX`7T5ANh+?d0qlI6dJ@sW+nZle@FF~#KRKmX0;w|%=dD0Q*hi_hY5Y{CW4 zrOJiNd#@bdbya1dHCyZRTmE&^ii4i-IJn9!!^(ZV)t=3cyTYEANN&*o!@WvnMVp(G z{s(U^qqZe`enoqQPhO)mduP*#-L_kTKzrv7mI-@Dg3P;OV0 z+>^?;+IITpTAR2zDn5LAd`IV(R$N{5^Homy`Hv1=mC|&FBxtu~Lg@4UcN&B|cVxXe%hnAVv?S=fZxL-Vrp^2_sJA{-bZ z>z> zKgGsI?`g4Czs|(W$iRr~JYW)G2D&RF+G&cYMyt~S#qC>9Yo8yjfwPfwA z__FOSvwctPaoU&=rO7Hf`?L)EoW48GpSg3HG`N>Wh@H&bQ>GZp6P=NEzJCF4QTtMF zyCu^XE;=4q;eAoe&u6Fp<&$m~Ic0x)r`Sfd8H?)QbE`9U3bGFi_@iY1?tkt>-^;Q{1ps`KMkD|L From 544bff45b6b5d31f510b91b2ff09ff52696c9dc8 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Wed, 24 Oct 2018 10:02:12 +0200 Subject: [PATCH 27/38] set wicket to deployment mode when running in appengine --- .../src/main/webapp/WEB-INF/web.xml | 5 +++++ .../src/main/webapp/WEB-INF/web.xml | 5 +++++ .../src/main/webapp/WEB-INF/web.xml | 5 +++++ .../src/main/webapp/WEB-INF/web.xml | 5 +++++ .../src/main/webapp/WEB-INF/web.xml | 4 ++++ 5 files changed, 24 insertions(+) diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/WEB-INF/web.xml b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/WEB-INF/web.xml index 229126e4..7a7148b3 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/WEB-INF/web.xml +++ b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/WEB-INF/web.xml @@ -16,6 +16,11 @@ The value might be either "development" (reloading when templates change) or "deployment". If no configuration is found, "development" is the default. --> + + configuration + deployment + + wicked-charts-showcase org.apache.wicket.protocol.http.WicketFilter diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/WEB-INF/web.xml b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/WEB-INF/web.xml index 229126e4..7a7148b3 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/WEB-INF/web.xml +++ b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/WEB-INF/web.xml @@ -16,6 +16,11 @@ The value might be either "development" (reloading when templates change) or "deployment". If no configuration is found, "development" is the default. --> + + configuration + deployment + + wicked-charts-showcase org.apache.wicket.protocol.http.WicketFilter diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/WEB-INF/web.xml b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/WEB-INF/web.xml index 229126e4..7a7148b3 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/WEB-INF/web.xml +++ b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/WEB-INF/web.xml @@ -16,6 +16,11 @@ The value might be either "development" (reloading when templates change) or "deployment". If no configuration is found, "development" is the default. --> + + configuration + deployment + + wicked-charts-showcase org.apache.wicket.protocol.http.WicketFilter diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/WEB-INF/web.xml b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/WEB-INF/web.xml index 229126e4..7a7148b3 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/WEB-INF/web.xml +++ b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/WEB-INF/web.xml @@ -16,6 +16,11 @@ The value might be either "development" (reloading when templates change) or "deployment". If no configuration is found, "development" is the default. --> + + configuration + deployment + + wicked-charts-showcase org.apache.wicket.protocol.http.WicketFilter diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/WEB-INF/web.xml b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/WEB-INF/web.xml index 229126e4..facf14e6 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/WEB-INF/web.xml +++ b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/WEB-INF/web.xml @@ -15,6 +15,10 @@ The value might be either "development" (reloading when templates change) or "deployment". If no configuration is found, "development" is the default. --> + + configuration + deployment + wicked-charts-showcase From 422077ef6f0f5ce1d3acc7d7e869c17ffb7cb1dd Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Tue, 27 Nov 2018 19:54:49 +0100 Subject: [PATCH 28/38] added contextButton to exporting options --- .../highcharts/jackson/JsonRenderer.java | 2 + .../highcharts/options/ButtonOptions.java | 13 +++++++ .../highcharts/options/ExportingButtons.java | 11 ++++++ .../highcharts/options/MenuItems.java | 37 +++++++++++++++++++ showcase/gradle.properties | 6 +-- 5 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/MenuItems.java diff --git a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/jackson/JsonRenderer.java b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/jackson/JsonRenderer.java index c04fa54d..ababbc5a 100644 --- a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/jackson/JsonRenderer.java +++ b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/jackson/JsonRenderer.java @@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import de.adesso.wickedcharts.highcharts.json.JsonValueEnum; import de.adesso.wickedcharts.highcharts.json.LowercaseEnum; import de.adesso.wickedcharts.highcharts.options.*; import de.adesso.wickedcharts.highcharts.options.color.*; @@ -73,6 +74,7 @@ private ObjectMapper createJacksonMapper() { this.jacksonModule.addSerializer(HighchartsColor.class, new HighchartsColorReferenceSerializer()); this.jacksonModule.addSerializer(HexColor.class, new HexColorReferenceSerializer()); this.jacksonModule.addSerializer(LowercaseEnum.class, new LowercaseEnumSerializer()); + this.jacksonModule.addSerializer(JsonValueEnum.class, new JsonValueEnumSerializer()); this.jacksonModule.addSerializer(PixelOrPercent.class, new PixelOrPercentSerializer()); this.jacksonModule.addSerializer(Symbol.class, new SymbolSerializer()); this.jacksonModule.addSerializer(RgbaColor.class, new RgbaColorReferenceSerializer()); diff --git a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ButtonOptions.java b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ButtonOptions.java index 12575552..1d16c64b 100644 --- a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ButtonOptions.java +++ b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ButtonOptions.java @@ -20,6 +20,8 @@ import java.awt.*; import java.io.Serializable; +import java.util.Arrays; +import java.util.List; /** * Defined options for the buttons of a chart. @@ -61,6 +63,8 @@ public class ButtonOptions implements Serializable { private Integer symbolStrokeWidth; + private List menuItems; + private Float symbolX; private Float symbolY; @@ -171,6 +175,15 @@ public Theme getTheme() { return this.theme; } + public ButtonOptions setMenuItems(List menuItems){ + this.menuItems = menuItems; + return this; + } + + public List getMenuItems(){ + return this.menuItems; + } + public ButtonOptions setAlign(final HorizontalAlignment align) { this.align = align; return this; diff --git a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ExportingButtons.java b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ExportingButtons.java index 82494604..00f6f8eb 100644 --- a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ExportingButtons.java +++ b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ExportingButtons.java @@ -32,6 +32,8 @@ public class ExportingButtons implements Serializable { private ButtonOptions printButton; + private ButtonOptions contextButton; + public ButtonOptions getExportButton() { return this.exportButton; } @@ -40,6 +42,10 @@ public ButtonOptions getPrintButton() { return this.printButton; } + public ButtonOptions getContextButton() { + return this.contextButton; + } + public ExportingButtons setExportButton(final ButtonOptions exportButton) { this.exportButton = exportButton; return this; @@ -50,4 +56,9 @@ public ExportingButtons setPrintButton(final ButtonOptions printButton) { return this; } + public ExportingButtons setContextButton(final ButtonOptions contextButton) { + this.contextButton = contextButton; + return this; + } + } diff --git a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/MenuItems.java b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/MenuItems.java new file mode 100644 index 00000000..8dc68e4d --- /dev/null +++ b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/MenuItems.java @@ -0,0 +1,37 @@ +package de.adesso.wickedcharts.highcharts.options; + +import de.adesso.wickedcharts.highcharts.json.JsonValueEnum; + +import java.io.Serializable; + +public enum MenuItems implements JsonValueEnum, Serializable { + + PRINT_CHART("printChart"), + + SEPARATOR("separator"), + + DOWNLOAD_PNG("downloadPNG"), + + DOWNLOAD_JPEG("downloadJPEG"), + + DOWNLOAD_PDF("downloadPDF"), + + DOWNLOAD_SVG("downloadSVG"); + + String value; + + MenuItems(String jsonValue) { + value = jsonValue; + } + + + @Override + public String toString() { + return value; + } + + @Override + public String getJsonValue() { + return value; + } +} diff --git a/showcase/gradle.properties b/showcase/gradle.properties index 94640ebd..df40fa7f 100644 --- a/showcase/gradle.properties +++ b/showcase/gradle.properties @@ -1,4 +1,4 @@ -spring_boot_version = 2.0.3.RELEASE -spring_version = 5.0.7.RELEASE -wickedcharts_version = 3.2.0-SNAPSHOT +spring_boot_version=2.0.3.RELEASE +spring_version=5.0.7.RELEASE +wickedcharts_version=3.2.0-SNAPSHOT junit5_version=5.2.0 From 068daed215d7698cfa47ddd57c127bc7264b6557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Valente?= Date: Thu, 29 Nov 2018 03:01:12 -0200 Subject: [PATCH 29/38] Added minSize and maxSize to plot options --- .../highcharts/options/PlotOptions.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/PlotOptions.java b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/PlotOptions.java index 66fd04fb..03b552ed 100644 --- a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/PlotOptions.java +++ b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/PlotOptions.java @@ -140,6 +140,10 @@ public class PlotOptions implements Serializable { private Integer stemWidth; + private PixelOrPercent minSize; + + private PixelOrPercent maxSize; + public PixelOrPercent getNeckWidth() { return neckWidth; } @@ -646,4 +650,22 @@ public PlotOptions setWhiskerLength(Integer whiskerLength) { return this; } + public PixelOrPercent getMinSize() { + return minSize; + } + + public PlotOptions setMinSize(PixelOrPercent minSize) { + this.minSize = minSize; + return this; + } + + public PixelOrPercent getMaxSize() { + return maxSize; + } + + public PlotOptions setMaxSize(PixelOrPercent maxSize) { + this.maxSize = maxSize; + return this; + } + } From dafa170733eb67bf07845605fb40173a8bcad7ae Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Thu, 29 Nov 2018 09:47:01 +0100 Subject: [PATCH 30/38] adjusted setter for bubble in PlotOptionsChoice --- .../wickedcharts/highcharts/options/PlotOptionsChoice.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/PlotOptionsChoice.java b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/PlotOptionsChoice.java index 252b39fb..03b1bdfc 100644 --- a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/PlotOptionsChoice.java +++ b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/PlotOptionsChoice.java @@ -218,8 +218,9 @@ public PlotOptions getBubble() { return bubble; } - public void setBubble(PlotOptions bubble) { + public PlotOptionsChoice setBubble(PlotOptions bubble) { this.bubble = bubble; + return this; } public PlotOptionsChoice setPlotOptions(PlotOptions plotOptions, SeriesType type) { From 67442aff313350ab870035d29f49e85cd433520c Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Fri, 25 Jan 2019 09:43:58 +0100 Subject: [PATCH 31/38] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c47f709f..218b15bc 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ If your Java-based framework of choice is not supported by Wicked Charts, feel f Want to contribute? =================== -Feel free to clone this repository and submit pull request. We'll see to get them merged into the main project. +Feel free to clone this repository and submit pull requests. We'll see to get them merged into the main project. Adding Wicked-Charts as a dependency ================= From 941f1a73e13aa7ad51ddce7944a749d4ef06f0ae Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Tue, 12 Feb 2019 15:47:13 +0100 Subject: [PATCH 32/38] updated spring, gradle and junit --- build.gradle | 8 + chartjs-wrapper/build.gradle | 4 +- .../chartjs/chartoptions/colors/RgbColor.java | 1 - .../chartoptions/colors/RgbaColor.java | 3 +- .../chartoptions/valueType/StringValue.java | 7 +- .../CallbackFunctionSerializer.java | 3 +- .../JavaScriptReferenceSerializer.java | 2 +- .../serializer/RgbColorSerializer.java | 3 +- .../serializer/StringValueSerializer.java | 3 +- .../chartjs/ChartConfigurationTest.java | 12 -- .../chartjs/chartoptions/DataTest.java | 20 +- .../chartjs/chartoptions/DatasetTest.java | 36 ++-- .../chartjs/chartoptions/GridLinesTest.java | 20 +- .../chartoptions/colors/HexColorTest.java | 29 +-- .../CallbackFunctionSerializerTest.java | 19 +- .../serializer/ConstValueSerializerTest.java | 16 +- .../serializer/DatasetSerializerTest.java | 16 +- .../DateTimeValueSerializerTest.java | 20 +- .../serializer/DoubleValueSerializerTest.java | 24 +-- .../serializer/FillingModeSerializerTest.java | 24 +-- .../serializer/FloatValueSerializerTest.java | 24 +-- .../serializer/HexColorSerializerTest.java | 25 ++- .../IntegerValueSerializerTest.java | 24 +-- .../JsonValueEnumSerializerTest.java | 20 +- .../serializer/LabelSerializerTest.java | 24 +-- .../LowercaseEnumSerializerTest.java | 17 +- .../serializer/RgbColorSerializerTest.java | 14 +- .../serializer/RgbaColorSerializerTest.java | 14 +- .../serializer/SimpleColorSerializerTest.java | 17 +- .../SingleElementListSerializerTest.java | 22 ++- .../StringValueColorSerializerTest.java | 21 ++- .../serializer/StringValueSerializerTest.java | 18 +- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- highcharts-wrapper/build.gradle | 1 - .../jackson/AbstractSerializerTest.java | 14 +- .../jackson/BackgroundSerializerTest.java | 11 +- .../jackson/CenterSerializerTest.java | 18 +- .../jackson/CoordinateSerializerTest.java | 21 ++- .../jackson/CrosshairSerializerTest.java | 16 +- .../jackson/CssStyleSerializerTest.java | 10 +- .../jackson/CustomCoordinatesSeriesTest.java | 14 +- .../jackson/DateTimeLabelFormatTest.java | 13 +- .../jackson/FunctionSerializerTest.java | 10 +- .../HexColorReferenceSerializerTest.java | 17 +- ...ighchartsColorReferenceSerializerTest.java | 15 +- .../highcharts/jackson/JsonIgnoreTest.java | 16 +- .../jackson/JsonRendererLocaleTest.java | 11 +- ...rGradientColorReferenceSerializerTest.java | 10 +- .../jackson/LowercaseEnumSerializerTest.java | 13 +- .../NullColorReferenceSerializerTest.java | 13 +- .../jackson/NullPointSerializerTest.java | 6 +- .../jackson/NullSerializerTest.java | 16 +- .../jackson/PixelOrPercentSerializerTest.java | 17 +- .../RangeCoordinateSerializerTest.java | 8 +- .../RgbaColorReferenceSerializerTest.java | 17 +- .../SimpleColorReferenceSerializerTest.java | 17 +- .../jackson/SymbolSerializerTest.java | 17 +- .../ThreeDCoordinateSerializerTest.java | 17 +- .../options/BuilderPatternTest.java | 24 ++- .../highcharts/options/ClassFinder.java | 62 +++--- .../options/CssPropertyNameSanitizerTest.java | 20 +- showcase/build.gradle | 11 +- showcase/gradle.properties | 8 +- .../build.gradle | 2 - .../options/highcharts/ClassFinder.java | 47 ++--- .../options/highcharts/OptionsSmokeTest.java | 8 +- .../build.gradle | 7 +- .../gradle.properties | 2 +- .../showcase/HomepageChartsJsTest.java | 178 +++++++++--------- .../build.gradle | 9 +- .../gradle.properties | 2 +- .../showcase/HomepageChartsJsTest.java | 178 +++++++++--------- .../build.gradle | 9 +- .../gradle.properties | 2 +- .../showcase/HomepageChartsJsTest.java | 178 +++++++++--------- .../build.gradle | 9 +- .../gradle.properties | 2 +- .../showcase/HomepageChartsJsTest.java | 178 +++++++++--------- .../build.gradle | 10 +- .../gradle.properties | 2 +- .../showcase/HomepageChartsJsTest.java | 178 +++++++++--------- wicket/wicked-charts-wicket14/build.gradle | 1 - wicket/wicked-charts-wicket15/build.gradle | 1 - wicket/wicked-charts-wicket6/build.gradle | 3 +- wicket/wicked-charts-wicket7/build.gradle | 1 - wicket/wicked-charts-wicket8/build.gradle | 1 - 87 files changed, 1004 insertions(+), 980 deletions(-) delete mode 100644 chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/ChartConfigurationTest.java create mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index 4c1588e1..320513d5 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,14 @@ subprojects { jcenter() } + dependencies{ + testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junit_version + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junit_version + } + test { + useJUnitPlatform() + } + // run gradle with "-Dsnapshot=true" to automatically append "-SNAPSHOT" to the version version = '3.2.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "") sourceCompatibility = 1.8 diff --git a/chartjs-wrapper/build.gradle b/chartjs-wrapper/build.gradle index e4cf1616..60ca3b69 100644 --- a/chartjs-wrapper/build.gradle +++ b/chartjs-wrapper/build.gradle @@ -1,6 +1,6 @@ dependencies { - compile 'org.projectlombok:lombok:1.16.20' - testCompile 'junit:junit:4.12' + compileOnly 'org.projectlombok:lombok:1.18.6' + annotationProcessor 'org.projectlombok:lombok:1.18.6' compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.1' compile 'com.fasterxml.jackson.core:jackson-core:2.8.1' compile 'com.fasterxml.jackson.core:jackson-databind:2.8.1' diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java index 224a60a5..c6badebc 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbColor.java @@ -20,5 +20,4 @@ public class RgbColor extends Color implements Serializable { private int red; private int green; private int blue; - } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java index 5a6c6a16..5ec0c884 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/colors/RgbaColor.java @@ -1,5 +1,6 @@ package de.adesso.wickedcharts.chartjs.chartoptions.colors; +import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; @@ -10,7 +11,7 @@ * * @author SvenWirz */ -@lombok.Data +@Data @EqualsAndHashCode(callSuper=true) public class RgbaColor extends RgbColor implements Serializable { diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java index cbd19cc5..2f9688e7 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/chartoptions/valueType/StringValue.java @@ -1,5 +1,6 @@ package de.adesso.wickedcharts.chartjs.chartoptions.valueType; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -16,7 +17,7 @@ * @author SvenWirz */ @Accessors(chain = true) -@lombok.Data +@Data @EqualsAndHashCode(callSuper = false) public class StringValue extends ValueType implements Serializable { private String value; @@ -28,11 +29,11 @@ public StringValue(String value) { } public static List of(List stringList) { - return stringList.stream().map(string -> new StringValue(string)).collect(Collectors.toList()); + return stringList.stream().map(StringValue::new).collect(Collectors.toList()); } public static List of(String...strings) { - return Arrays.stream(strings).map(string -> new StringValue(string)).collect(Collectors.toList()); + return Arrays.stream(strings).map(StringValue::new).collect(Collectors.toList()); } } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/CallbackFunctionSerializer.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/CallbackFunctionSerializer.java index 6f5e8247..6c27c27a 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/CallbackFunctionSerializer.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/CallbackFunctionSerializer.java @@ -1,7 +1,6 @@ package de.adesso.wickedcharts.chartjs.jackson.serializer; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import de.adesso.wickedcharts.chartjs.chartoptions.CallbackFunction; @@ -15,7 +14,7 @@ public class CallbackFunctionSerializer extends JsonSerializer @Override public void serialize(CallbackFunction value, JsonGenerator gen, SerializerProvider serializers) - throws IOException, JsonProcessingException { + throws IOException { gen.writeRawValue(value.getText()); } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/JavaScriptReferenceSerializer.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/JavaScriptReferenceSerializer.java index f1f6ea05..02f1c87e 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/JavaScriptReferenceSerializer.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/JavaScriptReferenceSerializer.java @@ -15,7 +15,7 @@ public class JavaScriptReferenceSerializer extends JsonSerializer { @Override public void serialize(RgbColor color, JsonGenerator jgen, SerializerProvider provider) - throws IOException, JsonProcessingException { + throws IOException { jgen.writeRawValue(String.format(Locale.ENGLISH, RGB, color.getRed(), color.getGreen(), color.getBlue())); } diff --git a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/StringValueSerializer.java b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/StringValueSerializer.java index 2952b377..f14ccdb9 100644 --- a/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/StringValueSerializer.java +++ b/chartjs-wrapper/src/main/java/de/adesso/wickedcharts/chartjs/jackson/serializer/StringValueSerializer.java @@ -1,7 +1,6 @@ package de.adesso.wickedcharts.chartjs.jackson.serializer; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import de.adesso.wickedcharts.chartjs.chartoptions.valueType.StringValue; @@ -15,7 +14,7 @@ public class StringValueSerializer extends JsonSerializer { @Override public void serialize(StringValue value, JsonGenerator gen, SerializerProvider serializers) - throws IOException, JsonProcessingException { + throws IOException { if(value.getValue() != null) { gen.writeString(value.getValue()); } diff --git a/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/ChartConfigurationTest.java b/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/ChartConfigurationTest.java deleted file mode 100644 index aa3fc46d..00000000 --- a/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/ChartConfigurationTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package de.adesso.wickedcharts.chartjs; - -import org.junit.Test; - -public class ChartConfigurationTest { - - @Test - public void test() { - - } - -} diff --git a/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/chartoptions/DataTest.java b/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/chartoptions/DataTest.java index 3d0ecb80..9d15488d 100644 --- a/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/chartoptions/DataTest.java +++ b/chartjs-wrapper/src/test/java/de/adesso/wickedcharts/chartjs/chartoptions/DataTest.java @@ -2,28 +2,28 @@ import de.adesso.wickedcharts.chartjs.chartoptions.label.Label; import de.adesso.wickedcharts.chartjs.chartoptions.label.TextLabel; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class DataTest { +class DataTest { - Data testData; - List
diff --git a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap-button.js b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap-button.js index 92aafe25..3c891755 100644 --- a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap-button.js +++ b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap-button.js @@ -2,7 +2,7 @@ * bootstrap-button.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap-tab.js b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap-tab.js index 338de668..0298dfa7 100644 --- a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap-tab.js +++ b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap-tab.js @@ -2,7 +2,7 @@ * bootstrap-tab.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap.min.js b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap.min.js index 53e3fad0..a05e4429 100644 --- a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap.min.js +++ b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/bootstrap.min.js @@ -1,6 +1,6 @@ /*! * Bootstrap.js by @fat & @mdo -* Copyright 2012-2018 Twitter, Inc. +* Copyright 2012-2019 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ !function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

'})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
    ',item:'
    • ',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/jquery-1.8.3.min-IEfix.js b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/jquery-1.8.3.min-IEfix.js index 012ab88e..4d72ac30 100644 --- a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/jquery-1.8.3.min-IEfix.js +++ b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/js/jquery-1.8.3.min-IEfix.js @@ -6,7 +6,7 @@ * Includes Sizzle.js * http://sizzlejs.com/ * - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * @@ -3663,7 +3663,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl }); /*! * Sizzle CSS Selector Engine - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://sizzlejs.com/ */ diff --git a/showcase/wicked-charts-showcase-options/eclipse/code-formatter.xml b/showcase/wicked-charts-showcase-options/eclipse/code-formatter.xml index be68db85..f5d1cdcb 100644 --- a/showcase/wicked-charts-showcase-options/eclipse/code-formatter.xml +++ b/showcase/wicked-charts-showcase-options/eclipse/code-formatter.xml @@ -1,7 +1,7 @@
    -

    © Wicked Charts 2012-2018

    +

    © Wicked Charts 2012-2019

    diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index 1c24d480..f0e2f61a 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase; /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html index 9519f658..6c99c412 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html @@ -244,7 +244,7 @@

    Java code for this chart's configuration

    -

    © Wicked Charts 2012-2018

    +

    © Wicked Charts 2012-2019

    diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index a4218e38..5cab30a1 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java index 7a8fd183..6187bdc1 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java index 7fcc146e..05008051 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java index ea83cc42..19f01025 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java index 49535eb8..8a638cc7 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java index be4a759e..6d7be1a1 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java +++ b/showcase/wicked-charts-showcase-wicket14/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js b/showcase/wicked-charts-showcase-wicket14/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js index 012ab88e..4d72ac30 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js +++ b/showcase/wicked-charts-showcase-wicket14/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js @@ -6,7 +6,7 @@ * Includes Sizzle.js * http://sizzlejs.com/ * - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * @@ -3663,7 +3663,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl }); /*! * Sizzle CSS Selector Engine - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://sizzlejs.com/ */ diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/bootstrap-responsive.min.css b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/bootstrap-responsive.min.css index 91cbf906..38697069 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/bootstrap-responsive.min.css +++ b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/bootstrap-responsive.min.css @@ -1,7 +1,7 @@ /*! * Bootstrap Responsive v2.1.1 * - * Copyright 2012-2018 Twitter, Inc + * Copyright 2012-2019 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/bootstrap.min.css b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/bootstrap.min.css index ea422c2a..10fa92f4 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/bootstrap.min.css +++ b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/bootstrap.min.css @@ -1,7 +1,7 @@ /*! * Bootstrap v2.1.1 * - * Copyright 2012-2018 Twitter, Inc + * Copyright 2012-2019 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css index 8b438d68..aabc8429 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css +++ b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css @@ -1,7 +1,7 @@ /*! * jQuery UI CSS Framework 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -41,7 +41,7 @@ /*! * jQuery UI CSS Framework 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -287,7 +287,7 @@ .ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #000000 url(images/ui-bg_highlight-hard_70_000000_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*! * jQuery UI Resizable 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -306,7 +306,7 @@ .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*! * jQuery UI Selectable 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -316,7 +316,7 @@ /*! * jQuery UI Accordion 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -335,7 +335,7 @@ /*! * jQuery UI Autocomplete 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -388,7 +388,7 @@ /*! * jQuery UI Button 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -426,7 +426,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Dialog 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -447,7 +447,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Slider 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -470,7 +470,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-slider-vertical .ui-slider-range-max { top: 0; }/*! * jQuery UI Tabs 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -488,7 +488,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Datepicker 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -553,7 +553,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad }/*! * jQuery UI Progressbar 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/wickedcharts.css b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/wickedcharts.css index 2fd3f32d..19b95d03 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/wickedcharts.css +++ b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/css/wickedcharts.css @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Matthias Balke (matthias.balke@gmail.com) + * Copyright 2012-2019 Matthias Balke (matthias.balke@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap-button.js b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap-button.js index 92aafe25..3c891755 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap-button.js +++ b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap-button.js @@ -2,7 +2,7 @@ * bootstrap-button.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap-tab.js b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap-tab.js index 338de668..0298dfa7 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap-tab.js +++ b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap-tab.js @@ -2,7 +2,7 @@ * bootstrap-tab.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap.min.js b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap.min.js index 53e3fad0..a05e4429 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap.min.js +++ b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/bootstrap.min.js @@ -1,6 +1,6 @@ /*! * Bootstrap.js by @fat & @mdo -* Copyright 2012-2018 Twitter, Inc. +* Copyright 2012-2019 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ !function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
    ',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

    '})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
      ',item:'
      • ',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/jquery-1.8.3.min-IEfix.js b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/jquery-1.8.3.min-IEfix.js index 012ab88e..4d72ac30 100644 --- a/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/jquery-1.8.3.min-IEfix.js +++ b/showcase/wicked-charts-showcase-wicket14/src/main/webapp/js/jquery-1.8.3.min-IEfix.js @@ -6,7 +6,7 @@ * Includes Sizzle.js * http://sizzlejs.com/ * - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * @@ -3663,7 +3663,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl }); /*! * Sizzle CSS Selector Engine - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://sizzlejs.com/ */ diff --git a/showcase/wicked-charts-showcase-wicket15/eclipse/code-formatter.xml b/showcase/wicked-charts-showcase-wicket15/eclipse/code-formatter.xml index be68db85..f5d1cdcb 100644 --- a/showcase/wicked-charts-showcase-wicket15/eclipse/code-formatter.xml +++ b/showcase/wicked-charts-showcase-wicket15/eclipse/code-formatter.xml @@ -1,7 +1,7 @@
      -

      © Wicked Charts 2012-2018

      +

      © Wicked Charts 2012-2019

      diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index 123e3927..8c0ef4fe 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase; /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html index c3105fe8..ac1bb3a7 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html @@ -258,7 +258,7 @@

      Java code for this chart's configuration

      -

      © Wicked Charts 2012-2018

      +

      © Wicked Charts 2012-2019

      diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index a100fb28..1562681d 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java index d2c2f3cf..7d8125b3 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java index f88719c2..878cc1a9 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java index 6fb81f90..1c7d2ef2 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java index e3413d75..46199b7f 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java index cf9d82c9..b655456d 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java index b86794c8..decbf0df 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java +++ b/showcase/wicked-charts-showcase-wicket15/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js b/showcase/wicked-charts-showcase-wicket15/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js index 012ab88e..4d72ac30 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js +++ b/showcase/wicked-charts-showcase-wicket15/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js @@ -6,7 +6,7 @@ * Includes Sizzle.js * http://sizzlejs.com/ * - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * @@ -3663,7 +3663,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl }); /*! * Sizzle CSS Selector Engine - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://sizzlejs.com/ */ diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/bootstrap-responsive.min.css b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/bootstrap-responsive.min.css index 91cbf906..38697069 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/bootstrap-responsive.min.css +++ b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/bootstrap-responsive.min.css @@ -1,7 +1,7 @@ /*! * Bootstrap Responsive v2.1.1 * - * Copyright 2012-2018 Twitter, Inc + * Copyright 2012-2019 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/bootstrap.min.css b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/bootstrap.min.css index ea422c2a..10fa92f4 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/bootstrap.min.css +++ b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/bootstrap.min.css @@ -1,7 +1,7 @@ /*! * Bootstrap v2.1.1 * - * Copyright 2012-2018 Twitter, Inc + * Copyright 2012-2019 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css index 8b438d68..aabc8429 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css +++ b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css @@ -1,7 +1,7 @@ /*! * jQuery UI CSS Framework 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -41,7 +41,7 @@ /*! * jQuery UI CSS Framework 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -287,7 +287,7 @@ .ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #000000 url(images/ui-bg_highlight-hard_70_000000_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*! * jQuery UI Resizable 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -306,7 +306,7 @@ .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*! * jQuery UI Selectable 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -316,7 +316,7 @@ /*! * jQuery UI Accordion 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -335,7 +335,7 @@ /*! * jQuery UI Autocomplete 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -388,7 +388,7 @@ /*! * jQuery UI Button 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -426,7 +426,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Dialog 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -447,7 +447,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Slider 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -470,7 +470,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-slider-vertical .ui-slider-range-max { top: 0; }/*! * jQuery UI Tabs 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -488,7 +488,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Datepicker 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -553,7 +553,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad }/*! * jQuery UI Progressbar 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/wickedcharts.css b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/wickedcharts.css index 2fd3f32d..19b95d03 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/wickedcharts.css +++ b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/css/wickedcharts.css @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Matthias Balke (matthias.balke@gmail.com) + * Copyright 2012-2019 Matthias Balke (matthias.balke@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap-button.js b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap-button.js index 92aafe25..3c891755 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap-button.js +++ b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap-button.js @@ -2,7 +2,7 @@ * bootstrap-button.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap-tab.js b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap-tab.js index 338de668..0298dfa7 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap-tab.js +++ b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap-tab.js @@ -2,7 +2,7 @@ * bootstrap-tab.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap.min.js b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap.min.js index 53e3fad0..a05e4429 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap.min.js +++ b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/bootstrap.min.js @@ -1,6 +1,6 @@ /*! * Bootstrap.js by @fat & @mdo -* Copyright 2012-2018 Twitter, Inc. +* Copyright 2012-2019 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ !function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
      ',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

      '})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
        ',item:'
        • ',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/jquery-1.8.3.min-IEfix.js b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/jquery-1.8.3.min-IEfix.js index 012ab88e..4d72ac30 100644 --- a/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/jquery-1.8.3.min-IEfix.js +++ b/showcase/wicked-charts-showcase-wicket15/src/main/webapp/js/jquery-1.8.3.min-IEfix.js @@ -6,7 +6,7 @@ * Includes Sizzle.js * http://sizzlejs.com/ * - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * @@ -3663,7 +3663,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl }); /*! * Sizzle CSS Selector Engine - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://sizzlejs.com/ */ diff --git a/showcase/wicked-charts-showcase-wicket6/build.gradle b/showcase/wicked-charts-showcase-wicket6/build.gradle index 6e62c689..27894d06 100644 --- a/showcase/wicked-charts-showcase-wicket6/build.gradle +++ b/showcase/wicked-charts-showcase-wicket6/build.gradle @@ -3,7 +3,6 @@ import org.apache.tools.ant.filters.ReplaceTokens dependencies { compile group: 'org.apache.wicket', name: 'wicket-core', version: "${wicket_version}" compile project(':wicked-charts-showcase-options') - compile 'javax.servlet:javax.servlet-api:3.1.0' compile 'commons-io:commons-io:2.4' compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_version}" compile( diff --git a/showcase/wicked-charts-showcase-wicket6/eclipse/code-formatter.xml b/showcase/wicked-charts-showcase-wicket6/eclipse/code-formatter.xml index be68db85..f5d1cdcb 100644 --- a/showcase/wicked-charts-showcase-wicket6/eclipse/code-formatter.xml +++ b/showcase/wicked-charts-showcase-wicket6/eclipse/code-formatter.xml @@ -1,7 +1,7 @@ diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html index 2ae244bb..8d2f5530 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.html @@ -282,7 +282,7 @@

        Java code for this chart's configuration

        -

        © Wicked Charts 2012-2018

        +

        © Wicked Charts 2012-2019

        diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index c7494edc..21114be6 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase; /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html index af5a2b25..ae2a3d10 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html @@ -258,7 +258,7 @@

        Java code for this chart's configuration

        -

        © Wicked Charts 2012-2018

        +

        © Wicked Charts 2012-2019

        diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index a6f9e7ca..9ed10a48 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java index 1efe7748..32059061 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java index f88719c2..878cc1a9 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java index 6fb81f90..1c7d2ef2 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java index e3413d75..46199b7f 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java index cf9d82c9..b655456d 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java index b86794c8..decbf0df 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java index 83e644bb..919bb0c6 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java +++ b/showcase/wicked-charts-showcase-wicket6/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js b/showcase/wicked-charts-showcase-wicket6/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js index 012ab88e..4d72ac30 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js +++ b/showcase/wicked-charts-showcase-wicket6/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js @@ -6,7 +6,7 @@ * Includes Sizzle.js * http://sizzlejs.com/ * - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * @@ -3663,7 +3663,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl }); /*! * Sizzle CSS Selector Engine - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://sizzlejs.com/ */ diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/bootstrap-responsive.min.css b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/bootstrap-responsive.min.css index 91cbf906..38697069 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/bootstrap-responsive.min.css +++ b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/bootstrap-responsive.min.css @@ -1,7 +1,7 @@ /*! * Bootstrap Responsive v2.1.1 * - * Copyright 2012-2018 Twitter, Inc + * Copyright 2012-2019 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/bootstrap.min.css b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/bootstrap.min.css index ea422c2a..10fa92f4 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/bootstrap.min.css +++ b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/bootstrap.min.css @@ -1,7 +1,7 @@ /*! * Bootstrap v2.1.1 * - * Copyright 2012-2018 Twitter, Inc + * Copyright 2012-2019 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css index 8b438d68..aabc8429 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css +++ b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css @@ -1,7 +1,7 @@ /*! * jQuery UI CSS Framework 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -41,7 +41,7 @@ /*! * jQuery UI CSS Framework 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -287,7 +287,7 @@ .ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #000000 url(images/ui-bg_highlight-hard_70_000000_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*! * jQuery UI Resizable 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -306,7 +306,7 @@ .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*! * jQuery UI Selectable 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -316,7 +316,7 @@ /*! * jQuery UI Accordion 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -335,7 +335,7 @@ /*! * jQuery UI Autocomplete 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -388,7 +388,7 @@ /*! * jQuery UI Button 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -426,7 +426,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Dialog 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -447,7 +447,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Slider 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -470,7 +470,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-slider-vertical .ui-slider-range-max { top: 0; }/*! * jQuery UI Tabs 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -488,7 +488,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Datepicker 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -553,7 +553,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad }/*! * jQuery UI Progressbar 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/wickedcharts.css b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/wickedcharts.css index 2ec8b218..47f03210 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/wickedcharts.css +++ b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/css/wickedcharts.css @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Matthias Balke (matthias.balke@gmail.com) + * Copyright 2012-2019 Matthias Balke (matthias.balke@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap-button.js b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap-button.js index 92aafe25..3c891755 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap-button.js +++ b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap-button.js @@ -2,7 +2,7 @@ * bootstrap-button.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap-tab.js b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap-tab.js index 338de668..0298dfa7 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap-tab.js +++ b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap-tab.js @@ -2,7 +2,7 @@ * bootstrap-tab.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap.min.js b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap.min.js index 53e3fad0..a05e4429 100644 --- a/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap.min.js +++ b/showcase/wicked-charts-showcase-wicket6/src/main/webapp/js/bootstrap.min.js @@ -1,6 +1,6 @@ /*! * Bootstrap.js by @fat & @mdo -* Copyright 2012-2018 Twitter, Inc. +* Copyright 2012-2019 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ !function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
        ',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

        '})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
          ',item:'
          • ',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket7/build.gradle b/showcase/wicked-charts-showcase-wicket7/build.gradle index 2ee13317..34199065 100644 --- a/showcase/wicked-charts-showcase-wicket7/build.gradle +++ b/showcase/wicked-charts-showcase-wicket7/build.gradle @@ -6,7 +6,6 @@ dependencies { compile 'commons-io:commons-io:2.4' compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_version}" compile( - [group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'], [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_version}"], [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket7', version: "${wickedcharts_version}"], ) diff --git a/showcase/wicked-charts-showcase-wicket7/eclipse/code-formatter.xml b/showcase/wicked-charts-showcase-wicket7/eclipse/code-formatter.xml index be68db85..f5d1cdcb 100644 --- a/showcase/wicked-charts-showcase-wicket7/eclipse/code-formatter.xml +++ b/showcase/wicked-charts-showcase-wicket7/eclipse/code-formatter.xml @@ -1,7 +1,7 @@
          -

          © Wicked Charts 2012-2018

          +

          © Wicked Charts 2012-2019

          diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index d1578e6a..9a487bcc 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase; /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html index 743983ec..1d8d3c29 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html @@ -258,7 +258,7 @@

          Java code for this chart's configuration

          -

          © Wicked Charts 2012-2018

          +

          © Wicked Charts 2012-2019

          diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index 68ddec04..e124834b 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java index 16b6f5a0..1bc60151 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java index effba840..ec2c6bc2 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java index 6fb81f90..1c7d2ef2 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java index e3413d75..46199b7f 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java index cf9d82c9..b655456d 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java index b86794c8..decbf0df 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java index e413c50c..c113274d 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java +++ b/showcase/wicked-charts-showcase-wicket7/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js b/showcase/wicked-charts-showcase-wicket7/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js index 012ab88e..4d72ac30 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js +++ b/showcase/wicked-charts-showcase-wicket7/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js @@ -6,7 +6,7 @@ * Includes Sizzle.js * http://sizzlejs.com/ * - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * @@ -3663,7 +3663,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl }); /*! * Sizzle CSS Selector Engine - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://sizzlejs.com/ */ diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/bootstrap-responsive.min.css b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/bootstrap-responsive.min.css index 91cbf906..38697069 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/bootstrap-responsive.min.css +++ b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/bootstrap-responsive.min.css @@ -1,7 +1,7 @@ /*! * Bootstrap Responsive v2.1.1 * - * Copyright 2012-2018 Twitter, Inc + * Copyright 2012-2019 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/bootstrap.min.css b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/bootstrap.min.css index ea422c2a..10fa92f4 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/bootstrap.min.css +++ b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/bootstrap.min.css @@ -1,7 +1,7 @@ /*! * Bootstrap v2.1.1 * - * Copyright 2012-2018 Twitter, Inc + * Copyright 2012-2019 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css index 8b438d68..aabc8429 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css +++ b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css @@ -1,7 +1,7 @@ /*! * jQuery UI CSS Framework 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -41,7 +41,7 @@ /*! * jQuery UI CSS Framework 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -287,7 +287,7 @@ .ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #000000 url(images/ui-bg_highlight-hard_70_000000_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*! * jQuery UI Resizable 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -306,7 +306,7 @@ .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*! * jQuery UI Selectable 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -316,7 +316,7 @@ /*! * jQuery UI Accordion 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -335,7 +335,7 @@ /*! * jQuery UI Autocomplete 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -388,7 +388,7 @@ /*! * jQuery UI Button 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -426,7 +426,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Dialog 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -447,7 +447,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Slider 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -470,7 +470,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-slider-vertical .ui-slider-range-max { top: 0; }/*! * jQuery UI Tabs 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -488,7 +488,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Datepicker 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -553,7 +553,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad }/*! * jQuery UI Progressbar 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/wickedcharts.css b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/wickedcharts.css index 2ec8b218..47f03210 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/wickedcharts.css +++ b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/css/wickedcharts.css @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Matthias Balke (matthias.balke@gmail.com) + * Copyright 2012-2019 Matthias Balke (matthias.balke@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap-button.js b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap-button.js index 92aafe25..3c891755 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap-button.js +++ b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap-button.js @@ -2,7 +2,7 @@ * bootstrap-button.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap-tab.js b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap-tab.js index 338de668..0298dfa7 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap-tab.js +++ b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap-tab.js @@ -2,7 +2,7 @@ * bootstrap-tab.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap.min.js b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap.min.js index 53e3fad0..a05e4429 100644 --- a/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap.min.js +++ b/showcase/wicked-charts-showcase-wicket7/src/main/webapp/js/bootstrap.min.js @@ -1,6 +1,6 @@ /*! * Bootstrap.js by @fat & @mdo -* Copyright 2012-2018 Twitter, Inc. +* Copyright 2012-2019 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ !function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
          ',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

          '})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
            ',item:'
            • ',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-wicket8/build.gradle b/showcase/wicked-charts-showcase-wicket8/build.gradle index 69ee807a..12f4dcfd 100644 --- a/showcase/wicked-charts-showcase-wicket8/build.gradle +++ b/showcase/wicked-charts-showcase-wicket8/build.gradle @@ -21,7 +21,6 @@ dependencies { compile 'commons-io:commons-io:2.4' compile group: 'org.apache.wicket', name: 'wicket-extensions', version: "${wicket_version}" compile( - [group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'], [group: 'org.apache.wicket', name: 'wicket-spring', version: "${wicket_version}"], [group: 'de.adesso.wicked-charts', name: 'wicked-charts-wicket8', version: "${wickedcharts_version}"], ) diff --git a/showcase/wicked-charts-showcase-wicket8/eclipse/code-formatter.xml b/showcase/wicked-charts-showcase-wicket8/eclipse/code-formatter.xml index be68db85..f5d1cdcb 100644 --- a/showcase/wicked-charts-showcase-wicket8/eclipse/code-formatter.xml +++ b/showcase/wicked-charts-showcase-wicket8/eclipse/code-formatter.xml @@ -1,7 +1,7 @@
            -

            © Wicked Charts 2012-2018

            +

            © Wicked Charts 2012-2019

            diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java index f59d5924..d4c16872 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageChartJs.java @@ -1,6 +1,6 @@ package de.adesso.wickedcharts.showcase; /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html index f8bab1c1..aacfa777 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.html @@ -258,7 +258,7 @@

            Java code for this chart's configuration

            -

            © Wicked Charts 2012-2018

            +

            © Wicked Charts 2012-2019

            diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java index e709e212..e71c72d9 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/HomepageHighcharts.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java index 344c4c6c..efee73ca 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseApplication.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java index effba840..ec2c6bc2 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/ShowcaseSession.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java index 6fb81f90..1c7d2ef2 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/StringFromResourceModel.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java index e3413d75..46199b7f 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateChartJsLink.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java index cf9d82c9..b655456d 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateHighchartLink.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java index b86794c8..decbf0df 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/links/UpdateThemeLink.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java index 3dc15765..8d06f046 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java +++ b/showcase/wicked-charts-showcase-wicket8/src/main/java/de/adesso/wickedcharts/showcase/options/WicketSplineUpdatingOptions.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js b/showcase/wicked-charts-showcase-wicket8/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js index 012ab88e..4d72ac30 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js +++ b/showcase/wicked-charts-showcase-wicket8/src/main/resources/de/adesso/wickedcharts/showcase/jquery-1.8.3.min-IEfix.js @@ -6,7 +6,7 @@ * Includes Sizzle.js * http://sizzlejs.com/ * - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * @@ -3663,7 +3663,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl }); /*! * Sizzle CSS Selector Engine - * Copyright 2012-2018 jQuery Foundation and other contributors + * Copyright 2012-2019 jQuery Foundation and other contributors * Released under the MIT license * http://sizzlejs.com/ */ diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/bootstrap-responsive.min.css b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/bootstrap-responsive.min.css index 91cbf906..38697069 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/bootstrap-responsive.min.css +++ b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/bootstrap-responsive.min.css @@ -1,7 +1,7 @@ /*! * Bootstrap Responsive v2.1.1 * - * Copyright 2012-2018 Twitter, Inc + * Copyright 2012-2019 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/bootstrap.min.css b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/bootstrap.min.css index ea422c2a..10fa92f4 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/bootstrap.min.css +++ b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/bootstrap.min.css @@ -1,7 +1,7 @@ /*! * Bootstrap v2.1.1 * - * Copyright 2012-2018 Twitter, Inc + * Copyright 2012-2019 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css index 8b438d68..aabc8429 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css +++ b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/cupertino/jquery-ui-1.8.23.custom.css @@ -1,7 +1,7 @@ /*! * jQuery UI CSS Framework 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -41,7 +41,7 @@ /*! * jQuery UI CSS Framework 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -287,7 +287,7 @@ .ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #000000 url(images/ui-bg_highlight-hard_70_000000_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*! * jQuery UI Resizable 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -306,7 +306,7 @@ .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*! * jQuery UI Selectable 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -316,7 +316,7 @@ /*! * jQuery UI Accordion 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -335,7 +335,7 @@ /*! * jQuery UI Autocomplete 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -388,7 +388,7 @@ /*! * jQuery UI Button 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -426,7 +426,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Dialog 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -447,7 +447,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Slider 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -470,7 +470,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-slider-vertical .ui-slider-range-max { top: 0; }/*! * jQuery UI Tabs 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -488,7 +488,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad /*! * jQuery UI Datepicker 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -553,7 +553,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad }/*! * jQuery UI Progressbar 1.8.23 * - * Copyright 2012-2018, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012-2019, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/wickedcharts.css b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/wickedcharts.css index 7b0ef58f..c61dd0fa 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/wickedcharts.css +++ b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/css/wickedcharts.css @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Matthias Balke (matthias.balke@gmail.com) + * Copyright 2012-2019 Matthias Balke (matthias.balke@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap-button.js b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap-button.js index 92aafe25..3c891755 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap-button.js +++ b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap-button.js @@ -2,7 +2,7 @@ * bootstrap-button.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap-tab.js b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap-tab.js index 338de668..0298dfa7 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap-tab.js +++ b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap-tab.js @@ -2,7 +2,7 @@ * bootstrap-tab.js v2.1.1 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== - * Copyright 2012-2018 Twitter, Inc. + * Copyright 2012-2019 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap.min.js b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap.min.js index 53e3fad0..a05e4429 100644 --- a/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap.min.js +++ b/showcase/wicked-charts-showcase-wicket8/src/main/webapp/js/bootstrap.min.js @@ -1,6 +1,6 @@ /*! * Bootstrap.js by @fat & @mdo -* Copyright 2012-2018 Twitter, Inc. +* Copyright 2012-2019 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ !function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
            ',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

            '})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
              ',item:'
              • ',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/JavaScriptResourceRegistry.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/JavaScriptResourceRegistry.java index 1a70d971..ecb47236 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/JavaScriptResourceRegistry.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/JavaScriptResourceRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/Chart.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/Chart.java index 858320ac..c98b4d08 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/Chart.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/Chart.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/JsonRendererFactory.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/JsonRendererFactory.java index e7ba2f12..dc396a6b 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/JsonRendererFactory.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/features/basic/ChartBehavior.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/features/basic/ChartBehavior.java index d1cc1c91..c51a246f 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/features/basic/ChartBehavior.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/chartjs/features/basic/ChartBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/Chart.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/Chart.java index 3c115cac..cdfecdaa 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/Chart.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/Chart.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/JsonRendererFactory.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/JsonRendererFactory.java index bed25dc2..89ec80e2 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/JsonRendererFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/basic/ChartBehavior.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/basic/ChartBehavior.java index f17a2638..6cdad723 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/basic/ChartBehavior.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/basic/ChartBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/drilldown/DrilldownProcessor.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/drilldown/DrilldownProcessor.java index d4e477e0..0c3f5d81 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/drilldown/DrilldownProcessor.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/drilldown/DrilldownProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/global/GlobalProcessor.java b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/global/GlobalProcessor.java index 40179c4a..6b292b93 100644 --- a/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/global/GlobalProcessor.java +++ b/wicket/wicked-charts-wicket14/src/main/java/de/adesso/wickedcharts/wicket14/highcharts/features/global/GlobalProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket14/src/main/resources/NOTICE b/wicket/wicked-charts-wicket14/src/main/resources/NOTICE index dcc02470..f014c6b5 100644 --- a/wicket/wicked-charts-wicket14/src/main/resources/NOTICE +++ b/wicket/wicked-charts-wicket14/src/main/resources/NOTICE @@ -1,4 +1,4 @@ - Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket14/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties b/wicket/wicked-charts-wicket14/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties index 2fda2d65..4ad40c58 100644 --- a/wicket/wicked-charts-wicket14/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties +++ b/wicket/wicked-charts-wicket14/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties @@ -1,5 +1,5 @@ # -# Copyright 2012-2018 Wicked Charts (tom.hombergs@gmail.com) +# Copyright 2012-2019 Wicked Charts (tom.hombergs@gmail.com) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/JavaScriptResourceRegistry.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/JavaScriptResourceRegistry.java index 23ab6f95..8fcb0bad 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/JavaScriptResourceRegistry.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/JavaScriptResourceRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/Chart.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/Chart.java index 5e653bf6..57e661df 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/Chart.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/Chart.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/JsonRendererFactory.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/JsonRendererFactory.java index 782d03b1..d1dbce12 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/JsonRendererFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/features/basic/ChartBehavior.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/features/basic/ChartBehavior.java index e3349362..e8cd5daa 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/features/basic/ChartBehavior.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/chartjs/features/basic/ChartBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/Chart.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/Chart.java index 877af0f1..012ced93 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/Chart.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/Chart.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/JsonRendererFactory.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/JsonRendererFactory.java index 0796dccb..9b143d83 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/JsonRendererFactory.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/basic/ChartBehavior.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/basic/ChartBehavior.java index 569d6bc5..3299b1ba 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/basic/ChartBehavior.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/basic/ChartBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/drilldown/DrilldownProcessor.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/drilldown/DrilldownProcessor.java index ae094cb1..e3c753ec 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/drilldown/DrilldownProcessor.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/drilldown/DrilldownProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/global/GlobalProcessor.java b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/global/GlobalProcessor.java index 826191e3..533d3c80 100644 --- a/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/global/GlobalProcessor.java +++ b/wicket/wicked-charts-wicket15/src/main/java/de/adesso/wickedcharts/wicket15/highcharts/features/global/GlobalProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/resources/NOTICE b/wicket/wicked-charts-wicket15/src/main/resources/NOTICE index dcc02470..f014c6b5 100644 --- a/wicket/wicked-charts-wicket15/src/main/resources/NOTICE +++ b/wicket/wicked-charts-wicket15/src/main/resources/NOTICE @@ -1,4 +1,4 @@ - Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket15/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties b/wicket/wicked-charts-wicket15/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties index 2fda2d65..4ad40c58 100644 --- a/wicket/wicked-charts-wicket15/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties +++ b/wicket/wicked-charts-wicket15/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties @@ -1,5 +1,5 @@ # -# Copyright 2012-2018 Wicked Charts (tom.hombergs@gmail.com) +# Copyright 2012-2019 Wicked Charts (tom.hombergs@gmail.com) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/JavaScriptExpressionSendingAjaxBehavior.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/JavaScriptExpressionSendingAjaxBehavior.java index 6025fd49..4ce07678 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/JavaScriptExpressionSendingAjaxBehavior.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/JavaScriptExpressionSendingAjaxBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/JavaScriptResourceRegistry.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/JavaScriptResourceRegistry.java index 724875f4..e918b2a2 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/JavaScriptResourceRegistry.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/JavaScriptResourceRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/Chart.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/Chart.java index 7ac5adce..5f2a5e73 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/Chart.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/Chart.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/JsonRendererFactory.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/JsonRendererFactory.java index 66b82113..adabeb02 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/JsonRendererFactory.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/features/basic/ChartBehavior.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/features/basic/ChartBehavior.java index 192548fa..08f26f17 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/features/basic/ChartBehavior.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/chartjs/features/basic/ChartBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/Chart.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/Chart.java index 86fd5834..8b193f7e 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/Chart.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/Chart.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/JsonRendererFactory.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/JsonRendererFactory.java index 88164d61..dfe36b84 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/JsonRendererFactory.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/basic/ChartBehavior.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/basic/ChartBehavior.java index c2655177..fe129138 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/basic/ChartBehavior.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/basic/ChartBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/drilldown/DrilldownProcessor.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/drilldown/DrilldownProcessor.java index 3ba39d43..a5a1033d 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/drilldown/DrilldownProcessor.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/drilldown/DrilldownProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/global/GlobalProcessor.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/global/GlobalProcessor.java index 1005c23a..bddc47a8 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/global/GlobalProcessor.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/global/GlobalProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionBehavior.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionBehavior.java index 2cf2c92f..cd625ca2 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionBehavior.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionProcessor.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionProcessor.java index f302191a..656b91ae 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionProcessor.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/InteractionProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/WicketInteractionEvent.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/WicketInteractionEvent.java index 87a19775..ef8a4772 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/WicketInteractionEvent.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/interaction/WicketInteractionEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataAjaxBehavior.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataAjaxBehavior.java index ac6a1a89..6d6d107a 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataAjaxBehavior.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataAjaxBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataFunction.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataFunction.java index 178138ea..b0ccab89 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataFunction.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataFunction.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataProcessor.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataProcessor.java index a6a565b1..14cd0ca4 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataProcessor.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/LiveDataProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/WicketLiveDataUpdateEvent.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/WicketLiveDataUpdateEvent.java index 69de8b3e..b69301f5 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/WicketLiveDataUpdateEvent.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/livedata/WicketLiveDataUpdateEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/JsonSelection.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/JsonSelection.java index 5330983b..3053c3f5 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/JsonSelection.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/JsonSelection.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/JsonSelectionEvent.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/JsonSelectionEvent.java index 6417cf88..4c8fbcd3 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/JsonSelectionEvent.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/JsonSelectionEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionBehavior.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionBehavior.java index 4a14f694..527ac27b 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionBehavior.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionProcessor.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionProcessor.java index 219ce3e5..37856128 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionProcessor.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/SelectionProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/WicketSelectionEvent.java b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/WicketSelectionEvent.java index 5d1b3a73..93236df5 100644 --- a/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/WicketSelectionEvent.java +++ b/wicket/wicked-charts-wicket6/src/main/java/de/adesso/wickedcharts/wicket6/highcharts/features/selection/WicketSelectionEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/resources/NOTICE b/wicket/wicked-charts-wicket6/src/main/resources/NOTICE index dcc02470..f014c6b5 100644 --- a/wicket/wicked-charts-wicket6/src/main/resources/NOTICE +++ b/wicket/wicked-charts-wicket6/src/main/resources/NOTICE @@ -1,4 +1,4 @@ - Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket6/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties b/wicket/wicked-charts-wicket6/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties index 2fda2d65..4ad40c58 100644 --- a/wicket/wicked-charts-wicket6/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties +++ b/wicket/wicked-charts-wicket6/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties @@ -1,5 +1,5 @@ # -# Copyright 2012-2018 Wicked Charts (tom.hombergs@gmail.com) +# Copyright 2012-2019 Wicked Charts (tom.hombergs@gmail.com) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/JavaScriptExpressionSendingAjaxBehavior.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/JavaScriptExpressionSendingAjaxBehavior.java index 8cd8a5f9..a267ecc0 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/JavaScriptExpressionSendingAjaxBehavior.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/JavaScriptExpressionSendingAjaxBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/JavaScriptResourceRegistry.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/JavaScriptResourceRegistry.java index 9f1a5f7a..b4eac87e 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/JavaScriptResourceRegistry.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/JavaScriptResourceRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/Chart.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/Chart.java index b0d998b0..01e46c09 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/Chart.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/Chart.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/JsonRendererFactory.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/JsonRendererFactory.java index 68105dc2..aa3bcb77 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/JsonRendererFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/features/basic/ChartBehavior.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/features/basic/ChartBehavior.java index e9388193..cff5fc78 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/features/basic/ChartBehavior.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/chartjs/features/basic/ChartBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/Chart.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/Chart.java index 473c8f02..515e61a9 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/Chart.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/Chart.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/JsonRendererFactory.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/JsonRendererFactory.java index 7e08d100..44e09d50 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/JsonRendererFactory.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/basic/ChartBehavior.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/basic/ChartBehavior.java index 491e882e..5a11a443 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/basic/ChartBehavior.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/basic/ChartBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/drilldown/DrilldownProcessor.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/drilldown/DrilldownProcessor.java index c7dab5fb..5b367955 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/drilldown/DrilldownProcessor.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/drilldown/DrilldownProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/global/GlobalProcessor.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/global/GlobalProcessor.java index 4f8452de..9ce4d834 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/global/GlobalProcessor.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/global/GlobalProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionBehavior.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionBehavior.java index d48b6100..ddf624b1 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionBehavior.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionProcessor.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionProcessor.java index ff34ed53..3d880a1e 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionProcessor.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/InteractionProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/WicketInteractionEvent.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/WicketInteractionEvent.java index 789cb6b4..cb70dff3 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/WicketInteractionEvent.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/interaction/WicketInteractionEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataAjaxBehavior.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataAjaxBehavior.java index aa2402f1..4de9ee03 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataAjaxBehavior.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataAjaxBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataFunction.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataFunction.java index e623dfab..de9a8c8c 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataFunction.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataFunction.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataProcessor.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataProcessor.java index 0067cdc3..7fb936d0 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataProcessor.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/LiveDataProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/WicketLiveDataUpdateEvent.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/WicketLiveDataUpdateEvent.java index 7e405d37..a64f878b 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/WicketLiveDataUpdateEvent.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/livedata/WicketLiveDataUpdateEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/JsonSelection.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/JsonSelection.java index 5a51c52a..ead1e62c 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/JsonSelection.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/JsonSelection.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/JsonSelectionEvent.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/JsonSelectionEvent.java index 97232b0b..3de426c6 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/JsonSelectionEvent.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/JsonSelectionEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionBehavior.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionBehavior.java index 4a0b4be4..bc34fac0 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionBehavior.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionProcessor.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionProcessor.java index fd2ad16e..8cc65dfa 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionProcessor.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/SelectionProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/WicketSelectionEvent.java b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/WicketSelectionEvent.java index 371dfbc3..219a0149 100644 --- a/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/WicketSelectionEvent.java +++ b/wicket/wicked-charts-wicket7/src/main/java/de/adesso/wickedcharts/wicket7/highcharts/features/selection/WicketSelectionEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/resources/NOTICE b/wicket/wicked-charts-wicket7/src/main/resources/NOTICE index dcc02470..f014c6b5 100644 --- a/wicket/wicked-charts-wicket7/src/main/resources/NOTICE +++ b/wicket/wicked-charts-wicket7/src/main/resources/NOTICE @@ -1,4 +1,4 @@ - Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket7/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties b/wicket/wicked-charts-wicket7/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties index 2fda2d65..4ad40c58 100644 --- a/wicket/wicked-charts-wicket7/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties +++ b/wicket/wicked-charts-wicket7/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties @@ -1,5 +1,5 @@ # -# Copyright 2012-2018 Wicked Charts (tom.hombergs@gmail.com) +# Copyright 2012-2019 Wicked Charts (tom.hombergs@gmail.com) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptExpressionSendingAjaxBehavior.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptExpressionSendingAjaxBehavior.java index 0dd7ed9d..cba9d02f 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptExpressionSendingAjaxBehavior.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptExpressionSendingAjaxBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptResourceRegistry.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptResourceRegistry.java index 2a5b2a8d..29a3dd9e 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptResourceRegistry.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/JavaScriptResourceRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/Chart.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/Chart.java index b820c41d..76d31d89 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/Chart.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/Chart.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/JsonRendererFactory.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/JsonRendererFactory.java index 5877dd7a..461166cb 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/JsonRendererFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/features/basic/ChartBehavior.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/features/basic/ChartBehavior.java index fd61fcfc..87aa9747 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/features/basic/ChartBehavior.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/chartjs/features/basic/ChartBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/Chart.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/Chart.java index 84a7d49c..583f758b 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/Chart.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/Chart.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/JsonRendererFactory.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/JsonRendererFactory.java index 3b218c15..95fc54e1 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/JsonRendererFactory.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/JsonRendererFactory.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/basic/ChartBehavior.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/basic/ChartBehavior.java index 2d186646..d32b9acb 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/basic/ChartBehavior.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/basic/ChartBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/drilldown/DrilldownProcessor.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/drilldown/DrilldownProcessor.java index 624da6f1..5b0aa027 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/drilldown/DrilldownProcessor.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/drilldown/DrilldownProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/global/GlobalProcessor.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/global/GlobalProcessor.java index f2fa352f..a7bd9fa5 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/global/GlobalProcessor.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/global/GlobalProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionBehavior.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionBehavior.java index 6d00359e..fba4c1c7 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionBehavior.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionProcessor.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionProcessor.java index d5f22373..a4cbb89e 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionProcessor.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/InteractionProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/WicketInteractionEvent.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/WicketInteractionEvent.java index 97b50493..0370cfd5 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/WicketInteractionEvent.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/interaction/WicketInteractionEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataAjaxBehavior.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataAjaxBehavior.java index 5fd19e93..d4761797 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataAjaxBehavior.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataAjaxBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataFunction.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataFunction.java index ab636226..ecbee4b2 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataFunction.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataFunction.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataProcessor.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataProcessor.java index 42ea6307..63330f64 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataProcessor.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/LiveDataProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/WicketLiveDataUpdateEvent.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/WicketLiveDataUpdateEvent.java index b0cc1c4f..dff1b0d0 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/WicketLiveDataUpdateEvent.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/livedata/WicketLiveDataUpdateEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/JsonSelection.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/JsonSelection.java index 4c020879..0dd7a739 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/JsonSelection.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/JsonSelection.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/JsonSelectionEvent.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/JsonSelectionEvent.java index c1d0ec5d..ed1db042 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/JsonSelectionEvent.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/JsonSelectionEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionBehavior.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionBehavior.java index cc80137a..cc7af941 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionBehavior.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionBehavior.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionProcessor.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionProcessor.java index 3aacf14c..3d3ea0db 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionProcessor.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/SelectionProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/WicketSelectionEvent.java b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/WicketSelectionEvent.java index aff7e97e..1e9dd0bd 100644 --- a/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/WicketSelectionEvent.java +++ b/wicket/wicked-charts-wicket8/src/main/java/de/adesso/wickedcharts/wicket8/highcharts/features/selection/WicketSelectionEvent.java @@ -1,5 +1,5 @@ /** - * Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/resources/NOTICE b/wicket/wicked-charts-wicket8/src/main/resources/NOTICE index dcc02470..f014c6b5 100644 --- a/wicket/wicked-charts-wicket8/src/main/resources/NOTICE +++ b/wicket/wicked-charts-wicket8/src/main/resources/NOTICE @@ -1,4 +1,4 @@ - Copyright 2012-2018 Wicked Charts (http://github.com/adessoAG/wicked-charts) + Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/wicket/wicked-charts-wicket8/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties b/wicket/wicked-charts-wicket8/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties index 2fda2d65..4ad40c58 100644 --- a/wicket/wicked-charts-wicket8/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties +++ b/wicket/wicked-charts-wicket8/src/main/resources/de/adesso/wickedcharts/highcharts/options/LanguageOptions_de.properties @@ -1,5 +1,5 @@ # -# Copyright 2012-2018 Wicked Charts (tom.hombergs@gmail.com) +# Copyright 2012-2019 Wicked Charts (tom.hombergs@gmail.com) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 77e4e7519044cddd8e72324fbf9d888549073029 Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Tue, 12 Feb 2019 16:18:51 +0100 Subject: [PATCH 34/38] set appengine version --- showcase/build.gradle | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/showcase/build.gradle b/showcase/build.gradle index a47deb86..3b33d2e8 100644 --- a/showcase/build.gradle +++ b/showcase/build.gradle @@ -34,15 +34,11 @@ processResources { } dependencies { - compile 'com.google.appengine:appengine-api-1.0-sdk:+' + compile 'com.google.appengine:appengine-api-1.0-sdk:1.9.53' - testCompile 'com.google.appengine:appengine-testing:+' - testCompile 'com.google.appengine:appengine-api-stubs:+' - testCompile 'com.google.appengine:appengine-tools-sdk:+' - //vintage module is needed because of WicketTester testCompile group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junit_version - + testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junit_version testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junit_version } From 4e206817e5652f511bff4ec2bce742fd44a0a38f Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Wed, 13 Feb 2019 09:53:50 +0100 Subject: [PATCH 35/38] set both gradle versions to 4.10 --- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- showcase/gradle.properties | 2 +- .../showcase/boot/Application.java | 39 +++++++++++++++++++ .../src/main/webapp/WEB-INF/faces-config.xml | 10 +++++ 5 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/boot/Application.java create mode 100644 showcase/wicked-charts-showcase-jsf21/src/main/webapp/WEB-INF/faces-config.xml diff --git a/build.gradle b/build.gradle index 320513d5..b5ae2983 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ buildscript { } } dependencies { - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.6.2" + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' + classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.9.1" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dc02fa19..8eb1ad7c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip \ No newline at end of file diff --git a/showcase/gradle.properties b/showcase/gradle.properties index 0fed1991..d8e23c56 100644 --- a/showcase/gradle.properties +++ b/showcase/gradle.properties @@ -1,4 +1,4 @@ spring_boot_version=2.1.2.RELEASE spring_version=5.1.4.RELEASE -wickedcharts_version=3.2.0 +wickedcharts_version=3.2.0-SNAPSHOT junit_version=5.4.0 diff --git a/showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/boot/Application.java b/showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/boot/Application.java new file mode 100644 index 00000000..6362e95c --- /dev/null +++ b/showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/boot/Application.java @@ -0,0 +1,39 @@ +package de.adesso.wickedcharts.showcase.boot; + + +import org.ocpsoft.rewrite.servlet.RewriteFilter; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.boot.web.servlet.ServletRegistrationBean; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; + +import javax.faces.webapp.FacesServlet; +import javax.servlet.DispatcherType; +import java.util.EnumSet; + +@EnableAutoConfiguration +@ComponentScan("de.adesso.wickedcharts.showcase") +public class Application extends SpringBootServletInitializer { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + + @Bean + public ServletRegistrationBean servletRegistrationBean() { + FacesServlet servlet = new FacesServlet(); + return new ServletRegistrationBean<>(servlet, "*.jsf"); + } + + @Bean + public FilterRegistrationBean rewriteFilter() { + FilterRegistrationBean rwFilter = new FilterRegistrationBean<>(new RewriteFilter()); + rwFilter.setDispatcherTypes(EnumSet.of(DispatcherType.FORWARD, DispatcherType.REQUEST, + DispatcherType.ASYNC, DispatcherType.ERROR)); + rwFilter.addUrlPatterns("/*"); + return rwFilter; + } +} \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/WEB-INF/faces-config.xml b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/WEB-INF/faces-config.xml new file mode 100644 index 00000000..c47056b3 --- /dev/null +++ b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/WEB-INF/faces-config.xml @@ -0,0 +1,10 @@ + + + + org.springframework.web.jsf.el.SpringBeanFacesELResolver + + \ No newline at end of file From 75e1a61bc5914ebd693e59bb8978dd31a71aee9a Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Wed, 13 Feb 2019 10:03:01 +0100 Subject: [PATCH 36/38] removed unneeded class --- .../showcase/boot/Application.java | 39 ------------------- .../src/main/webapp/WEB-INF/faces-config.xml | 10 ----- 2 files changed, 49 deletions(-) delete mode 100644 showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/boot/Application.java delete mode 100644 showcase/wicked-charts-showcase-jsf21/src/main/webapp/WEB-INF/faces-config.xml diff --git a/showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/boot/Application.java b/showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/boot/Application.java deleted file mode 100644 index 6362e95c..00000000 --- a/showcase/wicked-charts-showcase-jsf21/src/main/java/de/adesso/wickedcharts/showcase/boot/Application.java +++ /dev/null @@ -1,39 +0,0 @@ -package de.adesso.wickedcharts.showcase.boot; - - -import org.ocpsoft.rewrite.servlet.RewriteFilter; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.boot.web.servlet.ServletRegistrationBean; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; - -import javax.faces.webapp.FacesServlet; -import javax.servlet.DispatcherType; -import java.util.EnumSet; - -@EnableAutoConfiguration -@ComponentScan("de.adesso.wickedcharts.showcase") -public class Application extends SpringBootServletInitializer { - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - - @Bean - public ServletRegistrationBean servletRegistrationBean() { - FacesServlet servlet = new FacesServlet(); - return new ServletRegistrationBean<>(servlet, "*.jsf"); - } - - @Bean - public FilterRegistrationBean rewriteFilter() { - FilterRegistrationBean rwFilter = new FilterRegistrationBean<>(new RewriteFilter()); - rwFilter.setDispatcherTypes(EnumSet.of(DispatcherType.FORWARD, DispatcherType.REQUEST, - DispatcherType.ASYNC, DispatcherType.ERROR)); - rwFilter.addUrlPatterns("/*"); - return rwFilter; - } -} \ No newline at end of file diff --git a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/WEB-INF/faces-config.xml b/showcase/wicked-charts-showcase-jsf21/src/main/webapp/WEB-INF/faces-config.xml deleted file mode 100644 index c47056b3..00000000 --- a/showcase/wicked-charts-showcase-jsf21/src/main/webapp/WEB-INF/faces-config.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - org.springframework.web.jsf.el.SpringBeanFacesELResolver - - \ No newline at end of file From 12106ed7d48296c61a16fb775a6221a6937e26fd Mon Sep 17 00:00:00 2001 From: maximAtanasov Date: Wed, 20 Feb 2019 15:03:16 +0100 Subject: [PATCH 37/38] added csv to exporting options --- highcharts-wrapper/build.gradle | 2 + .../highcharts/options/CsvOptions.java | 16 +++++ .../highcharts/options/ExportingOptions.java | 71 ++----------------- .../options/interaction/Selection.java | 2 +- 4 files changed, 26 insertions(+), 65 deletions(-) create mode 100644 highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/CsvOptions.java diff --git a/highcharts-wrapper/build.gradle b/highcharts-wrapper/build.gradle index b94fcb03..60ca3b69 100644 --- a/highcharts-wrapper/build.gradle +++ b/highcharts-wrapper/build.gradle @@ -1,4 +1,6 @@ dependencies { + compileOnly 'org.projectlombok:lombok:1.18.6' + annotationProcessor 'org.projectlombok:lombok:1.18.6' compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.1' compile 'com.fasterxml.jackson.core:jackson-core:2.8.1' compile 'com.fasterxml.jackson.core:jackson-databind:2.8.1' diff --git a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/CsvOptions.java b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/CsvOptions.java new file mode 100644 index 00000000..b056c3cb --- /dev/null +++ b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/CsvOptions.java @@ -0,0 +1,16 @@ +package de.adesso.wickedcharts.highcharts.options; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +@Data +@Accessors(chain = true) +public class CsvOptions implements Serializable { + private Function columnHeaderFormatter; + private String dateFormat; + private String decimalPoint; + private String itemDelimiter; + private String lineDelimiter = "."; +} diff --git a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ExportingOptions.java b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ExportingOptions.java index 67771791..a5503401 100644 --- a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ExportingOptions.java +++ b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/ExportingOptions.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,6 +14,9 @@ */ package de.adesso.wickedcharts.highcharts.options; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; /** @@ -24,6 +27,8 @@ * @author Tom Hombergs (tom.hombergs@gmail.com) * */ +@Accessors(chain = true) +@Data public class ExportingOptions implements Serializable { private static final long serialVersionUID = 1L; @@ -46,67 +51,5 @@ public static long getSerialversionuid() { private ExportingButtons buttons; - public ExportingButtons getButtons() { - return this.buttons; - } - - public Boolean getEnabled() { - return this.enabled; - } - - public Boolean getEnableImages() { - return this.enableImages; - } - - public String getFilename() { - return this.filename; - } - - public ExportingMimeType getType() { - return this.type; - } - - public String getUrl() { - return this.url; - } - - public Integer getWidth() { - return this.width; - } - - public ExportingOptions setButtons(final ExportingButtons buttons) { - this.buttons = buttons; - return this; - } - - public ExportingOptions setEnabled(final Boolean enabled) { - this.enabled = enabled; - return this; - } - - public ExportingOptions setEnableImages(final Boolean enableImages) { - this.enableImages = enableImages; - return this; - } - - public ExportingOptions setFilename(final String filename) { - this.filename = filename; - return this; - } - - public ExportingOptions setType(final ExportingMimeType type) { - this.type = type; - return this; - } - - public ExportingOptions setUrl(final String url) { - this.url = url; - return this; - } - - public ExportingOptions setWidth(final Integer width) { - this.width = width; - return this; - } - + private CsvOptions csv; } diff --git a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/interaction/Selection.java b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/interaction/Selection.java index a332b50c..02d67c47 100644 --- a/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/interaction/Selection.java +++ b/highcharts-wrapper/src/main/java/de/adesso/wickedcharts/highcharts/options/interaction/Selection.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2012-2019 Wicked Charts (http://github.com/adessoAG/wicked-charts) * * Licensed under the Apache License, Version 2.0 (the "License"); From 90a42e66f462f04dd04a35b1d358a3a07d8e137c Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Sun, 5 May 2019 16:10:35 +0200 Subject: [PATCH 38/38] adjust compile level for older wicket modules --- README.md | 36 +++++++++---------- build.gradle | 1 - .../gradle.properties | 2 +- wicket/wicked-charts-wicket14/build.gradle | 5 +++ wicket/wicked-charts-wicket15/build.gradle | 5 +++ wicket/wicked-charts-wicket6/build.gradle | 7 +++- wicket/wicked-charts-wicket7/build.gradle | 6 +++- wicket/wicked-charts-wicket8/build.gradle | 6 +++- 8 files changed, 45 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 218b15bc..2ab51acc 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.2.0' } ``` @@ -54,7 +54,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket8 - 3.1.0 + 3.2.0 pom @@ -69,7 +69,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket7:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-wicket7:3.2.0' } ``` @@ -78,7 +78,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket7 - 3.1.0 + 3.2.0 pom ``` @@ -92,7 +92,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket6:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-wicket6:3.2.0' } ``` @@ -101,7 +101,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket6 - 3.1.0 + 3.2.0 pom ``` @@ -115,7 +115,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket15:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-wicket15:3.2.0' } ``` @@ -124,7 +124,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket15 - 3.1.0 + 3.2.0 pom ``` @@ -138,7 +138,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket14:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-wicket14:3.2.0' } ``` @@ -147,7 +147,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket14 - 3.1.0 + 3.2.0 pom ``` @@ -161,7 +161,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.1.0' + compile 'de.adesso.wicked-charts:wicked-charts-jsf21:3.2.0' } ``` @@ -170,7 +170,7 @@ Maven: de.adesso.wicked-charts wicked-charts-jsf21 - 3.1.0 + 3.2.0 pom ``` @@ -186,8 +186,8 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:chartjs-wrapper:3.1.0' - compile 'de.adesso.wicked-charts:highcharts-wrapper:3.1.0' + compile 'de.adesso.wicked-charts:chartjs-wrapper:3.2.0' + compile 'de.adesso.wicked-charts:highcharts-wrapper:3.2.0' } ``` @@ -197,14 +197,14 @@ Maven: de.adesso.wicked-charts chartjs-wrapper - 3.1.0 + 3.2.0 pom de.adesso.wicked-charts highcharts-wrapper - 3.1.0 + 3.2.0 pom @@ -219,7 +219,7 @@ repositories { } dependencies { - compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.2.0-SNAPSHOT' + compile 'de.adesso.wicked-charts:wicked-charts-wicket8:3.3.0-SNAPSHOT' } ``` @@ -228,7 +228,7 @@ Maven: de.adesso.wicked-charts wicked-charts-wicket8 - 3.2.0-SNAPSHOT + 3.3.0-SNAPSHOT pom ``` diff --git a/build.gradle b/build.gradle index b5ae2983..086e6991 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,6 @@ subprojects { // run gradle with "-Dsnapshot=true" to automatically append "-SNAPSHOT" to the version version = '3.2.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "") - sourceCompatibility = 1.8 ext { bintrayUser = System.getProperty("bintray.user") diff --git a/showcase/wicked-charts-showcase-wicket8/gradle.properties b/showcase/wicked-charts-showcase-wicket8/gradle.properties index 4f58cb91..12b76953 100644 --- a/showcase/wicked-charts-showcase-wicket8/gradle.properties +++ b/showcase/wicked-charts-showcase-wicket8/gradle.properties @@ -1 +1 @@ -wicket_version=8.3.0 +wicket_version=8.4.0 diff --git a/wicket/wicked-charts-wicket14/build.gradle b/wicket/wicked-charts-wicket14/build.gradle index 81635352..388af782 100644 --- a/wicket/wicked-charts-wicket14/build.gradle +++ b/wicket/wicked-charts-wicket14/build.gradle @@ -2,4 +2,9 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') compile 'org.apache.wicket:wicket:1.4.23' +} + +compileJava { + sourceCompatibility = 1.6 + targetCompatibility = 1.6 } \ No newline at end of file diff --git a/wicket/wicked-charts-wicket15/build.gradle b/wicket/wicked-charts-wicket15/build.gradle index 1b64774f..269b3f96 100644 --- a/wicket/wicked-charts-wicket15/build.gradle +++ b/wicket/wicked-charts-wicket15/build.gradle @@ -2,4 +2,9 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') compile 'org.apache.wicket:wicket-core:1.5.17' +} + +compileJava { + sourceCompatibility = 1.6 + targetCompatibility = 1.6 } \ No newline at end of file diff --git a/wicket/wicked-charts-wicket6/build.gradle b/wicket/wicked-charts-wicket6/build.gradle index e72b9b03..8980ca8b 100644 --- a/wicket/wicked-charts-wicket6/build.gradle +++ b/wicket/wicked-charts-wicket6/build.gradle @@ -1,5 +1,10 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') - compile 'org.apache.wicket:wicket-core:6.29.0' + compile 'org.apache.wicket:wicket-core:6.30.0' +} + +compileJava { + sourceCompatibility = 1.6 + targetCompatibility = 1.6 } \ No newline at end of file diff --git a/wicket/wicked-charts-wicket7/build.gradle b/wicket/wicked-charts-wicket7/build.gradle index e2ba9d20..91ff110f 100644 --- a/wicket/wicked-charts-wicket7/build.gradle +++ b/wicket/wicked-charts-wicket7/build.gradle @@ -1,6 +1,10 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') - compile 'org.apache.wicket:wicket-core:7.10.0' + compile 'org.apache.wicket:wicket-core:7.12.0' } +compileJava { + sourceCompatibility = 1.7 + targetCompatibility = 1.7 +} \ No newline at end of file diff --git a/wicket/wicked-charts-wicket8/build.gradle b/wicket/wicked-charts-wicket8/build.gradle index 08d7b581..c4bce280 100644 --- a/wicket/wicked-charts-wicket8/build.gradle +++ b/wicket/wicked-charts-wicket8/build.gradle @@ -1,6 +1,10 @@ dependencies { compile project(':highcharts-wrapper') compile project(':chartjs-wrapper') - compile 'org.apache.wicket:wicket-core:8.1.0' + compile 'org.apache.wicket:wicket-core:8.4.0' } +compileJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} \ No newline at end of file