options.colors array.
- */
- public abstract void setColor(Color color);
-
/**
* @see #setConnectNulls(Boolean)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/Axis.java b/model/src/main/java/com/vaadin/addon/charts/model/Axis.java
index 3da601e030a..c7e4ef3a2d4 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/Axis.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/Axis.java
@@ -320,16 +320,6 @@ public abstract void setDateTimeLabelFormats(
*/
public abstract void setFloor(Number floor);
- /**
- * @see #setGridLineColor(Color)
- */
- public abstract Color getGridLineColor();
-
- /**
- * Color of the grid lines extending the ticks across the plot area.
- */
- public abstract void setGridLineColor(Color gridLineColor);
-
/**
* @see #setGridLineDashStyle(DashStyle)
*/
@@ -340,16 +330,6 @@ public abstract void setDateTimeLabelFormats(
*/
public abstract void setGridLineDashStyle(DashStyle gridLineDashStyle);
- /**
- * @see #setGridLineWidth(Number)
- */
- public abstract Number getGridLineWidth();
-
- /**
- * The width of the grid lines extending the ticks across the plot area.
- */
- public abstract void setGridLineWidth(Number gridLineWidth);
-
/**
* @see #setId(String)
*/
@@ -424,16 +404,6 @@ public abstract void setDateTimeLabelFormats(
*/
public abstract void setMinTickInterval(Number minTickInterval);
- /**
- * @see #setMinorGridLineColor(Color)
- */
- public abstract Color getMinorGridLineColor();
-
- /**
- * Color of the minor, secondary grid lines.
- */
- public abstract void setMinorGridLineColor(Color minorGridLineColor);
-
/**
* @see #setMinorGridLineDashStyle(DashStyle)
*/
@@ -444,16 +414,6 @@ public abstract void setDateTimeLabelFormats(
*/
public abstract void setMinorGridLineDashStyle(DashStyle minorGridLineDashStyle);
- /**
- * @see #setMinorGridLineWidth(Number)
- */
- public abstract Number getMinorGridLineWidth();
-
- /**
- * Width of the minor, secondary grid lines.
- */
- public abstract void setMinorGridLineWidth(Number minorGridLineWidth);
-
/**
* @see #setMinorTickColor(Color)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/Background.java b/model/src/main/java/com/vaadin/addon/charts/model/Background.java
index da4a48fc597..3837e93a090 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/Background.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/Background.java
@@ -28,61 +28,10 @@
* the Pane-configuration object.
*/
public class Background extends AbstractConfigurationObject {
- private Color backgroundColor;
- private Color borderColor;
- private Number borderWidth;
private String outerRadius;
private String innerRadius;
private BackgroundShape shape;
- /**
- * @see #setBackgroundColor(Color)
- */
- public Color getBackgroundColor() {
- return backgroundColor;
- }
-
- /**
- * Sets the background color
- *
- * @param backgroundColor
- */
- public void setBackgroundColor(Color backgroundColor) {
- this.backgroundColor = backgroundColor;
- }
-
- /**
- * @see #setBorderColor(Color)
- */
- public Color getBorderColor() {
- return borderColor;
- }
-
- /**
- * Sets the border color
- *
- * @param borderColor
- */
- public void setBorderColor(Color borderColor) {
- this.borderColor = borderColor;
- }
-
- /**
- * @see #setBorderWidth(Number)
- */
- public Number getBorderWidth() {
- return borderWidth;
- }
-
- /**
- * Sets the width of the border
- *
- * @param borderWidth
- */
- public void setBorderWidth(Number borderWidth) {
- this.borderWidth = borderWidth;
- }
-
/**
* Sets the outer radius of the circular shaped background using a string
* representation of a percentage, e.g. "110%". The percentage is relative
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/ColumnOptions.java b/model/src/main/java/com/vaadin/addon/charts/model/ColumnOptions.java
index 020b19e6796..b5984726f99 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/ColumnOptions.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/ColumnOptions.java
@@ -81,19 +81,6 @@ public abstract class ColumnOptions extends AbstractPlotOptions {
*/
public abstract void setBorderWidth(Number borderWidth);
- /**
- * @see #setColor(Color)
- */
- public abstract Color getColor();
-
- /**
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- */
- public abstract void setColor(Color color);
-
/**
* @see #setColorByPoint(Boolean)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/ContextButton.java b/model/src/main/java/com/vaadin/addon/charts/model/ContextButton.java
index c9273099f61..ca8dfbc0750 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/ContextButton.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/ContextButton.java
@@ -1,6 +1,5 @@
package com.vaadin.addon.charts.model;
-import com.vaadin.addon.charts.model.style.Color;
import com.vaadin.addon.charts.model.style.ButtonTheme;
/**
* Options for the export button.
@@ -12,10 +11,6 @@ public class ContextButton extends AbstractConfigurationObject {
private Number height;
private ContextButtonMenuItem[] menuItems;
private String symbol;
- private Color symbolFill;
- private Number symbolSize;
- private Color symbolStroke;
- private Number symbolStrokeWidth;
private Number symbolX;
private Number symbolY;
private String text;
@@ -123,72 +118,6 @@ public void setSymbol(String symbol) {
this.symbol = symbol;
}
- /**
- * @see #setSymbolFill(Color)
- */
- public Color getSymbolFill() {
- return symbolFill;
- }
-
- /**
- * See navigation.buttonOptions =>
- * symbolFill.
- * - * Defaults to: #666666 - */ - public void setSymbolFill(Color symbolFill) { - this.symbolFill = symbolFill; - } - - /** - * @see #setSymbolSize(Number) - */ - public Number getSymbolSize() { - return symbolSize; - } - - /** - * The pixel size of the symbol on the button. - *
- * Defaults to: 14 - */ - public void setSymbolSize(Number symbolSize) { - this.symbolSize = symbolSize; - } - - /** - * @see #setSymbolStroke(Color) - */ - public Color getSymbolStroke() { - return symbolStroke; - } - - /** - * The color of the symbol's stroke or line. - *
- * Defaults to: #666666 - */ - public void setSymbolStroke(Color symbolStroke) { - this.symbolStroke = symbolStroke; - } - - /** - * @see #setSymbolStrokeWidth(Number) - */ - public Number getSymbolStrokeWidth() { - return symbolStrokeWidth; - } - - /** - * The pixel stroke width of the symbol on the button. - *
- * Defaults to: 1 - */ - public void setSymbolStrokeWidth(Number symbolStrokeWidth) { - this.symbolStrokeWidth = symbolStrokeWidth; - } - /** * @see #setSymbolX(Number) */ diff --git a/model/src/main/java/com/vaadin/addon/charts/model/Credits.java b/model/src/main/java/com/vaadin/addon/charts/model/Credits.java index de9dc921050..3be887006d0 100644 --- a/model/src/main/java/com/vaadin/addon/charts/model/Credits.java +++ b/model/src/main/java/com/vaadin/addon/charts/model/Credits.java @@ -1,6 +1,4 @@ package com.vaadin.addon.charts.model; - -import com.vaadin.addon.charts.model.style.Style; /** * Highchart by default puts a credits label in the lower right corner of the * chart. This can be changed using these options. @@ -10,7 +8,6 @@ public class Credits extends AbstractConfigurationObject { private Boolean enabled; private String href; private Position position; - private Style style; private String text; public Credits() { @@ -69,26 +66,6 @@ public void setPosition(Position position) { this.position = position; } - /** - * @see #setStyle(Style) - */ - public Style getStyle() { - if (style == null) { - style = new Style(); - } - return style; - } - - /** - * CSS styles for the credits label. - *
- * Defaults to: { "cursor": "pointer", "color": "#999999", "fontSize": - * "10px" } - */ - public void setStyle(Style style) { - this.style = style; - } - public Credits(String text) { this.text = text; } diff --git a/model/src/main/java/com/vaadin/addon/charts/model/DataLabels.java b/model/src/main/java/com/vaadin/addon/charts/model/DataLabels.java index 6262705e1fb..70e5425c92b 100644 --- a/model/src/main/java/com/vaadin/addon/charts/model/DataLabels.java +++ b/model/src/main/java/com/vaadin/addon/charts/model/DataLabels.java @@ -1,7 +1,6 @@ package com.vaadin.addon.charts.model; import com.vaadin.addon.charts.model.style.Color; -import com.vaadin.addon.charts.model.style.Style; /** *
* Options for the series data labels, appearing next to each data point.
@@ -21,12 +20,9 @@ public class DataLabels extends AbstractDataLabels {
private HorizontalAlign align;
private Boolean allowOverlap;
- private Color backgroundColor;
- private Color borderColor;
private Number borderRadius;
private Number borderWidth;
private String className;
- private Color color;
private Boolean crop;
private Boolean defer;
private Boolean enabled;
@@ -38,7 +34,6 @@ public class DataLabels extends AbstractDataLabels {
private Number rotation;
private Boolean shadow;
private Shape shape;
- private Style style;
private Boolean useHTML;
private VerticalAlign verticalAlign;
private Number x;
@@ -93,35 +88,6 @@ public void setAllowOverlap(Boolean allowOverlap) {
this.allowOverlap = allowOverlap;
}
- /**
- * @see #setBackgroundColor(Color)
- */
- public Color getBackgroundColor() {
- return backgroundColor;
- }
-
- /**
- * The background color or gradient for the data label. Defaults to
- * undefined.
- */
- public void setBackgroundColor(Color backgroundColor) {
- this.backgroundColor = backgroundColor;
- }
-
- /**
- * @see #setBorderColor(Color)
- */
- public Color getBorderColor() {
- return borderColor;
- }
-
- /**
- * The border color for the data label. Defaults to undefined.
- */
- public void setBorderColor(Color borderColor) {
- this.borderColor = borderColor;
- }
-
/**
* @see #setBorderRadius(Number)
*/
@@ -174,20 +140,6 @@ public void setClassName(String className) {
this.className = className;
}
- /**
- * @see #setColor(Color)
- */
- public Color getColor() {
- return color;
- }
-
- /**
- * The text color for the data labels. Defaults to null.
- */
- public void setColor(Color color) {
- this.color = color;
- }
-
/**
* @see #setCrop(Boolean)
*/
@@ -376,35 +328,6 @@ public void setShape(Shape shape) {
this.shape = shape;
}
- /**
- * @see #setStyle(Style)
- */
- public Style getStyle() {
- if (style == null) {
- style = new Style();
- }
- return style;
- }
-
- /**
- * Styles for the label. The default color setting is
- * "contrast", which is a pseudo color that Highcharts picks up
- * and applies the maximum contrast to the underlying point item, for
- * example the bar in a bar chart. The textOutline is a pseudo
- * property that applies an outline of the given width with the given color,
- * which by default is the maximum contrast to the text. So a bright text
- * color will result in a black text outline for maximum readability on a
- * mixed background. In some cases, especially with grayscale text, the text
- * outline doesn't work well, in which cases it can be disabled by setting
- * it to "none".
- *
- * Defaults to: {"color": "contrast", "fontSize": "11px", "fontWeight":
- * "bold", "textOutline": "1px contrast" }
- */
- public void setStyle(Style style) {
- this.style = style;
- }
-
/**
* @see #setUseHTML(Boolean)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/DataLabelsFunnel.java b/model/src/main/java/com/vaadin/addon/charts/model/DataLabelsFunnel.java
index 315052a1da0..beee521158d 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/DataLabelsFunnel.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/DataLabelsFunnel.java
@@ -1,17 +1,13 @@
package com.vaadin.addon.charts.model;
import com.vaadin.addon.charts.model.style.Color;
-import com.vaadin.addon.charts.model.style.Style;
/**
*/
public class DataLabelsFunnel extends AbstractDataLabels {
- private Color backgroundColor;
- private Color borderColor;
private Number borderRadius;
private Number borderWidth;
private String className;
- private Color color;
private Color connectorColor;
private Number connectorPadding;
private Number connectorWidth;
@@ -28,7 +24,6 @@ public class DataLabelsFunnel extends AbstractDataLabels {
private Boolean shadow;
private Shape shape;
private Boolean softConnector;
- private Style style;
private Boolean useHTML;
private VerticalAlign verticalAlign;
private Number x;
@@ -38,35 +33,6 @@ public class DataLabelsFunnel extends AbstractDataLabels {
public DataLabelsFunnel() {
}
- /**
- * @see #setBackgroundColor(Color)
- */
- public Color getBackgroundColor() {
- return backgroundColor;
- }
-
- /**
- * The background color or gradient for the data label. Defaults to
- * undefined.
- */
- public void setBackgroundColor(Color backgroundColor) {
- this.backgroundColor = backgroundColor;
- }
-
- /**
- * @see #setBorderColor(Color)
- */
- public Color getBorderColor() {
- return borderColor;
- }
-
- /**
- * The border color for the data label. Defaults to undefined.
- */
- public void setBorderColor(Color borderColor) {
- this.borderColor = borderColor;
- }
-
/**
* @see #setBorderRadius(Number)
*/
@@ -119,20 +85,6 @@ public void setClassName(String className) {
this.className = className;
}
- /**
- * @see #setColor(Color)
- */
- public Color getColor() {
- return color;
- }
-
- /**
- * The text color for the data labels. Defaults to null.
- */
- public void setColor(Color color) {
- this.color = color;
- }
-
/**
* @see #setConnectorColor(Color)
*/
@@ -422,35 +374,6 @@ public void setSoftConnector(Boolean softConnector) {
this.softConnector = softConnector;
}
- /**
- * @see #setStyle(Style)
- */
- public Style getStyle() {
- if (style == null) {
- style = new Style();
- }
- return style;
- }
-
- /**
- * Styles for the label. The default color setting is
- * "contrast", which is a pseudo color that Highcharts picks up
- * and applies the maximum contrast to the underlying point item, for
- * example the bar in a bar chart. The textOutline is a pseudo
- * property that applies an outline of the given width with the given color,
- * which by default is the maximum contrast to the text. So a bright text
- * color will result in a black text outline for maximum readability on a
- * mixed background. In some cases, especially with grayscale text, the text
- * outline doesn't work well, in which cases it can be disabled by setting
- * it to "none".
- *
- * Defaults to: {"color": "contrast", "fontSize": "11px", "fontWeight":
- * "bold", "textOutline": "1px contrast" }
- */
- public void setStyle(Style style) {
- this.style = style;
- }
-
/**
* @see #setUseHTML(Boolean)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/DataLabelsRange.java b/model/src/main/java/com/vaadin/addon/charts/model/DataLabelsRange.java
index 7aa94f81711..2d3131308cd 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/DataLabelsRange.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/DataLabelsRange.java
@@ -1,7 +1,4 @@
package com.vaadin.addon.charts.model;
-
-import com.vaadin.addon.charts.model.style.Color;
-import com.vaadin.addon.charts.model.style.Style;
/**
* Extended data labels for range series types. Range series data labels have no
* x and y options. Instead, they have
@@ -13,12 +10,9 @@ public class DataLabelsRange extends AbstractDataLabels {
private HorizontalAlign align;
private Boolean allowOverlap;
- private Color backgroundColor;
- private Color borderColor;
private Number borderRadius;
private Number borderWidth;
private String className;
- private Color color;
private Boolean crop;
private Boolean defer;
private Boolean enabled;
@@ -30,7 +24,6 @@ public class DataLabelsRange extends AbstractDataLabels {
private Number rotation;
private Boolean shadow;
private Shape shape;
- private Style style;
private Boolean useHTML;
private VerticalAlign verticalAlign;
private Number xHigh;
@@ -82,35 +75,6 @@ public void setAllowOverlap(Boolean allowOverlap) {
this.allowOverlap = allowOverlap;
}
- /**
- * @see #setBackgroundColor(Color)
- */
- public Color getBackgroundColor() {
- return backgroundColor;
- }
-
- /**
- * The background color or gradient for the data label. Defaults to
- * undefined.
- */
- public void setBackgroundColor(Color backgroundColor) {
- this.backgroundColor = backgroundColor;
- }
-
- /**
- * @see #setBorderColor(Color)
- */
- public Color getBorderColor() {
- return borderColor;
- }
-
- /**
- * The border color for the data label. Defaults to undefined.
- */
- public void setBorderColor(Color borderColor) {
- this.borderColor = borderColor;
- }
-
/**
* @see #setBorderRadius(Number)
*/
@@ -163,20 +127,6 @@ public void setClassName(String className) {
this.className = className;
}
- /**
- * @see #setColor(Color)
- */
- public Color getColor() {
- return color;
- }
-
- /**
- * The text color for the data labels. Defaults to null.
- */
- public void setColor(Color color) {
- this.color = color;
- }
-
/**
* @see #setCrop(Boolean)
*/
@@ -365,35 +315,6 @@ public void setShape(Shape shape) {
this.shape = shape;
}
- /**
- * @see #setStyle(Style)
- */
- public Style getStyle() {
- if (style == null) {
- style = new Style();
- }
- return style;
- }
-
- /**
- * Styles for the label. The default color setting is
- * "contrast", which is a pseudo color that Highcharts picks up
- * and applies the maximum contrast to the underlying point item, for
- * example the bar in a bar chart. The textOutline is a pseudo
- * property that applies an outline of the given width with the given color,
- * which by default is the maximum contrast to the text. So a bright text
- * color will result in a black text outline for maximum readability on a
- * mixed background. In some cases, especially with grayscale text, the text
- * outline doesn't work well, in which cases it can be disabled by setting
- * it to "none".
- *
- * Defaults to: {"color": "contrast", "fontSize": "11px", "fontWeight": - * "bold", "textOutline": "1px contrast" } - */ - public void setStyle(Style style) { - this.style = style; - } - /** * @see #setUseHTML(Boolean) */ diff --git a/model/src/main/java/com/vaadin/addon/charts/model/Handles.java b/model/src/main/java/com/vaadin/addon/charts/model/Handles.java deleted file mode 100644 index e98f3cafee8..00000000000 --- a/model/src/main/java/com/vaadin/addon/charts/model/Handles.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.vaadin.addon.charts.model; - -import com.vaadin.addon.charts.model.style.Color; -/** - *
- * Options for the handles for dragging the zoomed area. - *
- * - *
- * In styled mode, the navigator handles are styled with the
- * .highcharts-navigator-handle,
- * .highcharts-navigator-handle-left and
- * .highcharts-navigator-handle-right classes.
- *
- * Defaults to: #f2f2f2 - */ - public void setBackgroundColor(Color backgroundColor) { - this.backgroundColor = backgroundColor; - } - - /** - * @see #setBorderColor(Color) - */ - public Color getBorderColor() { - return borderColor; - } - - /** - * The stroke for the handle border and the stripes inside. - *
- * Defaults to: #999999 - */ - public void setBorderColor(Color borderColor) { - this.borderColor = borderColor; - } -} \ No newline at end of file diff --git a/model/src/main/java/com/vaadin/addon/charts/model/Legend.java b/model/src/main/java/com/vaadin/addon/charts/model/Legend.java index 3b6331e4814..dc7e971a654 100644 --- a/model/src/main/java/com/vaadin/addon/charts/model/Legend.java +++ b/model/src/main/java/com/vaadin/addon/charts/model/Legend.java @@ -1,7 +1,4 @@ package com.vaadin.addon.charts.model; - -import com.vaadin.addon.charts.model.style.Color; -import com.vaadin.addon.charts.model.style.Style; /** * The legend is a box containing a symbol and name for each series item or * point item in the chart. @@ -9,18 +6,12 @@ public class Legend extends AbstractConfigurationObject { private HorizontalAlign align; - private Color backgroundColor; - private Color borderColor; private Number borderRadius; - private Number borderWidth; private Boolean enabled; private Boolean floating; private Number itemDistance; - private Style itemHiddenStyle; - private Style itemHoverStyle; private Number itemMarginBottom; private Number itemMarginTop; - private Style itemStyle; private Number itemWidth; private String labelFormat; private String _fn_labelFormatter; @@ -73,36 +64,6 @@ public void setAlign(HorizontalAlign align) { this.align = align; } - /** - * @see #setBackgroundColor(Color) - */ - public Color getBackgroundColor() { - return backgroundColor; - } - - /** - * The background color of the legend. - */ - public void setBackgroundColor(Color backgroundColor) { - this.backgroundColor = backgroundColor; - } - - /** - * @see #setBorderColor(Color) - */ - public Color getBorderColor() { - return borderColor; - } - - /** - * The color of the drawn border around the legend. - *
- * Defaults to: #999999 - */ - public void setBorderColor(Color borderColor) { - this.borderColor = borderColor; - } - /** * @see #setBorderRadius(Number) */ @@ -119,22 +80,6 @@ public void setBorderRadius(Number borderRadius) { this.borderRadius = borderRadius; } - /** - * @see #setBorderWidth(Number) - */ - public Number getBorderWidth() { - return borderWidth; - } - - /** - * The width of the drawn border around the legend. - *
- * Defaults to: 0
- */
- public void setBorderWidth(Number borderWidth) {
- this.borderWidth = borderWidth;
- }
-
public Legend(Boolean enabled) {
this.enabled = enabled;
}
@@ -189,49 +134,6 @@ public void setItemDistance(Number itemDistance) {
this.itemDistance = itemDistance;
}
- /**
- * @see #setItemHiddenStyle(Style)
- */
- public Style getItemHiddenStyle() {
- if (itemHiddenStyle == null) {
- itemHiddenStyle = new Style();
- }
- return itemHiddenStyle;
- }
-
- /**
- * CSS styles for each legend item when the corresponding series or point is
- * hidden. Only a subset of CSS is supported, notably those options related
- * to text. Properties are inherited from style unless
- * overridden here.
- *
- * Defaults to: { "color": "#cccccc" }
- */
- public void setItemHiddenStyle(Style itemHiddenStyle) {
- this.itemHiddenStyle = itemHiddenStyle;
- }
-
- /**
- * @see #setItemHoverStyle(Style)
- */
- public Style getItemHoverStyle() {
- if (itemHoverStyle == null) {
- itemHoverStyle = new Style();
- }
- return itemHoverStyle;
- }
-
- /**
- * CSS styles for each legend item in hover mode. Only a subset of CSS is
- * supported, notably those options related to text. Properties are
- * inherited from style unless overridden here.
- *
- * Defaults to: { "color": "#000000" }
- */
- public void setItemHoverStyle(Style itemHoverStyle) {
- this.itemHoverStyle = itemHoverStyle;
- }
-
/**
* @see #setItemMarginBottom(Number)
*/
@@ -264,30 +166,6 @@ public void setItemMarginTop(Number itemMarginTop) {
this.itemMarginTop = itemMarginTop;
}
- /**
- * @see #setItemStyle(Style)
- */
- public Style getItemStyle() {
- if (itemStyle == null) {
- itemStyle = new Style();
- }
- return itemStyle;
- }
-
- /**
- * CSS styles for each legend item. Only a subset of CSS is supported,
- * notably those options related to text. The default
- * textOverflow property makes long texts truncate. Set it to
- * null to wrap text instead. A width property can
- * be added to control the text width.
- *
- * Defaults to: { "color": "#333333", "cursor": "pointer", "fontSize": - * "12px", "fontWeight": "bold", "textOverflow": "ellipsis" } - */ - public void setItemStyle(Style itemStyle) { - this.itemStyle = itemStyle; - } - /** * @see #setItemWidth(Number) */ diff --git a/model/src/main/java/com/vaadin/addon/charts/model/LegendNavigation.java b/model/src/main/java/com/vaadin/addon/charts/model/LegendNavigation.java index fb844c020ee..69b7711665c 100644 --- a/model/src/main/java/com/vaadin/addon/charts/model/LegendNavigation.java +++ b/model/src/main/java/com/vaadin/addon/charts/model/LegendNavigation.java @@ -1,7 +1,4 @@ package com.vaadin.addon.charts.model; - -import com.vaadin.addon.charts.model.style.Color; -import com.vaadin.addon.charts.model.style.Style; /** * Options for the paging or navigation appearing when the legend is overflown. * Navigation works well on screen, but not in static exported images. One way @@ -11,32 +8,13 @@ */ public class LegendNavigation extends AbstractConfigurationObject { - private Color activeColor; private Boolean animation; private Number arrowSize; private Boolean enabled; - private Color inactiveColor; - private Style style; public LegendNavigation() { } - /** - * @see #setActiveColor(Color) - */ - public Color getActiveColor() { - return activeColor; - } - - /** - * The color for the active up or down arrow in the legend page navigation. - *
- * Defaults to: #003399 - */ - public void setActiveColor(Color activeColor) { - this.activeColor = activeColor; - } - /** * @see #setAnimation(Boolean) */ @@ -102,38 +80,4 @@ public Boolean getEnabled() { public void setEnabled(Boolean enabled) { this.enabled = enabled; } - - /** - * @see #setInactiveColor(Color) - */ - public Color getInactiveColor() { - return inactiveColor; - } - - /** - * The color of the inactive up or down arrow in the legend page navigation. - * . - *
- * Defaults to: #cccccc - */ - public void setInactiveColor(Color inactiveColor) { - this.inactiveColor = inactiveColor; - } - - /** - * @see #setStyle(Style) - */ - public Style getStyle() { - if (style == null) { - style = new Style(); - } - return style; - } - - /** - * Text styles for the legend page navigation. - */ - public void setStyle(Style style) { - this.style = style; - } } \ No newline at end of file diff --git a/model/src/main/java/com/vaadin/addon/charts/model/LegendTitle.java b/model/src/main/java/com/vaadin/addon/charts/model/LegendTitle.java index 4b7f0d0f7f4..547a0e3bdcf 100644 --- a/model/src/main/java/com/vaadin/addon/charts/model/LegendTitle.java +++ b/model/src/main/java/com/vaadin/addon/charts/model/LegendTitle.java @@ -1,36 +1,14 @@ package com.vaadin.addon.charts.model; - -import com.vaadin.addon.charts.model.style.Style; /** * A title to be added on top of the legend. */ public class LegendTitle extends AbstractConfigurationObject { - private Style style; private String text; public LegendTitle() { } - /** - * @see #setStyle(Style) - */ - public Style getStyle() { - if (style == null) { - style = new Style(); - } - return style; - } - - /** - * Generic CSS styles for the legend title. - *
- * Defaults to: {"fontWeight":"bold"}
- */
- public void setStyle(Style style) {
- this.style = style;
- }
-
public LegendTitle(String text) {
this.text = text;
}
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/Loading.java b/model/src/main/java/com/vaadin/addon/charts/model/Loading.java
index 82e045e19c6..c5bcf075cc8 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/Loading.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/Loading.java
@@ -1,6 +1,4 @@
package com.vaadin.addon.charts.model;
-
-import com.vaadin.addon.charts.model.style.Style;
/**
* The loading options control the appearance of the loading screen that covers
* the plot area on chart operations. This screen only appears after an explicit
@@ -13,9 +11,7 @@
public class Loading extends AbstractConfigurationObject {
private Number hideDuration;
- private Style labelStyle;
private Number showDuration;
- private Style style;
public Loading() {
}
@@ -36,26 +32,6 @@ public void setHideDuration(Number hideDuration) {
this.hideDuration = hideDuration;
}
- /**
- * @see #setLabelStyle(Style)
- */
- public Style getLabelStyle() {
- if (labelStyle == null) {
- labelStyle = new Style();
- }
- return labelStyle;
- }
-
- /**
- * CSS styles for the loading label span.
- *
- * Defaults to: { "fontWeight": "bold", "position": "relative", "top": "45%" - * } - */ - public void setLabelStyle(Style labelStyle) { - this.labelStyle = labelStyle; - } - /** * @see #setShowDuration(Number) */ @@ -71,24 +47,4 @@ public Number getShowDuration() { public void setShowDuration(Number showDuration) { this.showDuration = showDuration; } - - /** - * @see #setStyle(Style) - */ - public Style getStyle() { - if (style == null) { - style = new Style(); - } - return style; - } - - /** - * CSS styles for the loading screen that covers the plot area. - *
- * Defaults to: { "position": "absolute", "backgroundColor": "#ffffff", - * "opacity": 0.5, "textAlign": "center" } - */ - public void setStyle(Style style) { - this.style = style; - } } \ No newline at end of file diff --git a/model/src/main/java/com/vaadin/addon/charts/model/Navigation.java b/model/src/main/java/com/vaadin/addon/charts/model/Navigation.java index ba01e470221..62eca975f90 100644 --- a/model/src/main/java/com/vaadin/addon/charts/model/Navigation.java +++ b/model/src/main/java/com/vaadin/addon/charts/model/Navigation.java @@ -1,6 +1,4 @@ package com.vaadin.addon.charts.model; - -import com.vaadin.addon.charts.model.style.Style; /** * A collection of options for buttons and menus appearing in the exporting * module. @@ -8,9 +6,6 @@ public class Navigation extends AbstractConfigurationObject { private ButtonOptions buttonOptions; - private Style menuItemHoverStyle; - private Style menuItemStyle; - private Style menuStyle; public Navigation() { } @@ -41,68 +36,4 @@ public ButtonOptions getButtonOptions() { public void setButtonOptions(ButtonOptions buttonOptions) { this.buttonOptions = buttonOptions; } - - /** - * @see #setMenuItemHoverStyle(Style) - */ - public Style getMenuItemHoverStyle() { - if (menuItemHoverStyle == null) { - menuItemHoverStyle = new Style(); - } - return menuItemHoverStyle; - } - - /** - * CSS styles for the hover state of the individual items within the popup - * menu appearing by default when the export icon is clicked. The menu items - * are rendered in HTML. - *
- * Defaults to: { "background": "#335cad", "color": "#ffffff" } - */ - public void setMenuItemHoverStyle(Style menuItemHoverStyle) { - this.menuItemHoverStyle = menuItemHoverStyle; - } - - /** - * @see #setMenuItemStyle(Style) - */ - public Style getMenuItemStyle() { - if (menuItemStyle == null) { - menuItemStyle = new Style(); - } - return menuItemStyle; - } - - /** - * CSS styles for the individual items within the popup menu appearing by - * default when the export icon is clicked. The menu items are rendered in - * HTML. - *
- * Defaults to: { "padding": "0.5em 1em", "color": "#333333", "background": - * "none" } - */ - public void setMenuItemStyle(Style menuItemStyle) { - this.menuItemStyle = menuItemStyle; - } - - /** - * @see #setMenuStyle(Style) - */ - public Style getMenuStyle() { - if (menuStyle == null) { - menuStyle = new Style(); - } - return menuStyle; - } - - /** - * CSS styles for the popup menu appearing by default when the export icon - * is clicked. This menu is rendered in HTML. - *
- * Defaults to: { "border": "1px solid #999999", "background": "#ffffff", - * "padding": "5px 0" } - */ - public void setMenuStyle(Style menuStyle) { - this.menuStyle = menuStyle; - } } \ No newline at end of file diff --git a/model/src/main/java/com/vaadin/addon/charts/model/Navigator.java b/model/src/main/java/com/vaadin/addon/charts/model/Navigator.java index 6f9eaa0b292..d9c73cecfa3 100644 --- a/model/src/main/java/com/vaadin/addon/charts/model/Navigator.java +++ b/model/src/main/java/com/vaadin/addon/charts/model/Navigator.java @@ -1,6 +1,4 @@ package com.vaadin.addon.charts.model; - -import com.vaadin.addon.charts.model.style.Color; /** * The navigator is a small series below the main series, displaying a view of * the entire data set. It provides tools to zoom in and out on parts of the @@ -10,14 +8,10 @@ public class Navigator extends AbstractConfigurationObject { private Boolean adaptToUpdatedData; private Boolean enabled; - private Handles handles; private Number height; private Number margin; - private Color maskFill; private Boolean maskInside; private Boolean opposite; - private Color outlineColor; - private Number outlineWidth; private PlotOptionsSeries series; private XAxis[] xAxis; private YAxis[] yAxis; @@ -66,34 +60,6 @@ public void setEnabled(Boolean enabled) { this.enabled = enabled; } - /** - * @see #setHandles(Handles) - */ - public Handles getHandles() { - if (handles == null) { - handles = new Handles(); - } - return handles; - } - - /** - *
- * Options for the handles for dragging the zoomed area. - *
- * - *
- * In styled mode, the navigator handles are styled with the
- * .highcharts-navigator-handle,
- * .highcharts-navigator-handle-left and
- * .highcharts-navigator-handle-right classes.
- *
- * Defaults to: rgba(102,133,194,0.3) - */ - public void setMaskFill(Color maskFill) { - this.maskFill = maskFill; - } - /** * @see #setMaskInside(Boolean) */ @@ -178,38 +126,6 @@ public void setOpposite(Boolean opposite) { this.opposite = opposite; } - /** - * @see #setOutlineColor(Color) - */ - public Color getOutlineColor() { - return outlineColor; - } - - /** - * The color of the line marking the currently zoomed area in the navigator. - *
- * Defaults to: #cccccc - */ - public void setOutlineColor(Color outlineColor) { - this.outlineColor = outlineColor; - } - - /** - * @see #setOutlineWidth(Number) - */ - public Number getOutlineWidth() { - return outlineWidth; - } - - /** - * The width of the line marking the currently zoomed area in the navigator. - *
- * Defaults to: 2
- */
- public void setOutlineWidth(Number outlineWidth) {
- this.outlineWidth = outlineWidth;
- }
-
/**
* @see #setSeries(PlotOptionsSeries)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/NoData.java b/model/src/main/java/com/vaadin/addon/charts/model/NoData.java
index 2e9db07f9b1..e86c7915886 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/NoData.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/NoData.java
@@ -1,6 +1,4 @@
package com.vaadin.addon.charts.model;
-
-import com.vaadin.addon.charts.model.style.Style;
/**
* Options for displaying a message like "No data to display". This feature
* requires the file no-data-to-display.js to be loaded in the
@@ -10,7 +8,6 @@
public class NoData extends AbstractConfigurationObject {
private Position position;
- private Style style;
private Boolean useHTML;
public NoData() {
@@ -36,26 +33,6 @@ public void setPosition(Position position) {
this.position = position;
}
- /**
- * @see #setStyle(Style)
- */
- public Style getStyle() {
- if (style == null) {
- style = new Style();
- }
- return style;
- }
-
- /**
- * CSS styles for the no-data label.
- *
- * Defaults to: { "fontSize": "12px", "fontWeight": "bold", "color":
- * "#666666" }
- */
- public void setStyle(Style style) {
- this.style = style;
- }
-
/**
* @see #setUseHTML(Boolean)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/OhlcOptions.java b/model/src/main/java/com/vaadin/addon/charts/model/OhlcOptions.java
index 3859c44c103..195404acf45 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/OhlcOptions.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/OhlcOptions.java
@@ -51,19 +51,6 @@ public abstract class OhlcOptions extends AbstractPlotOptions {
*/
public abstract void setAnimation(Boolean animation);
- /**
- * @see #setColor(Color)
- */
- public abstract Color getColor();
-
- /**
- * The main color of the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- */
- public abstract void setColor(Color color);
-
/**
* @see #setColors(Color...)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsArea.java b/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsArea.java
index 0e0bd73f957..6969b82f4bf 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsArea.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsArea.java
@@ -12,7 +12,6 @@ public class PlotOptionsArea extends AreaOptions {
private Boolean animation;
private Number animationLimit;
private String className;
- private Color color;
private Number colorIndex;
private Boolean connectEnds;
private Boolean connectNulls;
@@ -160,37 +159,6 @@ public void setClassName(String className) {
this.className = className;
}
- /**
- * @see #setColor(Color)
- */
- public Color getColor() {
- return color;
- }
-
- /**
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- *
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- *
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- *
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- *
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- *
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- *
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- *
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- *
- * The main color of the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- *
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- *
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the options.colors array.
- *
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- *
- * Defaults to: #000000
- */
- public void setColor(Color color) {
- this.color = color;
- }
-
/**
* @see #setColorByPoint(Boolean)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsFlags.java b/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsFlags.java
index 2a330677fb5..ecd61db76f6 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsFlags.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsFlags.java
@@ -1,8 +1,8 @@
package com.vaadin.addon.charts.model;
-import com.vaadin.addon.charts.model.style.Color;
import java.util.ArrayList;
import java.util.Arrays;
+import com.vaadin.addon.charts.model.style.Color;
import com.vaadin.addon.charts.model.style.Style;
/**
*
@@ -12,7 +12,6 @@ public class PlotOptionsFlags extends AbstractPlotOptions {
private Boolean allowPointSelect;
private Number animationLimit;
private String className;
- private Color color;
private Number colorIndex;
private ArrayList
- * The main color of the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the
- * Defaults to: null
- */
- public void setColor(Color color) {
- this.color = color;
- }
-
/**
* @see #setColorByPoint(Boolean)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsLine.java b/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsLine.java
index d49dbc710ad..8734c49beec 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsLine.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsLine.java
@@ -1,8 +1,8 @@
package com.vaadin.addon.charts.model;
-import com.vaadin.addon.charts.model.style.Color;
import java.util.ArrayList;
import java.util.Arrays;
+import com.vaadin.addon.charts.model.style.Color;
import java.util.Date;
import java.time.Instant;
import com.vaadin.addon.charts.util.Util;
@@ -12,7 +12,6 @@ public class PlotOptionsLine extends PointOptions {
private Boolean animation;
private Number animationLimit;
private String className;
- private Color color;
private Number colorIndex;
private Boolean connectEnds;
private Boolean connectNulls;
@@ -155,37 +154,6 @@ public void setClassName(String className) {
this.className = className;
}
- /**
- * @see #setColor(Color)
- */
- public Color getColor() {
- return color;
- }
-
- /**
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the
- * The main color of the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the
- * Defaults to: Solid
- */
- public void setDashStyle(DashStyle dashStyle) {
- this.dashStyle = dashStyle;
- }
-
/**
* @see #setDataLabels(DataLabels)
*/
@@ -490,22 +424,6 @@ public void removeKey(String key) {
this.keys.remove(key);
}
- /**
- * @see #setLineWidth(Number)
- */
- public Number getLineWidth() {
- return lineWidth;
- }
-
- /**
- * Pixel with of the graph line.
- *
- * Defaults to: 2
- */
- public void setLineWidth(Number lineWidth) {
- this.lineWidth = lineWidth;
- }
-
/**
* @see #setLinecap(String)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsSpline.java b/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsSpline.java
index c4d3302e0fb..2c3a784a85a 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsSpline.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsSpline.java
@@ -1,8 +1,8 @@
package com.vaadin.addon.charts.model;
-import com.vaadin.addon.charts.model.style.Color;
import java.util.ArrayList;
import java.util.Arrays;
+import com.vaadin.addon.charts.model.style.Color;
import java.util.Date;
import java.time.Instant;
import com.vaadin.addon.charts.util.Util;
@@ -12,7 +12,6 @@ public class PlotOptionsSpline extends PointOptions {
private Boolean animation;
private Number animationLimit;
private String className;
- private Color color;
private Number colorIndex;
private Boolean connectEnds;
private Boolean connectNulls;
@@ -154,37 +153,6 @@ public void setClassName(String className) {
this.className = className;
}
- /**
- * @see #setColor(Color)
- */
- public Color getColor() {
- return color;
- }
-
- /**
- *
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the
- * Defaults to: null
- */
- public void setColor(Color color) {
- this.color = color;
- }
-
/**
* @see #setColorByPoint(Boolean)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsWaterfall.java b/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsWaterfall.java
index 015c60bb917..16f9ad454c6 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsWaterfall.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/PlotOptionsWaterfall.java
@@ -18,7 +18,6 @@ public class PlotOptionsWaterfall extends ColumnOptions {
private Number borderRadius;
private Number borderWidth;
private String className;
- private Color color;
private Boolean colorByPoint;
private Number colorIndex;
private ArrayList
- * The main color or the series. In line type series it applies to the line
- * and the point markers unless otherwise specified. In bar type series it
- * applies to the bars unless a color is specified per point. The default
- * value is pulled from the
- * In styled mode, the color can be defined by the colorIndex option. Also, the
- * series color can be set with the
- * A collection of attributes for the buttons. The object takes SVG
- * attributes like
- * The object can also be extended with states, so you can set
- * presentational options for
- * CSS styles for the text label.
- *
- * In styled mode, the buttons are styled by the
- *
- * CSS for the HTML inputs in the range selector.
- *
- * In styled mode, the inputs are styled by the
- *
- * CSS styles for the labels - the Zoom, From and To texts.
- *
- * In styled mode, the labels are styled by the
- *
- * CSS styles for the label.
- *
- * In styled mode, the styles are set in the
- *
- * Defaults to: { "color": "#000000", "fontSize": "11px", "fontWeight":
- * "bold", "textShadow":
- * "1px 1px contrast, -1px -1px contrast, -1px 1px contrast, 1px -1px contrast"
- * }
- */
- public void setStyle(Style style) {
- this.style = style;
- }
-
/**
* @see #setTextAlign(String)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/Subtitle.java b/model/src/main/java/com/vaadin/addon/charts/model/Subtitle.java
index d0ec716cd2e..9e43245d90f 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/Subtitle.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/Subtitle.java
@@ -1,6 +1,4 @@
package com.vaadin.addon.charts.model;
-
-import com.vaadin.addon.charts.model.style.Style;
/**
* The chart's subtitle
*/
@@ -8,7 +6,6 @@ public class Subtitle extends AbstractConfigurationObject {
private HorizontalAlign align;
private Boolean floating;
- private Style style;
private String text;
private Boolean useHTML;
private VerticalAlign verticalAlign;
@@ -53,34 +50,6 @@ public void setFloating(Boolean floating) {
this.floating = floating;
}
- /**
- * @see #setStyle(Style)
- */
- public Style getStyle() {
- if (style == null) {
- style = new Style();
- }
- return style;
- }
-
- /**
- *
- * CSS styles for the title.
- *
- * In styled mode, the subtitle style is given in the
- *
- * Defaults to: { "color": "#666666" }
- */
- public void setStyle(Style style) {
- this.style = style;
- }
-
public Subtitle(String text) {
this.text = text;
}
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/Title.java b/model/src/main/java/com/vaadin/addon/charts/model/Title.java
index c3c4000e883..6e79d7df760 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/Title.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/Title.java
@@ -1,6 +1,4 @@
package com.vaadin.addon.charts.model;
-
-import com.vaadin.addon.charts.model.style.Style;
/**
* The chart's main title.
*/
@@ -9,7 +7,6 @@ public class Title extends AbstractConfigurationObject {
private HorizontalAlign align;
private Boolean floating;
private Number margin;
- private Style style;
private String text;
private Boolean useHTML;
private VerticalAlign verticalAlign;
@@ -71,35 +68,6 @@ public void setMargin(Number margin) {
this.margin = margin;
}
- /**
- * @see #setStyle(Style)
- */
- public Style getStyle() {
- if (style == null) {
- style = new Style();
- }
- return style;
- }
-
- /**
- *
- * CSS styles for the title. Use this for font styling, but use
- *
- * In styled mode, the title style is given in the
- *
- * Defaults to: { "color": "#333333", "fontSize": "18px" }
- */
- public void setStyle(Style style) {
- this.style = style;
- }
-
public Title(String text) {
this.text = text;
}
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/XAxis.java b/model/src/main/java/com/vaadin/addon/charts/model/XAxis.java
index ff4cad7cad9..2355ddd07e8 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/XAxis.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/XAxis.java
@@ -27,9 +27,7 @@ public class XAxis extends Axis {
private String description;
private Boolean endOnTick;
private Number floor;
- private Color gridLineColor;
private DashStyle gridLineDashStyle;
- private Number gridLineWidth;
private Number gridZIndex;
private String id;
private Labels labels;
@@ -40,9 +38,7 @@ public class XAxis extends Axis {
private Number minPadding;
private Number minRange;
private Number minTickInterval;
- private Color minorGridLineColor;
private DashStyle minorGridLineDashStyle;
- private Number minorGridLineWidth;
private Color minorTickColor;
private String minorTickInterval;
private Number minorTickLength;
@@ -348,31 +344,6 @@ public void setFloor(Number floor) {
this.floor = floor;
}
- /**
- * @see #setGridLineColor(Color)
- */
- public Color getGridLineColor() {
- return gridLineColor;
- }
-
- /**
- *
- * Color of the grid lines extending the ticks across the plot area.
- *
- * In styled mode, the stroke is given in the
- *
- * Defaults to: #e6e6e6
- */
- public void setGridLineColor(Color gridLineColor) {
- this.gridLineColor = gridLineColor;
- }
-
/**
* @see #setGridLineDashStyle(DashStyle)
*/
@@ -392,31 +363,6 @@ public void setGridLineDashStyle(DashStyle gridLineDashStyle) {
this.gridLineDashStyle = gridLineDashStyle;
}
- /**
- * @see #setGridLineWidth(Number)
- */
- public Number getGridLineWidth() {
- return gridLineWidth;
- }
-
- /**
- *
- * The width of the grid lines extending the ticks across the plot area.
- *
- * In styled mode, the stroke width is given in the
- *
- * Defaults to: 0
- */
- public void setGridLineWidth(Number gridLineWidth) {
- this.gridLineWidth = gridLineWidth;
- }
-
/**
* @see #setGridZIndex(Number)
*/
@@ -627,32 +573,6 @@ public void setMinTickInterval(Number minTickInterval) {
this.minTickInterval = minTickInterval;
}
- /**
- * @see #setMinorGridLineColor(Color)
- */
- public Color getMinorGridLineColor() {
- return minorGridLineColor;
- }
-
- /**
- *
- * Color of the minor, secondary grid lines.
- *
- * In styled mode, the stroke width is given in the
- *
- * Defaults to: #f2f2f2
- */
- public void setMinorGridLineColor(Color minorGridLineColor) {
- this.minorGridLineColor = minorGridLineColor;
- }
-
/**
* @see #setMinorGridLineDashStyle(DashStyle)
*/
@@ -672,31 +592,6 @@ public void setMinorGridLineDashStyle(DashStyle minorGridLineDashStyle) {
this.minorGridLineDashStyle = minorGridLineDashStyle;
}
- /**
- * @see #setMinorGridLineWidth(Number)
- */
- public Number getMinorGridLineWidth() {
- return minorGridLineWidth;
- }
-
- /**
- *
- * Width of the minor, secondary grid lines.
- *
- * In styled mode, the stroke width is given in the
- *
- * Defaults to: 1
- */
- public void setMinorGridLineWidth(Number minorGridLineWidth) {
- this.minorGridLineWidth = minorGridLineWidth;
- }
-
/**
* @see #setMinorTickColor(Color)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/YAxis.java b/model/src/main/java/com/vaadin/addon/charts/model/YAxis.java
index 5e887ff9129..aa04fae16d3 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/YAxis.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/YAxis.java
@@ -27,10 +27,8 @@ public class YAxis extends Axis {
private String description;
private Boolean endOnTick;
private Number floor;
- private Color gridLineColor;
private DashStyle gridLineDashStyle;
private String gridLineInterpolation;
- private Number gridLineWidth;
private Number gridZIndex;
private String id;
private Labels labels;
@@ -43,9 +41,7 @@ public class YAxis extends Axis {
private Number minPadding;
private Number minRange;
private Number minTickInterval;
- private Color minorGridLineColor;
private DashStyle minorGridLineDashStyle;
- private Number minorGridLineWidth;
private Color minorTickColor;
private String minorTickInterval;
private Number minorTickLength;
@@ -375,31 +371,6 @@ public void setFloor(Number floor) {
this.floor = floor;
}
- /**
- * @see #setGridLineColor(Color)
- */
- public Color getGridLineColor() {
- return gridLineColor;
- }
-
- /**
- *
- * Color of the grid lines extending the ticks across the plot area.
- *
- * In styled mode, the stroke is given in the
- *
- * Defaults to: #e6e6e6
- */
- public void setGridLineColor(Color gridLineColor) {
- this.gridLineColor = gridLineColor;
- }
-
/**
* @see #setGridLineDashStyle(DashStyle)
*/
@@ -437,22 +408,6 @@ public void setGridLineInterpolation(String gridLineInterpolation) {
this.gridLineInterpolation = gridLineInterpolation;
}
- /**
- * @see #setGridLineWidth(Number)
- */
- public Number getGridLineWidth() {
- return gridLineWidth;
- }
-
- /**
- * The width of the grid lines extending the ticks across the plot area.
- *
- * Defaults to: 1
- */
- public void setGridLineWidth(Number gridLineWidth) {
- this.gridLineWidth = gridLineWidth;
- }
-
/**
* @see #setGridZIndex(Number)
*/
@@ -680,32 +635,6 @@ public void setMinTickInterval(Number minTickInterval) {
this.minTickInterval = minTickInterval;
}
- /**
- * @see #setMinorGridLineColor(Color)
- */
- public Color getMinorGridLineColor() {
- return minorGridLineColor;
- }
-
- /**
- *
- * Color of the minor, secondary grid lines.
- *
- * In styled mode, the stroke width is given in the
- *
- * Defaults to: #f2f2f2
- */
- public void setMinorGridLineColor(Color minorGridLineColor) {
- this.minorGridLineColor = minorGridLineColor;
- }
-
/**
* @see #setMinorGridLineDashStyle(DashStyle)
*/
@@ -725,31 +654,6 @@ public void setMinorGridLineDashStyle(DashStyle minorGridLineDashStyle) {
this.minorGridLineDashStyle = minorGridLineDashStyle;
}
- /**
- * @see #setMinorGridLineWidth(Number)
- */
- public Number getMinorGridLineWidth() {
- return minorGridLineWidth;
- }
-
- /**
- *
- * Width of the minor, secondary grid lines.
- *
- * In styled mode, the stroke width is given in the
- *
- * Defaults to: 1
- */
- public void setMinorGridLineWidth(Number minorGridLineWidth) {
- this.minorGridLineWidth = minorGridLineWidth;
- }
-
/**
* @see #setMinorTickColor(Color)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/ZAxis.java b/model/src/main/java/com/vaadin/addon/charts/model/ZAxis.java
index 2ff6da8e8a1..a64a4dbe267 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/ZAxis.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/ZAxis.java
@@ -24,9 +24,7 @@ public class ZAxis extends Axis {
private String description;
private Boolean endOnTick;
private Number floor;
- private Color gridLineColor;
private DashStyle gridLineDashStyle;
- private Number gridLineWidth;
private Number gridZIndex;
private String id;
private Labels labels;
@@ -328,31 +326,6 @@ public void setFloor(Number floor) {
this.floor = floor;
}
- /**
- * @see #setGridLineColor(Color)
- */
- public Color getGridLineColor() {
- return gridLineColor;
- }
-
- /**
- *
- * Color of the grid lines extending the ticks across the plot area.
- *
- * In styled mode, the stroke is given in the
- *
- * Defaults to: #e6e6e6
- */
- public void setGridLineColor(Color gridLineColor) {
- this.gridLineColor = gridLineColor;
- }
-
/**
* @see #setGridLineDashStyle(DashStyle)
*/
@@ -372,31 +345,6 @@ public void setGridLineDashStyle(DashStyle gridLineDashStyle) {
this.gridLineDashStyle = gridLineDashStyle;
}
- /**
- * @see #setGridLineWidth(Number)
- */
- public Number getGridLineWidth() {
- return gridLineWidth;
- }
-
- /**
- *
- * The width of the grid lines extending the ticks across the plot area.
- *
- * In styled mode, the stroke width is given in the
- *
- * Defaults to: 0
- */
- public void setGridLineWidth(Number gridLineWidth) {
- this.gridLineWidth = gridLineWidth;
- }
-
/**
* @see #setGridZIndex(Number)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/style/AxisStyle.java b/model/src/main/java/com/vaadin/addon/charts/model/style/AxisStyle.java
index a491915745c..612a01ee69c 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/style/AxisStyle.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/style/AxisStyle.java
@@ -28,10 +28,6 @@ public class AxisStyle extends AbstractConfigurationObject {
private TickIntervalStyle minorTickInterval;
private Color lineColor;
private Number lineWidth;
- private Number tickWidth;
- private Color tickColor;
- private Color gridLineColor;
- private Number gridLineWidth;
private Color alternateGridColor;
private final StyleWrapper title = new StyleWrapper();
@@ -98,38 +94,6 @@ public void setLineWidth(Number lineWidth) {
this.lineWidth = lineWidth;
}
- /**
- * @see #setTickWidth(Number)
- */
- public Number getTickWidth() {
- return tickWidth;
- }
-
- /**
- * Sets the pixel width of the major tick marks. Defaults to 1.
- *
- * @param tickWidth
- */
- public void setTickWidth(Number tickWidth) {
- this.tickWidth = tickWidth;
- }
-
- /**
- * @see #setTickColor(Color)
- */
- public Color getTickColor() {
- return tickColor;
- }
-
- /**
- * Sets the color for the main tick marks. Defaults to #C0D0E0.
- *
- * @param tickColor
- */
- public void setTickColor(Color tickColor) {
- this.tickColor = tickColor;
- }
-
/**
* @return The title style
*/
@@ -180,25 +144,6 @@ public void setLabels(Style style) {
labels.setStyle(style);
}
- /**
- * @see #setGridLineWidth(Number)
- *
- * @return The width of grid lines or null if not defined
- */
- public Number getGridLineWidth() {
- return gridLineWidth;
- }
-
- /**
- * Sets the width of the grid lines extending the ticks across the plot
- * area. Defaults to 0.
- *
- * @param gridLineWidth
- */
- public void setGridLineWidth(Number gridLineWidth) {
- this.gridLineWidth = gridLineWidth;
- }
-
/**
* @see #setAlternateGridColor(Color)
*
@@ -219,24 +164,4 @@ public void setAlternateGridColor(Color alternateGridColor) {
this.alternateGridColor = alternateGridColor;
}
- /**
- * @see #setGridLineColor(Color)
- *
- * @return The color of grid lines, null if not defined
- */
- public Color getGridLineColor() {
- return gridLineColor;
- }
-
- /**
- * Sets the color of the grid lines extending the ticks across the plot
- * area. Defaults to "#C0C0C0".
- *
- * @param gridLineColor
- * Color of grid lines
- */
- public void setGridLineColor(Color gridLineColor) {
- this.gridLineColor = gridLineColor;
- }
-
}
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/style/ChartStyle.java b/model/src/main/java/com/vaadin/addon/charts/model/style/ChartStyle.java
index 009188d1928..25382b82115 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/style/ChartStyle.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/style/ChartStyle.java
@@ -24,62 +24,12 @@
*/
@SuppressWarnings("serial")
public class ChartStyle extends AbstractConfigurationObject {
- private Color backgroundColor;
- private Color plotBackgroundColor;
private String plotBackgroundImage;
private Boolean plotShadow;
- private Number plotBorderWidth;
- private Color plotBorderColor;
private String className;
- private Number borderWidth;
- private Color borderColor;
private Number borderRadius;
private Style style;
- /**
- * @see #setBackgroundColor(Color)
- * @see #getPlotBackgroundColor()
- *
- * @return The background color of the chart, null if not defined
- */
- public Color getBackgroundColor() {
- return backgroundColor;
- }
-
- /**
- * Sets the background color of the outer chart area. May be a gradient.
- * Defaults to "#FFFFFF".
- *
- * @see #setPlotBackgroundColor(Color)
- *
- * @param backgroundColor
- */
- public void setBackgroundColor(Color backgroundColor) {
- this.backgroundColor = backgroundColor;
- }
-
- /**
- * @see #setPlotBackgroundColor(Color)
- * @see #getBackgroundColor()
- *
- * @return The background color of the plot, null if not defined
- */
- public Color getPlotBackgroundColor() {
- return plotBackgroundColor;
- }
-
- /**
- * Sets the background color of the plot area. May be a gradient. Defaults
- * to null.
- *
- * @see #setBackgroundColor(Color)
- *
- * @param plotBackgroundColor
- */
- public void setPlotBackgroundColor(Color plotBackgroundColor) {
- this.plotBackgroundColor = plotBackgroundColor;
- }
-
/**
* @see #setPlotBackgroundImage(String)
*
@@ -119,25 +69,6 @@ public void setPlotShadow(Boolean plotShadow) {
this.plotShadow = plotShadow;
}
- /**
- * @see #setPlotBorderWidth(Number)
- *
- * @return The width of the plot border or null if not defined
- */
- public Number getPlotBorderWidth() {
- return plotBorderWidth;
- }
-
- /**
- * Sets the pixel width of the plot area border. Defaults to 0.
- *
- * @param plotBorderWidth
- * Width of border
- */
- public void setPlotBorderWidth(Number plotBorderWidth) {
- this.plotBorderWidth = plotBorderWidth;
- }
-
/**
* @see #setClassName(String)
*/
@@ -155,26 +86,6 @@ public void setClassName(String className) {
this.className = className;
}
- /**
- * @see #setBorderWidth(Number)
- *
- * @return The width of the chart border, null if not defined
- */
- public Number getBorderWidth() {
- return borderWidth;
- }
-
- /**
- * Sets the pixel width of the outer chart border. The border is painted
- * using vector graphic techniques to allow rounded corners. Defaults to 0.
- *
- * @param borderWidth
- * Border width
- */
- public void setBorderWidth(Number borderWidth) {
- this.borderWidth = borderWidth;
- }
-
/**
* @see #setBorderRadius(Number)
*
@@ -194,25 +105,6 @@ public void setBorderRadius(Number borderRadius) {
this.borderRadius = borderRadius;
}
- /**
- * @see #setPlotBorderColor(Color)
- * @return The color of the plot border, null if not defined
- */
- public Color getPlotBorderColor() {
- return plotBorderColor;
- }
-
- /**
- * Sets the color of the outer chart border. The border is painted using
- * vector graphic techniques to allow rounded corners. Defaults to
- * "#4572A7".
- *
- * @param plotBorderColor
- */
- public void setPlotBorderColor(Color plotBorderColor) {
- this.plotBorderColor = plotBorderColor;
- }
-
/**
* Gets various style defaults used. This can be used to for example define
* default font family.
@@ -241,24 +133,4 @@ public Style getStyle() {
public void setStyle(Style style) {
this.style = style;
}
-
-
-
- /**
- * @see #setBorderColor(Color)
- * @return The color of the plot border, null if not defined
- */
- public Color getBorderColor() {
- return borderColor;
- }
-
- /**
- *Sets the color of the outer chart border. Defaults to #4572A7.
- *
- * @param borderColor
- */
-
- public void setBorderColor(Color borderColor) {
- this.borderColor = borderColor;
- }
}
diff --git a/vaadin-charts-flow-parent/vaadin-charts-flow-demo/src/main/java/com/vaadin/addon/charts/examples/combinations/MultipleAxes.java b/vaadin-charts-flow-parent/vaadin-charts-flow-demo/src/main/java/com/vaadin/addon/charts/examples/combinations/MultipleAxes.java
index e85daa49726..abc84734212 100644
--- a/vaadin-charts-flow-parent/vaadin-charts-flow-demo/src/main/java/com/vaadin/addon/charts/examples/combinations/MultipleAxes.java
+++ b/vaadin-charts-flow-parent/vaadin-charts-flow-demo/src/main/java/com/vaadin/addon/charts/examples/combinations/MultipleAxes.java
@@ -33,7 +33,6 @@ public void initDemo() {
conf.addyAxis(y1);
YAxis y2 = new YAxis();
- y2.setGridLineWidth(0);
y2.setTitle(new AxisTitle("Rainfall"));
labels = new Labels();
labels.setFormatter("return this.value +' mm'");
@@ -42,7 +41,6 @@ public void initDemo() {
conf.addyAxis(y2);
YAxis y3 = new YAxis();
- y3.setGridLineWidth(0);
y3.setTitle(new AxisTitle("Sea-Level Pressure"));
labels = new Labels();
labels.setFormatter("return this.value +' mb'");
diff --git a/vaadin-charts-flow-parent/vaadin-charts-flow-demo/src/main/java/com/vaadin/addon/charts/examples/dynamic/DynamicExtremes.java b/vaadin-charts-flow-parent/vaadin-charts-flow-demo/src/main/java/com/vaadin/addon/charts/examples/dynamic/DynamicExtremes.java
index 0906ae0a6e8..7d90949973e 100644
--- a/vaadin-charts-flow-parent/vaadin-charts-flow-demo/src/main/java/com/vaadin/addon/charts/examples/dynamic/DynamicExtremes.java
+++ b/vaadin-charts-flow-parent/vaadin-charts-flow-demo/src/main/java/com/vaadin/addon/charts/examples/dynamic/DynamicExtremes.java
@@ -53,8 +53,8 @@ public void initDemo() {
legend.setAlign(HorizontalAlign.RIGHT);
legend.setVerticalAlign(VerticalAlign.TOP);
legend.setX(-10d);
+
legend.setY(100d);
- legend.setBorderWidth(0);
ListSeries ls = new ListSeries();
ls.setName("Tokyo");
options.colors array.
- * .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- * highcharts-more.js
@@ -12,7 +12,6 @@ public class PlotOptionsGauge extends GaugeOptions {
private Boolean animation;
private Number animationLimit;
private String className;
- private Color color;
private Number colorIndex;
private Cursor cursor;
private DataLabels dataLabels;
@@ -114,37 +113,6 @@ public void setClassName(String className) {
this.className = className;
}
- /**
- * @see #setColor(Color)
- */
- public Color getColor() {
- return color;
- }
-
- /**
- * options.colors array.
- * .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- * options.colors array.
- * .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- * options.colors array.
- * .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- * options.colors array.
- * .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- * options.colors array.
- * .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- * options.colors array.
- * .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- * line, spline,
- * area and scatter in case it has a
- * lineWidth. The value for the dashStyle include:
- *
- *
- * options.colors array.
- * .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- * options.colors array.
- * .highcharts-series,
- * .highcharts-color-{n},
- * .highcharts-{type}-series or
- * .highcharts-series-{n} class, or individual classes given by
- * the className option.
- * options.colors array.
- */
- public abstract void setColor(Color color);
-
/**
* @see #setCropThreshold(Number)
*/
diff --git a/model/src/main/java/com/vaadin/addon/charts/model/RangeSelector.java b/model/src/main/java/com/vaadin/addon/charts/model/RangeSelector.java
index ab950962494..2b3aa746895 100644
--- a/model/src/main/java/com/vaadin/addon/charts/model/RangeSelector.java
+++ b/model/src/main/java/com/vaadin/addon/charts/model/RangeSelector.java
@@ -1,10 +1,8 @@
package com.vaadin.addon.charts.model;
-import com.vaadin.addon.charts.model.style.ButtonTheme;
import java.util.ArrayList;
import java.util.Arrays;
import com.vaadin.addon.charts.model.style.Color;
-import com.vaadin.addon.charts.model.style.Style;
/**
* The range selector is a tool for selecting ranges to display within the
* chart. It provides buttons to select preconfigured ranges in the chart, like
@@ -16,7 +14,6 @@ public class RangeSelector extends AbstractConfigurationObject {
private Boolean allButtonsEnabled;
private ButtonPosition buttonPosition;
private Number buttonSpacing;
- private ButtonTheme buttonTheme;
private ArrayListfill, stroke,
- * stroke-width, as well as style, a collection of
- * CSS properties for the text.
- * hover, select or
- * disabled button states.
- * .highcharts-range-selector-buttons .highcharts-button rule
- * with its different states.
- * .highcharts-range-input text rule in SVG mode, and
- * input.highcharts-range-selector when active.
- * .highcharts-range-label class.
- * .highcharts-stack-label class.
- * .highcharts-subtitle class.
- * align, x and y for text alignment.
- * .highcharts-title class.
- * .highcharts-grid-line class.
- * .highcharts-grid-line class.
- * .highcharts-minor-grid-line class.
- * .highcharts-grid-line class.
- * .highcharts-grid-line class.
- * .highcharts-minor-grid-line class.
- * .highcharts-grid-line class.
- * .highcharts-grid-line class.
- * .highcharts-grid-line class.
- *