Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Bar.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.bar.BarSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.bar.BarSeries;

public class Bar extends CartesianCoordChart<Bar, BarSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Boxplot.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.boxplot.BoxplotSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.boxplot.BoxplotSeries;

public class Boxplot extends CartesianCoordChart<Boxplot, BoxplotSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Candlestick.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.candlestick.CandlestickSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.candlestick.CandlestickSeries;

public class Candlestick extends CartesianCoordChart<Candlestick, CandlestickSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Funnel.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.funnel.FunnelSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.funnel.FunnelSeries;

public class Funnel extends Chart<Funnel, FunnelSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Gauge.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.gauge.GaugeSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.gauge.GaugeSeries;

public class Gauge extends Chart<Gauge, GaugeSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Graph.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.graph.GraphSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.graph.GraphSeries;

public class Graph extends Chart<Graph, GraphSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/icepear/echarts/Heatmap.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.icepear.echarts;

import java.io.Serializable;

import org.icepear.echarts.charts.heatmap.HeatmapSeries;
import org.icepear.echarts.components.coord.SplitArea;
import org.icepear.echarts.components.coord.cartesian.CategoryAxis;
import org.icepear.echarts.components.coord.cartesian.ValueAxis;

import java.io.Serializable;
import org.icepear.echarts.components.coord.SplitArea;

public class Heatmap extends CartesianCoordChart<Heatmap, HeatmapSeries> implements Serializable {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Line.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.line.LineSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.line.LineSeries;

public class Line extends CartesianCoordChart<Line, LineSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/icepear/echarts/Option.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@

import java.io.Serializable;

import lombok.AccessLevel;
import lombok.Data;
import lombok.Setter;
import lombok.experimental.Accessors;

import org.icepear.echarts.origin.component.axisPointer.AxisPointerOption;
import org.icepear.echarts.origin.component.dataZoom.DataZoomOption;
import org.icepear.echarts.origin.component.dataset.DatasetOption;
import org.icepear.echarts.origin.component.dataZoom.DataZoomOption;
import org.icepear.echarts.origin.component.legend.LegendOption;
import org.icepear.echarts.origin.component.title.TitleOption;
import org.icepear.echarts.origin.component.toolbox.ToolboxOption;
Expand All @@ -29,6 +24,11 @@
import org.icepear.echarts.origin.util.MediaUnitOption;
import org.icepear.echarts.origin.util.SeriesOption;

import lombok.AccessLevel;
import lombok.Data;
import lombok.experimental.Accessors;
import lombok.Setter;

@Accessors(chain = true)
@Data
public class Option implements EChartsOption, Serializable {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Parallel.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.parallel.ParallelSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.parallel.ParallelSeries;

public class Parallel extends ParallelCoordChart<Parallel, ParallelSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Pie.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.pie.PieSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.pie.PieSeries;

public class Pie extends Chart<Pie, PieSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/PolarBar.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.bar.BarSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.bar.BarSeries;

public class PolarBar extends PolarCoordChart<PolarBar, BarSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/PolarCoordChart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.icepear.echarts;

import java.io.Serializable;

import org.icepear.echarts.components.coord.polar.CategoryAngleAxis;
import org.icepear.echarts.components.coord.polar.CategoryRadiusAxis;
import org.icepear.echarts.components.coord.polar.PolarAxis;
Expand All @@ -9,8 +11,6 @@
import org.icepear.echarts.origin.coord.polar.RadiusAxisOption;
import org.icepear.echarts.origin.util.SeriesOption;

import java.io.Serializable;

public abstract class PolarCoordChart<T extends Chart<?, ?>, E extends SeriesOption> extends Chart<T, E> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/PolarLine.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.line.LineSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.line.LineSeries;

public class PolarLine extends PolarCoordChart<PolarLine, LineSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/PolarScatter.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.scatter.ScatterSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.scatter.ScatterSeries;

public class PolarScatter extends PolarCoordChart<PolarScatter, ScatterSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Radar.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.radar.RadarSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.radar.RadarSeries;

public class Radar extends RadarCoordChart<Radar, RadarSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/RadarCoordChart.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.icepear.echarts;

import java.io.Serializable;

import org.icepear.echarts.components.coord.radar.RadarAxis;
import org.icepear.echarts.components.coord.radar.RadarIndicator;
import org.icepear.echarts.origin.util.SeriesOption;

import java.io.Serializable;

public abstract class RadarCoordChart<T extends Chart<?, ?>, E extends SeriesOption> extends Chart<T, E> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Sankey.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.sankey.SankeySeries;

import java.io.Serializable;

import org.icepear.echarts.charts.sankey.SankeySeries;

public class Sankey extends Chart<Sankey, SankeySeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Scatter.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.scatter.ScatterSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.scatter.ScatterSeries;

public class Scatter extends CartesianCoordChart<Scatter, ScatterSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/SingleCoordChart.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.icepear.echarts;

import java.io.Serializable;

import org.icepear.echarts.origin.coord.single.SingleAxisOption;
import org.icepear.echarts.origin.util.SeriesOption;

import java.io.Serializable;

public abstract class SingleCoordChart<T extends Chart<?, ?>, E extends SeriesOption> extends Chart<T, E> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Sunburst.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.sunburst.SunburstSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.sunburst.SunburstSeries;

public class Sunburst extends Chart<Sunburst, SunburstSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/icepear/echarts/ThemeRiver.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.themeRiver.ThemeRiverSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.themeRiver.ThemeRiverSeries;

public class ThemeRiver extends SingleCoordChart<ThemeRiver, ThemeRiverSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand All @@ -16,4 +16,4 @@ public ThemeRiver() {
public ThemeRiverSeries createSeries() {
return new ThemeRiverSeries().setType("themeRiver");
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Tree.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.tree.TreeSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.tree.TreeSeries;

public class Tree extends Chart<Tree, TreeSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/icepear/echarts/Treemap.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.icepear.echarts;

import org.icepear.echarts.charts.treemap.TreemapSeries;

import java.io.Serializable;

import org.icepear.echarts.charts.treemap.TreemapSeries;

public class Treemap extends Chart<Treemap, TreemapSeries> implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down