From 168cd7ddf3a1014af1b9ff937066e77823fb4569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 25 Aug 2022 13:04:59 +0200 Subject: [PATCH] Code cleanup --- .../customcharts/core/ChromatogramChart.java | 4 +-- .../customcharts/core/MassSpectrumChart.java | 10 +++--- .../examples/parts/BarSeries_1_1_Part.java | 2 +- .../examples/parts/LineSeries_1_Part.java | 4 +-- .../swtchart/extensions/core/BaseChart.java | 36 +++++++++---------- .../extensions/core/ChartSettings.java | 4 +-- .../extensions/core/ScrollableChart.java | 6 ++-- .../extensions/linecharts/LineChart.java | 4 ++- .../extensions/marker/LabelMarker.java | 6 ++-- .../extensions/piecharts/PieChart.java | 4 +-- .../org/eclipse/swtchart/internal/Title.java | 9 ++--- 11 files changed, 45 insertions(+), 44 deletions(-) diff --git a/org.eclipse.swtchart.customcharts/src/org/eclipse/swtchart/customcharts/core/ChromatogramChart.java b/org.eclipse.swtchart.customcharts/src/org/eclipse/swtchart/customcharts/core/ChromatogramChart.java index 4a364710..a8123b59 100644 --- a/org.eclipse.swtchart.customcharts/src/org/eclipse/swtchart/customcharts/core/ChromatogramChart.java +++ b/org.eclipse.swtchart.customcharts/src/org/eclipse/swtchart/customcharts/core/ChromatogramChart.java @@ -71,7 +71,7 @@ private void setPrimaryAxisSet(IChartSettings chartSettings) { primaryAxisSettingsX.setGridLineStyle(LineStyle.NONE); // IPrimaryAxisSettings primaryAxisSettingsY = chartSettings.getPrimaryAxisSettingsY(); - primaryAxisSettingsY.setTitle(Messages.getString(Messages.INTENSITY)); + primaryAxisSettingsY.setTitle(Messages.getString(Messages.INTENSITY)); primaryAxisSettingsY.setDecimalFormat(new DecimalFormat(("0.0#E0"), new DecimalFormatSymbols(Locale.ENGLISH))); //$NON-NLS-1$ primaryAxisSettingsY.setColor(getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND)); primaryAxisSettingsY.setGridLineStyle(LineStyle.NONE); @@ -79,7 +79,7 @@ private void setPrimaryAxisSet(IChartSettings chartSettings) { private void addSecondaryAxisSet(IChartSettings chartSettings) { - ISecondaryAxisSettings secondaryAxisSettingsX = new SecondaryAxisSettings(Messages.getString(Messages.MINUTES), new MillisecondsToMinuteConverter()); + ISecondaryAxisSettings secondaryAxisSettingsX = new SecondaryAxisSettings(Messages.getString(Messages.MINUTES), new MillisecondsToMinuteConverter()); secondaryAxisSettingsX.setPosition(Position.Primary); secondaryAxisSettingsX.setDecimalFormat(new DecimalFormat(("0.00"), new DecimalFormatSymbols(Locale.ENGLISH))); //$NON-NLS-1$ secondaryAxisSettingsX.setColor(getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND)); diff --git a/org.eclipse.swtchart.customcharts/src/org/eclipse/swtchart/customcharts/core/MassSpectrumChart.java b/org.eclipse.swtchart.customcharts/src/org/eclipse/swtchart/customcharts/core/MassSpectrumChart.java index d10ffd44..6089b2d4 100644 --- a/org.eclipse.swtchart.customcharts/src/org/eclipse/swtchart/customcharts/core/MassSpectrumChart.java +++ b/org.eclipse.swtchart.customcharts/src/org/eclipse/swtchart/customcharts/core/MassSpectrumChart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2020 Lablicate GmbH. + * Copyright (c) 2017, 2022 Lablicate GmbH. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -85,8 +85,6 @@ public void setCustomLabels(Map customLabels) { if(customLabels != null) { this.customLabels = customLabels; - } else { - customLabels = new HashMap(); } } @@ -95,7 +93,7 @@ private void initialize() { numberOfHighestIntensitiesToLabel = 5; barSeriesIonComparator = new BarSeriesIonComparator(); labelOption = LabelOption.EXACT; - customLabels = new HashMap(); + customLabels = new HashMap<>(); // IChartSettings chartSettings = getChartSettings(); chartSettings.setOrientation(SWT.HORIZONTAL); @@ -187,7 +185,7 @@ private void printLabel(BarSeriesIon barSeriesIon, PaintEvent e) { Point point = barSeriesIon.getPoint(); String label = getLabel(barSeriesIon.getMz()); - boolean negative = (barSeriesIon.getIntensity() < 0) ? true : false; + boolean negative = (barSeriesIon.getIntensity() < 0); Point labelSize = e.gc.textExtent(label); int x = (int)(point.x + 0.5d - labelSize.x / 2.0d); int y = point.y; @@ -222,7 +220,7 @@ private String getLabel(double mz) { private List getBarSeriesIonList() { - List barSeriesIons = new ArrayList(); + List barSeriesIons = new ArrayList<>(); // int widthPlotArea = getBaseChart().getPlotArea().getSize().x; ISeries[] series = getBaseChart().getSeriesSet().getSeries(); diff --git a/org.eclipse.swtchart.extensions.examples/src/org/eclipse/swtchart/extensions/examples/parts/BarSeries_1_1_Part.java b/org.eclipse.swtchart.extensions.examples/src/org/eclipse/swtchart/extensions/examples/parts/BarSeries_1_1_Part.java index c2c2b94d..a4a2d94d 100644 --- a/org.eclipse.swtchart.extensions.examples/src/org/eclipse/swtchart/extensions/examples/parts/BarSeries_1_1_Part.java +++ b/org.eclipse.swtchart.extensions.examples/src/org/eclipse/swtchart/extensions/examples/parts/BarSeries_1_1_Part.java @@ -52,7 +52,7 @@ private void initialize() { /* * Create series. */ - List barSeriesDataList = new ArrayList(); + List barSeriesDataList = new ArrayList<>(); ISeriesData seriesData = SeriesConverter.getSeriesXY(SeriesConverter.BAR_SERIES_1); // IBarSeriesData barSeriesData = new BarSeriesData(seriesData); diff --git a/org.eclipse.swtchart.extensions.examples/src/org/eclipse/swtchart/extensions/examples/parts/LineSeries_1_Part.java b/org.eclipse.swtchart.extensions.examples/src/org/eclipse/swtchart/extensions/examples/parts/LineSeries_1_Part.java index 9c6fa879..808ca352 100644 --- a/org.eclipse.swtchart.extensions.examples/src/org/eclipse/swtchart/extensions/examples/parts/LineSeries_1_Part.java +++ b/org.eclipse.swtchart.extensions.examples/src/org/eclipse/swtchart/extensions/examples/parts/LineSeries_1_Part.java @@ -59,7 +59,7 @@ private void initialize() throws Exception { /* * Create series. */ - List lineSeriesDataList = new ArrayList(); + List lineSeriesDataList = new ArrayList<>(); // ISeriesData seriesData; ILineSeriesData lineSeriesData; @@ -229,7 +229,7 @@ private void initialize() throws Exception { */ IPlotArea plotArea = getBaseChart().getPlotArea(); LabelMarker labelMarker = new LabelMarker(getBaseChart()); - List labels = new ArrayList(); + List labels = new ArrayList<>(); labels.add("2-Methoxy-4-vinylphenol"); labels.add("Ethanone, 1-(2-hydroxy-5-methylphenyl)-"); labels.add("4-Hydroxy-2-methylacetophenone"); diff --git a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/BaseChart.java b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/BaseChart.java index a5db81e8..61236f6a 100644 --- a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/BaseChart.java +++ b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/BaseChart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2021 Lablicate GmbH. + * Copyright (c) 2017, 2022 Lablicate GmbH. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -129,11 +129,11 @@ public BaseChart(Composite parent, int style) { * Rectangle range selection. */ userSelection = new UserSelection(); - customRangeSelectionHandlers = new ArrayList(); - customPointSelectionHandlers = new ArrayList(); - seriesModificationListeners = new ArrayList(); - seriesStatusListeners = new ArrayList(); - selectedSeriesIds = new HashSet(); + customRangeSelectionHandlers = new ArrayList<>(); + customPointSelectionHandlers = new ArrayList<>(); + seriesModificationListeners = new ArrayList<>(); + seriesStatusListeners = new ArrayList<>(); + selectedSeriesIds = new HashSet<>(); initializeEventProcessors(); /* * Create the default x and y axis. @@ -165,27 +165,27 @@ public BaseChart(Composite parent, int style) { yAxisPrimary.setDrawAxisLine(true); yAxisPrimary.setIntegerDataPointAxis(false); // - handledSelectionEvents = new Stack(); + handledSelectionEvents = new Stack<>(); redoSelection = null; // - dataShiftHistory = new HashMap>(); + dataShiftHistory = new HashMap<>(); } private void initializeEventProcessors() { - registeredEvents = new HashMap>>>(); + registeredEvents = new HashMap<>(); initializeEvents(); } private void initializeEvents() { - registeredEvents.put(EVENT_MOUSE_DOUBLE_CLICK, new HashMap>>()); - registeredEvents.put(EVENT_MOUSE_WHEEL, new HashMap>>()); - registeredEvents.put(EVENT_MOUSE_DOWN, new HashMap>>()); - registeredEvents.put(EVENT_MOUSE_MOVE, new HashMap>>()); - registeredEvents.put(EVENT_MOUSE_UP, new HashMap>>()); - registeredEvents.put(EVENT_KEY_DOWN, new HashMap>>()); - registeredEvents.put(EVENT_KEY_UP, new HashMap>>()); + registeredEvents.put(EVENT_MOUSE_DOUBLE_CLICK, new HashMap<>()); + registeredEvents.put(EVENT_MOUSE_WHEEL, new HashMap<>()); + registeredEvents.put(EVENT_MOUSE_DOWN, new HashMap<>()); + registeredEvents.put(EVENT_MOUSE_MOVE, new HashMap<>()); + registeredEvents.put(EVENT_MOUSE_UP, new HashMap<>()); + registeredEvents.put(EVENT_KEY_DOWN, new HashMap<>()); + registeredEvents.put(EVENT_KEY_UP, new HashMap<>()); } public void clearEventProcessors() { @@ -208,7 +208,7 @@ public void addEventProcessor(IHandledEventProcessor handledEventProcessor) { int button = handledEventProcessor.getButton(); Map> buttonEventProcessors = eventProcessors.get(button); if(buttonEventProcessors == null) { - buttonEventProcessors = new HashMap>(); + buttonEventProcessors = new HashMap<>(); eventProcessors.put(button, buttonEventProcessors); } /* @@ -218,7 +218,7 @@ public void addEventProcessor(IHandledEventProcessor handledEventProcessor) { int stateMask = handledEventProcessor.getStateMask(); List handledEventProcessors = buttonEventProcessors.get(stateMask); if(handledEventProcessors == null) { - handledEventProcessors = new ArrayList(); + handledEventProcessors = new ArrayList<>(); } handledEventProcessors.add(handledEventProcessor); buttonEventProcessors.put(stateMask, handledEventProcessors); diff --git a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/ChartSettings.java b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/ChartSettings.java index eb4a60be..1f87f448 100644 --- a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/ChartSettings.java +++ b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/ChartSettings.java @@ -86,8 +86,8 @@ public class ChartSettings implements IChartSettings { // private IPrimaryAxisSettings primaryAxisSettingsX = new PrimaryAxisSettings(BaseChart.DEFAULT_TITLE_X_AXIS); private IPrimaryAxisSettings primaryAxisSettingsY = new PrimaryAxisSettings(BaseChart.DEFAULT_TITLE_Y_AXIS); - private List secondaryAxisSettingsListX = new ArrayList(); - private List secondaryAxisSettingsListY = new ArrayList(); + private List secondaryAxisSettingsListX = new ArrayList<>(); + private List secondaryAxisSettingsListY = new ArrayList<>(); // private int orientation = SWT.HORIZONTAL; private Color background; diff --git a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/ScrollableChart.java b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/ScrollableChart.java index 6646bc30..983763c0 100644 --- a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/ScrollableChart.java +++ b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/ScrollableChart.java @@ -121,7 +121,7 @@ public class ScrollableChart extends Composite implements IScrollableChart, IEve * This list contains all scrollable charts * that are linked with the current editor. */ - private List linkedScrollableCharts = new ArrayList(); + private List linkedScrollableCharts = new ArrayList<>(); // private PositionMarker positionMarker; private PlotCenterMarker plotCenterMarker; @@ -573,8 +573,8 @@ protected ISeriesData calculateSeries(ISeriesData seriesData, int compressToLeng * Capture the compressed data. * The final size is not known yet. */ - List xSeriesCompressed = new ArrayList(); - List ySeriesCompressed = new ArrayList(); + List xSeriesCompressed = new ArrayList<>(); + List ySeriesCompressed = new ArrayList<>(); /* * First x,y value. */ diff --git a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/linecharts/LineChart.java b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/linecharts/LineChart.java index 8f11e785..ed1ec328 100644 --- a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/linecharts/LineChart.java +++ b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/linecharts/LineChart.java @@ -55,10 +55,12 @@ public class LineChart extends ScrollableChart { public static final int NO_COMPRESSION = Integer.MAX_VALUE; public LineChart() { + super(); } public LineChart(Composite parent, int style) { + super(parent, style); } @@ -84,7 +86,7 @@ public void addSeriesData(List lineSeriesDataList, int compress /* * Suspend the update when adding new data to improve the performance. */ - if(lineSeriesDataList != null && lineSeriesDataList.size() > 0) { + if(lineSeriesDataList != null && !lineSeriesDataList.isEmpty()) { BaseChart baseChart = getBaseChart(); baseChart.suspendUpdate(true); for(ILineSeriesData lineSeriesData : lineSeriesDataList) { diff --git a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/marker/LabelMarker.java b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/marker/LabelMarker.java index ad755929..ab46f7c3 100644 --- a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/marker/LabelMarker.java +++ b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/marker/LabelMarker.java @@ -30,7 +30,7 @@ public class LabelMarker extends AbstractBaseChartPaintListener implements IBaseChartPaintListener { - private Map labels = new HashMap(); + private Map labels = new HashMap<>(); private int indexSeries = -1; private ISeries serie; private int orientation; @@ -42,7 +42,7 @@ public LabelMarker(BaseChart baseChart) { public void setLabels(List labels, int indexSeries, int orientation) { - Map labelsMap = new HashMap(); + Map labelsMap = new HashMap<>(); int index = 0; for(String label : labels) { labelsMap.put(index++, label); @@ -59,7 +59,7 @@ public void setLabels(Map labels, int indexSeries, int orientat public void setLabels(Map labels, int orientation) { this.orientation = orientation; - this.labels = (labels != null) ? labels : new HashMap(); + this.labels = (labels != null) ? labels : new HashMap<>(); } public void clear() { diff --git a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/piecharts/PieChart.java b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/piecharts/PieChart.java index 082573b2..364238ef 100644 --- a/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/piecharts/PieChart.java +++ b/org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/piecharts/PieChart.java @@ -48,7 +48,7 @@ public void addSeriesData(ICircularSeriesData model) { * Get the series data and apply the settings. */ try { - ICircularSeriesSettings pieSeriesSettings = (ICircularSeriesSettings)model.getSettings(); + ICircularSeriesSettings pieSeriesSettings = model.getSettings(); // IChartSettings chartSettings = getChartSettings(); // @@ -84,7 +84,7 @@ public void addSeriesData(ICircularSeriesData model) { IHandledEventProcessor circularHandledEventProcessor = new CircularMouseDownEvent(this); chartSettings.addHandledEventProcessor(circularHandledEventProcessor); applySettings(chartSettings); - ICircularSeries pieSeries = (ICircularSeries)createCircularSeries(model, pieSeriesSettings); + ICircularSeries pieSeries = createCircularSeries(model, pieSeriesSettings); // baseChart.applyCircularSeriesSettings(pieSeries, pieSeriesSettings); } catch(SeriesException e) { diff --git a/org.eclipse.swtchart/src/org/eclipse/swtchart/internal/Title.java b/org.eclipse.swtchart/src/org/eclipse/swtchart/internal/Title.java index 37add7d8..c0cad66e 100644 --- a/org.eclipse.swtchart/src/org/eclipse/swtchart/internal/Title.java +++ b/org.eclipse.swtchart/src/org/eclipse/swtchart/internal/Title.java @@ -3,8 +3,8 @@ * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * SPDX-License-Identifier: EPL-2.0 * * Contributors: @@ -69,6 +69,7 @@ public class Title implements ITitle, PaintListener { * the parent composite */ public Title(Chart parent) { + this.chart = parent; text = DEFAULT_TEXT; isVisible = true; @@ -122,7 +123,7 @@ public void setFont(Font font) { if(font == null) { this.font = defaultFont; } else if(font.isDisposed()) { - throw new IllegalArgumentException(Messages.getString(Messages.DISPOSED_FONT_GIVEN)); + throw new IllegalArgumentException(Messages.getString(Messages.DISPOSED_FONT_GIVEN)); } else { this.font = font; } @@ -155,7 +156,7 @@ public void setForeground(Color color) { if(color == null) { foreground = Display.getDefault().getSystemColor(DEFAULT_FOREGROUND); } else if(color.isDisposed()) { - throw new IllegalArgumentException(Messages.getString(Messages.DISPOSED_COLOR_GIVEN)); + throw new IllegalArgumentException(Messages.getString(Messages.DISPOSED_COLOR_GIVEN)); } else { foreground = color; }