From 827e574fb858f61f1665be4d146b7022aea3070d Mon Sep 17 00:00:00 2001
From: Tim Molter <tim@knowm.org>
Date: Sat, 2 Jan 2016 11:56:32 +0100
Subject: [PATCH] misc. cleanup
---
.../knowm/xchart/internal/chartpart/Axis.java | 4 ----
.../xchart/internal/chartpart/AxisTick.java | 17 ++++-------------
.../internal/chartpart/ChartInternal.java | 1 -
3 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
index d5412945..8793cf79 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
@@ -346,23 +346,19 @@ public class Axis implements ChartPart {
if (getDirection() == Direction.X && getChartInternal().getChartInternalType() == ChartInternalType.Category) {
return new AxisTickCategoryChartCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal());
-
}
else if (getChartInternal().getChartInternalType() == ChartInternalType.XY && getAxisType() == AxisType.Date) {
return new AxisTickDateCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager());
-
}
else if (getDirection() == Direction.X && getChartInternal().getChartInternalType() == ChartInternalType.XY && getChartInternal().getStyleManager().isXAxisLogarithmic()
&& getAxisType() != AxisType.Date) {
return new AxisTickLogarithmicCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager());
-
}
else if (getDirection() == Direction.Y && getChartInternal().getStyleManager().isYAxisLogarithmic() && getAxisType() != AxisType.Date) {
return new AxisTickLogarithmicCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager());
-
}
else { // number
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java
index 11fa08cb..be540b5c 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java
@@ -79,13 +79,13 @@ public class AxisTick implements ChartPart {
bounds = new Rectangle2D.Double(
- axisTickLabels.getBounds().getX(),
+ axisTickLabels.getBounds().getX(),
- axisTickLabels.getBounds().getY(),
+ axisTickLabels.getBounds().getY(),
- axisTickLabels.getBounds().getWidth() + getChartInternal().getStyleManager().getAxisTickPadding() + axisTickMarks.getBounds().getWidth(),
+ axisTickLabels.getBounds().getWidth() + getChartInternal().getStyleManager().getAxisTickPadding() + axisTickMarks.getBounds().getWidth(),
- axisTickMarks.getBounds().getHeight()
+ axisTickMarks.getBounds().getHeight()
);
@@ -126,13 +126,4 @@ public class AxisTick implements ChartPart {
return axisTickLabels;
}
- // public List<Double> getTickLocations() {
- //
- // return axisTickCalculator.getTickLocations();
- // }
- //
- // public List<String> getTickLabels() {
- //
- // return axisTickCalculator.getTickLabels();
- // }
}
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartInternal.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartInternal.java
index d3fb4331..3609cbdb 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartInternal.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartInternal.java
@@ -251,7 +251,6 @@ public class ChartInternal {
}
break;
case Bar:
- // TODO Not Yet Supported
if (series.getSeriesType() == null) {
series.setSeriesType(Series.SeriesType.Bar);
}
--
GitLab