From f30e8174f5c25d9fd364d24c4c7689b0e61589a0 Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Thu, 5 Oct 2017 20:57:37 +0200 Subject: [PATCH] Some refactoring --- src/chart/ChartPanel.java | 4 ++-- src/chart/MasterChart.java | 4 ++-- src/chart/painter/CandleStickChartPainter.java | 1 - src/chart/painter/LineChartPainter.java | 1 - .../painter/{XLegendChartPainter.java => XLegendPainter.java} | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) rename src/chart/painter/{XLegendChartPainter.java => XLegendPainter.java} (98%) diff --git a/src/chart/ChartPanel.java b/src/chart/ChartPanel.java index c482542..7fdd059 100644 --- a/src/chart/ChartPanel.java +++ b/src/chart/ChartPanel.java @@ -1,7 +1,7 @@ package chart; import chart.painter.ChartPainter; -import chart.painter.XLegendChartPainter; +import chart.painter.XLegendPainter; import gui.Globals; import java.awt.Cursor; @@ -69,7 +69,7 @@ public class ChartPanel extends javax.swing.JPanel implements AdjustmentListener } //this.x_scrollbar.setMaximum(994000); - XLegendChartPainter p = new XLegendChartPainter(); + XLegendPainter p = new XLegendPainter(); data = Globals.se.getOHLCdata(60000 * 60); ChartDef def = new ChartDef(); diff --git a/src/chart/MasterChart.java b/src/chart/MasterChart.java index b6a0285..9db51df 100644 --- a/src/chart/MasterChart.java +++ b/src/chart/MasterChart.java @@ -27,7 +27,7 @@ package chart; import chart.painter.CandleStickChartPainter; import chart.painter.ChartPainter; -import chart.painter.XLegendChartPainter; +import chart.painter.XLegendPainter; import chart.painter.ChartCrossPainter; import gui.Globals; import sesim.Exchange.QuoteReceiver; @@ -58,7 +58,7 @@ public class MasterChart extends javax.swing.JPanel implements QuoteReceiver, Ch ChartPainter p = new CandleStickChartPainter(); this.xScrollBar.setMaximum(0); - p = new XLegendChartPainter(); + p = new XLegendPainter(); p.setDataProvider(this); xLegend.addChartPainter(p); diff --git a/src/chart/painter/CandleStickChartPainter.java b/src/chart/painter/CandleStickChartPainter.java index 909f65e..956cece 100644 --- a/src/chart/painter/CandleStickChartPainter.java +++ b/src/chart/painter/CandleStickChartPainter.java @@ -25,7 +25,6 @@ */ package chart.painter; -import chart.painter.OHLCChartPainter; import java.awt.Color; import java.awt.Graphics2D; import javax.swing.JScrollBar; diff --git a/src/chart/painter/LineChartPainter.java b/src/chart/painter/LineChartPainter.java index b87d937..7552b04 100644 --- a/src/chart/painter/LineChartPainter.java +++ b/src/chart/painter/LineChartPainter.java @@ -25,7 +25,6 @@ */ package chart.painter; -import chart.painter.OHLCChartPainter; import java.awt.Color; import java.awt.Graphics2D; import sesim.OHLCDataItem; diff --git a/src/chart/painter/XLegendChartPainter.java b/src/chart/painter/XLegendPainter.java similarity index 98% rename from src/chart/painter/XLegendChartPainter.java rename to src/chart/painter/XLegendPainter.java index ead3b0c..38d8545 100644 --- a/src/chart/painter/XLegendChartPainter.java +++ b/src/chart/painter/XLegendPainter.java @@ -38,7 +38,7 @@ import sesim.OHLCData; * * @author 7u83 <7u83@mail.ru> */ -public class XLegendChartPainter extends ChartPainter { +public class XLegendPainter extends ChartPainter { private String getTimeStrAt(OHLCData data, int unit) {