Skip to content
This repository has been archived by the owner on Oct 8, 2020. It is now read-only.

CHARTS-693: Remove style config #56

Merged
merged 7 commits into from
Dec 5, 2017
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
Original file line number Diff line number Diff line change
Expand Up @@ -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'");
Expand All @@ -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'");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,6 @@ public abstract class AbstractDataLabels extends AbstractConfigurationObject {
public static final String OVERFLOW_JUSTIFY = "justify";
public static final String OVERFLOW_NONE = "none";

/**
* @see #setBackgroundColor(Color)
*/
public abstract Color getBackgroundColor();

/**
* The background color or gradient for the data label.
*/
public abstract void setBackgroundColor(Color backgroundColor);

/**
* @see #setBorderColor(Color)
*/
public abstract Color getBorderColor();

/**
* The border color for the data label.
*/
public abstract void setBorderColor(Color borderColor);

/**
* @see #setBorderRadius(Number)
*/
Expand All @@ -65,16 +45,6 @@ public abstract class AbstractDataLabels extends AbstractConfigurationObject {
*/
public abstract void setBorderWidth(Number borderWidth);

/**
* @see #setColor(Color)
*/
public abstract Color getColor();

/**
* The text color for the data labels.
*/
public abstract void setColor(Color color);

/**
* @see #setCrop(Boolean)
*/
Expand Down Expand Up @@ -197,16 +167,6 @@ public abstract class AbstractDataLabels extends AbstractConfigurationObject {
*/
public abstract void setShape(Shape shape);

/**
* @see #setStyle(Style)
*/
public abstract Style getStyle();

/**
* Styles for the label.
*/
public abstract void setStyle(Style style);

/**
* @see #setUseHTML(Boolean)
*/
Expand Down
13 changes: 0 additions & 13 deletions model/src/main/java/com/vaadin/addon/charts/model/AreaOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,6 @@ public abstract class AreaOptions extends AbstractPlotOptions {
*/
public abstract void setAnimation(Boolean animation);

/**
* @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 <code>options.colors</code> array.
*/
public abstract void setColor(Color color);

/**
* @see #setConnectNulls(Boolean)
*/
Expand Down
40 changes: 0 additions & 40 deletions model/src/main/java/com/vaadin/addon/charts/model/Axis.java
Original file line number Diff line number Diff line change
Expand Up @@ -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)
*/
Expand All @@ -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)
*/
Expand Down Expand Up @@ -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)
*/
Expand All @@ -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)
*/
Expand Down
51 changes: 0 additions & 51 deletions model/src/main/java/com/vaadin/addon/charts/model/Background.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,61 +28,10 @@
* the Pane-configuration object.</b>
*/
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <code>options.colors</code> array.
*/
public abstract void setColor(Color color);

/**
* @see #setColorByPoint(Boolean)
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand Down Expand Up @@ -123,72 +118,6 @@ public void setSymbol(String symbol) {
this.symbol = symbol;
}

/**
* @see #setSymbolFill(Color)
*/
public Color getSymbolFill() {
return symbolFill;
}

/**
* See <a class="internal"
* href="#navigation.buttonOptions">navigation.buttonOptions</a> =&gt;
* symbolFill.
* <p>
* 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.
* <p>
* 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.
* <p>
* 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.
* <p>
* Defaults to: 1
*/
public void setSymbolStrokeWidth(Number symbolStrokeWidth) {
this.symbolStrokeWidth = symbolStrokeWidth;
}

/**
* @see #setSymbolX(Number)
*/
Expand Down
23 changes: 0 additions & 23 deletions model/src/main/java/com/vaadin/addon/charts/model/Credits.java
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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() {
Expand Down Expand Up @@ -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.
* <p>
* Defaults to: { "cursor": "pointer", "color": "#999999", "fontSize":
* "10px" }
*/
public void setStyle(Style style) {
this.style = style;
}

public Credits(String text) {
this.text = text;
}
Expand Down
Loading