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 2f174ff2ddc660f720e9b789b9f7cfc50a34b444..69dc6b8d4451362996b266bda8f4f3fb9c3f833f 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 d0a800506f8c3b40d2cedcf0827103a4d057ac51..5b50fa7965ded5c1a0b952a828130327d76e5969 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 a95330dbd2f94f3c850af4d74475cd5b3da03782..318e793c51f523ea17483a561aaf39cad05152b5 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 15d0f17bae46b48944771f2321e55814b8af6561..1c99fe3c947592dff76fa03256eb6df37539dde2 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 d636ea92ed5e22d1f27f3f66c2eaa9886538b204..56bdc5f4d67ae4ea48c828cdbe0a9e739d01112f 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 23550d54ba8bd2dea84bdb4dde2fe1710136ab9d..e4e37fe3f6885ad0e51e133215a7e3d2ae801cea 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 148799543c98be5430a35aa124fc08317c45d02f..1afe96c09037759ef769451113e8749a8f54c637 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; }