From 09d5dba2259d3403485acfd0f9c0af17f6667d13 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Tue, 25 Mar 2014 20:02:26 +0100
Subject: [PATCH] changed method name for var overlap style
---
.../xeiam/xchart/demo/charts/bar/BarChart06.java | 2 +-
.../main/java/com/xeiam/xchart/StyleManager.java | 14 +++++++-------
.../internal/chartpart/PlotContentBarChart.java | 2 +-
.../xeiam/xchart/internal/style/GGPlot2Theme.java | 2 +-
.../xeiam/xchart/internal/style/MatlabTheme.java | 2 +-
.../com/xeiam/xchart/internal/style/Theme.java | 2 +-
.../xeiam/xchart/internal/style/XChartTheme.java | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart06.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart06.java
index 2f174ff2..69dc6b8d 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart06.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart06.java
@@ -58,7 +58,7 @@ public class BarChart06 implements ExampleChart {
// Customize Chart
chart.getStyleManager().setLegendPosition(LegendPosition.InsideNW);
chart.getStyleManager().setBarWidthPercentage(.96);
- chart.getStyleManager().setOverlapped(true);
+ chart.getStyleManager().setBarsOverlapped(true);
return chart;
}
diff --git a/xchart/src/main/java/com/xeiam/xchart/StyleManager.java b/xchart/src/main/java/com/xeiam/xchart/StyleManager.java
index d0a80050..5b50fa79 100644
--- a/xchart/src/main/java/com/xeiam/xchart/StyleManager.java
+++ b/xchart/src/main/java/com/xeiam/xchart/StyleManager.java
@@ -129,7 +129,7 @@ public class StyleManager {
// Bar Charts ///////////////////////////////
private double barWidthPercentage;
- private boolean isOverlapped;
+ private boolean barsOverlapped;
// Error Bars ///////////////////////////////
private Color errorBarsColor;
@@ -211,7 +211,7 @@ public class StyleManager {
// Bar Charts ///////////////////////////////
barWidthPercentage = theme.getBarWidthPercentage();
- isOverlapped = theme.isOverlapped();
+ barsOverlapped = theme.barsOverlapped();
// Error Bars ///////////////////////////////
errorBarsColor = theme.getErrorBarsColor();
@@ -994,16 +994,16 @@ public class StyleManager {
/**
* set whether or no bars are overlapped. Otherwise they are places side-by-side
*
- * @param isOverlapped
+ * @param barsOverlapped
*/
- public void setOverlapped(boolean isOverlapped) {
+ public void setBarsOverlapped(boolean barsOverlapped) {
- this.isOverlapped = isOverlapped;
+ this.barsOverlapped = barsOverlapped;
}
- public boolean isOverlapped() {
+ public boolean barsOverlapped() {
- return isOverlapped;
+ return barsOverlapped;
}
// Error Bars ///////////////////////////////
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
index a95330db..318e793c 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
@@ -170,7 +170,7 @@ public class PlotContentBarChart extends PlotContent {
boolean isOverlap = true;
double xOffset;
double barWidth;
- if (getChartPainter().getStyleManager().isOverlapped()) {
+ if (getChartPainter().getStyleManager().barsOverlapped()) {
double barWidthPercentage = getChartPainter().getStyleManager().getBarWidthPercentage();
barWidth = gridStep * barWidthPercentage;
double barMargin = gridStep * (1 - barWidthPercentage) / 2;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java b/xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java
index 15d0f17b..1c99fe3c 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java
@@ -288,7 +288,7 @@ public class GGPlot2Theme implements Theme {
}
@Override
- public boolean isOverlapped() {
+ public boolean barsOverlapped() {
return false;
}
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/MatlabTheme.java b/xchart/src/main/java/com/xeiam/xchart/internal/style/MatlabTheme.java
index d636ea92..56bdc5f4 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/MatlabTheme.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/style/MatlabTheme.java
@@ -289,7 +289,7 @@ public class MatlabTheme implements Theme {
}
@Override
- public boolean isOverlapped() {
+ public boolean barsOverlapped() {
return false;
}
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/Theme.java b/xchart/src/main/java/com/xeiam/xchart/internal/style/Theme.java
index 23550d54..e4e37fe3 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/Theme.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/style/Theme.java
@@ -120,7 +120,7 @@ public interface Theme {
public double getBarWidthPercentage();
- public boolean isOverlapped();
+ public boolean barsOverlapped();
// Error Bars ///////////////////////////////
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java b/xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java
index 14879954..1afe96c0 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java
@@ -288,7 +288,7 @@ public class XChartTheme implements Theme {
}
@Override
- public boolean isOverlapped() {
+ public boolean barsOverlapped() {
return false;
}
--
GitLab