From 7f4ad36899a3989e6a907fd7551b1ceff97c19a4 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim@knowm.org>
Date: Tue, 26 Jan 2016 20:13:53 +0100
Subject: [PATCH] code formatting
---
.../java/org/knowm/xchart/demo/charts/bar/BarChart06.java | 5 ++---
.../org/knowm/xchart/demo/charts/stick/StickChart01.java | 3 ++-
xchart/src/main/java/org/knowm/xchart/Chart_Pie.java | 4 ++--
.../knowm/xchart/internal/chartpart/AxisTickMarks.java | 8 ++++----
.../org/knowm/xchart/internal/chartpart/AxisTitle.java | 4 ++--
.../knowm/xchart/internal/chartpart/Plot_Category.java | 3 +--
xchart/src/test/java/org/knowm/xchart/HistogramTest.java | 1 -
7 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java
index e7c8ce16..6199cba3 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java
@@ -57,8 +57,8 @@ public class BarChart06 implements ExampleChart {
chart.getStyler().setBarsOverlapped(true);
// Series
- Histogram histogram1 = new Histogram(getGaussianData(10000), 30, -30, 30);
- Histogram histogram2 = new Histogram(getGaussianData(5000), 30, -30, 30);
+ Histogram histogram1 = new Histogram(getGaussianData(10000), 20, -20, 20);
+ Histogram histogram2 = new Histogram(getGaussianData(5000), 20, -20, 20);
chart.addSeries("histogram 1", histogram1.getxAxisData(), histogram1.getyAxisData());
chart.addSeries("histogram 2", histogram2.getxAxisData(), histogram2.getyAxisData());
@@ -71,7 +71,6 @@ public class BarChart06 implements ExampleChart {
Random r = new Random();
for (int i = 0; i < count; i++) {
data.add(r.nextGaussian() * 10);
- // data.add(r.nextDouble() * 60 - 30);
}
return data;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/stick/StickChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/stick/StickChart01.java
index a46012ff..cd29564a 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/stick/StickChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/stick/StickChart01.java
@@ -1,5 +1,6 @@
/**
- * Copyright 2013 Xeiam LLC.
+ * Copyright 2015-2016 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/xchart/src/main/java/org/knowm/xchart/Chart_Pie.java b/xchart/src/main/java/org/knowm/xchart/Chart_Pie.java
index cacb54ed..880aa060 100644
--- a/xchart/src/main/java/org/knowm/xchart/Chart_Pie.java
+++ b/xchart/src/main/java/org/knowm/xchart/Chart_Pie.java
@@ -146,8 +146,8 @@ public class Chart_Pie extends Chart<Styler_Pie, Series_Pie> {
*/
public void setSeriesStyles() {
- SeriesColorMarkerLineStyleCycler seriesColorMarkerLineStyleCycler = new SeriesColorMarkerLineStyleCycler(getStyler().getSeriesColors(), getStyler().getSeriesMarkers(),
- getStyler().getSeriesLines());
+ SeriesColorMarkerLineStyleCycler seriesColorMarkerLineStyleCycler = new SeriesColorMarkerLineStyleCycler(getStyler().getSeriesColors(), getStyler().getSeriesMarkers(), getStyler()
+ .getSeriesLines());
for (Series series : getSeriesMap().values()) {
SeriesColorMarkerLineStyle seriesColorMarkerLineStyle = seriesColorMarkerLineStyleCycler.getNextSeriesColorMarkerLineStyle();
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java
index 3dee3668..e5cb9611 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java
@@ -82,8 +82,8 @@ public class AxisTickMarks<ST extends Styler_AxesChart, S extends Series> implem
// Line
if (chart.getStyler().isAxisTicksLineVisible()) {
- Shape line = new Line2D.Double(xOffset + chart.getStyler().getAxisTickMarkLength(), yOffset, xOffset + chart.getStyler().getAxisTickMarkLength(), yOffset + chart.getYAxis()
- .getPaintZone().getHeight());
+ Shape line = new Line2D.Double(xOffset + chart.getStyler().getAxisTickMarkLength(), yOffset, xOffset + chart.getStyler().getAxisTickMarkLength(), yOffset + chart.getYAxis().getPaintZone()
+ .getHeight());
g.draw(line);
}
@@ -120,8 +120,8 @@ public class AxisTickMarks<ST extends Styler_AxesChart, S extends Series> implem
if (chart.getStyler().isAxisTicksLineVisible()) {
g.setStroke(chart.getStyler().getAxisTickMarksStroke());
- g.drawLine((int) xOffset, (int) (yOffset - chart.getStyler().getAxisTickMarkLength()), (int) (xOffset + chart.getXAxis().getPaintZone().getWidth()), (int) (yOffset - chart
- .getStyler().getAxisTickMarkLength()));
+ g.drawLine((int) xOffset, (int) (yOffset - chart.getStyler().getAxisTickMarkLength()), (int) (xOffset + chart.getXAxis().getPaintZone().getWidth()), (int) (yOffset - chart.getStyler()
+ .getAxisTickMarkLength()));
}
}
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java
index acd8f464..596da4bf 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java
@@ -85,8 +85,8 @@ public class AxisTitle<ST extends Styler_AxesChart, S extends Series> implements
// System.out.println(nonRotatedRectangle.getHeight());
// bounds
- bounds = new Rectangle2D.Double(xOffset - nonRotatedRectangle.getHeight(), yOffset - nonRotatedRectangle.getWidth(), nonRotatedRectangle.getHeight() + chart.getStyler()
- .getAxisTitlePadding(), nonRotatedRectangle.getWidth());
+ bounds = new Rectangle2D.Double(xOffset - nonRotatedRectangle.getHeight(), yOffset - nonRotatedRectangle.getWidth(), nonRotatedRectangle.getHeight() + chart.getStyler().getAxisTitlePadding(),
+ nonRotatedRectangle.getWidth());
// g.setColor(Color.blue);
// g.draw(bounds);
}
diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Category.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Category.java
index b6cbe557..fffec722 100644
--- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Category.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot_Category.java
@@ -45,8 +45,7 @@ public class Plot_Category<ST extends Styler_AxesChart, S extends Series> extend
@Override
public void paint(Graphics2D g) {
- if (ChartCategorySeriesRenderStyle.Bar.equals(stylerCategory.getDefaultSeriesRenderStyle()) || ChartCategorySeriesRenderStyle.Stick.equals(stylerCategory
- .getDefaultSeriesRenderStyle())) {
+ if (ChartCategorySeriesRenderStyle.Bar.equals(stylerCategory.getDefaultSeriesRenderStyle()) || ChartCategorySeriesRenderStyle.Stick.equals(stylerCategory.getDefaultSeriesRenderStyle())) {
this.plotContent = new PlotContent_Category_Bar<Styler_Category, Series_Category>(chart);
}
diff --git a/xchart/src/test/java/org/knowm/xchart/HistogramTest.java b/xchart/src/test/java/org/knowm/xchart/HistogramTest.java
index d7e2f0a4..0bc829ec 100644
--- a/xchart/src/test/java/org/knowm/xchart/HistogramTest.java
+++ b/xchart/src/test/java/org/knowm/xchart/HistogramTest.java
@@ -21,7 +21,6 @@ import static org.fest.assertions.api.Assertions.assertThat;
import java.util.Arrays;
import org.junit.Test;
-import org.knowm.xchart.Histogram;
/**
* @author timmolter
--
GitLab