From f363f2b2cc2a6fc0018ec3200930a47da20cb8b4 Mon Sep 17 00:00:00 2001 From: Florian Hoelzl <hoelzl@fortiss.org> Date: Fri, 1 Jul 2016 11:44:03 +0000 Subject: [PATCH] YELLOW. refs 2589 --- .../tooling/spiderchart/example/Sample.java | 19 +++++++++++-------- .../tooling/spiderchart/model/AxisBase.java | 2 +- .../tooling/spiderchart/model/DataSeries.java | 2 +- .../tooling/spiderchart/model/DoubleAxis.java | 2 +- .../spiderchart/model/EnumerationAxis.java | 2 +- .../spiderchart/model/SpiderChart.java | 2 +- .../tooling/spiderchart/style/AxisStyle.java | 2 +- .../tooling/spiderchart/style/ChartStyle.java | 2 +- .../spiderchart/style/DataSeriesStyle.java | 2 +- .../tooling/spiderchart/util/AxisUtils.java | 2 +- .../widget/SpiderChartLegendWidget.java | 2 +- .../widget/SpiderChartSWTCanvas.java | 2 +- .../spiderchart/widget/SpiderChartViewer.java | 2 +- .../spiderchart/widget/SpiderChartWidget.java | 2 +- .../widget/SpiderChartWidgetBase.java | 2 +- 15 files changed, 25 insertions(+), 22 deletions(-) diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/example/Sample.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/example/Sample.java index 6296f18c3..e72986d7c 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/example/Sample.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/example/Sample.java @@ -56,16 +56,14 @@ import org.fortiss.tooling.spiderchart.widget.SpiderChartViewer; * Example application for the spider chart widget. * * @author mondal + * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: FA525F8C119797775BFAB25AC6DE8A3F + * @ConQAT.Rating YELLOW Hash: 74E3FAC5EFD5B9F36ABF300BB790BB5C */ -@SuppressWarnings("javadoc") public final class Sample { - - private static SpiderChartViewer viewer; - - private static void buildSpiderChart(final Shell shell) { + /** Constructs the spider chart viewer. */ + private static SpiderChartViewer buildSpiderChart(final Shell shell) { SpiderChart spiderChart = new SpiderChart(); spiderChart.setTitle("Smartphone Comparison Scale"); spiderChart.setLegendLabel("Legend"); @@ -151,18 +149,20 @@ public final class Sample { new DecimalFormat("#.#")); chartStyle.setDataSeriesStyle(nexusData, nexusStyle); - viewer = new SpiderChartViewer(shell, spiderChart, chartStyle); + SpiderChartViewer viewer = new SpiderChartViewer(shell, spiderChart, chartStyle); viewer.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true)); Rectangle clientArea = shell.getClientArea(); viewer.setBounds(clientArea.x, clientArea.y, clientArea.width, clientArea.height); + return viewer; } + /** Main method. */ public static void main(final String[] args) { final Display display = new Display(); final Shell shell = new Shell(display, SWT.DIALOG_TRIM); shell.setSize(800, 750); - buildSpiderChart(shell); + SpiderChartViewer viewer = buildSpiderChart(shell); shell.open(); while(!shell.isDisposed()) { @@ -174,7 +174,9 @@ public final class Sample { display.dispose(); } + /** Data class used to demonstrate enumeration data axes. */ private static class Screen implements Comparable<Screen> { + /** Screen width in pixels. */ public int width = 0; /** Constructor. */ @@ -195,6 +197,7 @@ public final class Sample { } } + /** {@link Comparator} implementation for {@link Screen}s . */ private static Comparator<Screen> screenComparator = new Comparator<Sample.Screen>() { @Override public int compare(Screen o1, Screen o2) { diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/AxisBase.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/AxisBase.java index 4a1fbe86f..4cfabe99e 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/AxisBase.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/AxisBase.java @@ -25,7 +25,7 @@ import static java.util.Objects.requireNonNull; * @author hoelzl * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating RED Hash: + * @ConQAT.Rating YELLOW Hash: EB4861CAE43384E95DF74C22CF019B85 */ public abstract class AxisBase { /** The name of the axis. */ diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DataSeries.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DataSeries.java index ef6b81519..1afd1adcc 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DataSeries.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DataSeries.java @@ -28,7 +28,7 @@ import java.util.Map; * @author hoelzl * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating YELLOW Hash: 7CFFF87C0D159572D525D01C01040F7E + * @ConQAT.Rating YELLOW Hash: 189CC6E69E97672EE488149C69766EEE */ public final class DataSeries { /** The name of the data series. */ diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DoubleAxis.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DoubleAxis.java index 41ca7d4a3..8400ca31a 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DoubleAxis.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/DoubleAxis.java @@ -25,7 +25,7 @@ import java.util.Comparator; * @author hoelzl * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating YELLOW Hash: 6C5390A8B21E0877312C9EB36F009A6B + * @ConQAT.Rating YELLOW Hash: 5F27AB1B3511313AD29EBFA8F99840DD */ public final class DoubleAxis extends AxisBase { /** The minimum value of the axis (at the center of the spider chart). */ diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/EnumerationAxis.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/EnumerationAxis.java index a577c0b47..7a2f89f8b 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/EnumerationAxis.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/EnumerationAxis.java @@ -28,7 +28,7 @@ import java.util.List; * @author hoelzl * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating RED Hash: + * @ConQAT.Rating YELLOW Hash: EF67711684D1153304B0C6352B92ACBA */ public final class EnumerationAxis<T extends Object> extends AxisBase { diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/SpiderChart.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/SpiderChart.java index f3247ae98..3888c0877 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/SpiderChart.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/SpiderChart.java @@ -28,7 +28,7 @@ import java.util.List; * @author hoelzl * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating YELLOW Hash: 74F497F82BD13B18035A011ACC09B01F + * @ConQAT.Rating YELLOW Hash: C36AE1A270F31509E8C62CC2B5A88F64 */ public final class SpiderChart { /** The axes contained in this chart. */ diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/AxisStyle.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/AxisStyle.java index ad18012b2..65c663941 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/AxisStyle.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/AxisStyle.java @@ -34,7 +34,7 @@ import org.fortiss.tooling.spiderchart.model.DoubleAxis; * @author hoelzl * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating YELLOW Hash: BFC55918B8B64174D2C746DE55BCC2AA + * @ConQAT.Rating YELLOW Hash: 26797EA6472BA45A84B0F63F3AE92338 */ public final class AxisStyle { diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ChartStyle.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ChartStyle.java index 4dc2071c8..f9caa2993 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ChartStyle.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/ChartStyle.java @@ -33,7 +33,7 @@ import org.fortiss.tooling.spiderchart.model.SpiderChart; * @author hoelzl * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating YELLOW Hash: 236F885B17E9A70F350F85014456AFDF + * @ConQAT.Rating YELLOW Hash: F6D19A31209BC1BD924A51066B3072A4 */ public final class ChartStyle { /** The map for style information of axes. */ diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/DataSeriesStyle.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/DataSeriesStyle.java index c89b2f13d..a31ed9ff1 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/DataSeriesStyle.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/DataSeriesStyle.java @@ -34,7 +34,7 @@ import org.fortiss.tooling.spiderchart.model.EnumerationAxis; * @author hoelzl * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating YELLOW Hash: 605C2C16FA2B5715C060458F6A9C976B + * @ConQAT.Rating YELLOW Hash: 3AB99F05BCC1B0302C4B5288D90E38A5 */ public final class DataSeriesStyle { /** The line style of the data series. */ diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/AxisUtils.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/AxisUtils.java index 1bce905a5..a1155e31e 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/AxisUtils.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/AxisUtils.java @@ -27,7 +27,7 @@ import org.fortiss.tooling.spiderchart.style.AxisStyle; * @author hoelzl * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating YELLOW Hash: 712FBA197FCF8563C357B1A42C68A4BE + * @ConQAT.Rating YELLOW Hash: E0781556136BD6EDD624F9EE61E02547 */ public class AxisUtils { /** Returns the segment point on the axis if the the axis displayed with the given extents. */ diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartLegendWidget.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartLegendWidget.java index af56d6299..ebbe417a1 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartLegendWidget.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartLegendWidget.java @@ -38,7 +38,7 @@ import org.fortiss.tooling.spiderchart.style.LineStyle; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 0EF740F9A513CBEEC9D7A35E31EC8049 + * @ConQAT.Rating YELLOW Hash: 8A8A0E0FAF094F10092E3F50498BB7A9 */ public final class SpiderChartLegendWidget extends SpiderChartWidgetBase { /** The length of the line for each data series. */ diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartSWTCanvas.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartSWTCanvas.java index 627daef2c..248fe7a80 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartSWTCanvas.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartSWTCanvas.java @@ -38,7 +38,7 @@ import org.fortiss.tooling.spiderchart.style.ChartStyle; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 1CFC7CA547E4FAF1E0BE7748B10A11C4 + * @ConQAT.Rating YELLOW Hash: 4BBD92A14F115EB0EE0EE74D134614F2 */ final class SpiderChartSWTCanvas extends Canvas { diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartViewer.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartViewer.java index c702afa97..514e70494 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartViewer.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartViewer.java @@ -34,7 +34,7 @@ import org.fortiss.tooling.spiderchart.style.ChartStyle; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: D1124BA1A8766A1C3F3FA90766803DE1 + * @ConQAT.Rating YELLOW Hash: E1157244DA86EA45049BE0E887E427C4 */ public final class SpiderChartViewer extends Composite implements MouseListener { /** The actual canvas to be used for drawing. */ diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidget.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidget.java index 86c1e2f07..692c15a20 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidget.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidget.java @@ -47,7 +47,7 @@ import org.fortiss.tooling.spiderchart.style.FontStyle; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 2F9DEFBF42B97107E09BBAE343AF2457 + * @ConQAT.Rating YELLOW Hash: 103A633AF236B5DE9D80D98A21C9CA5F */ public final class SpiderChartWidget extends SpiderChartWidgetBase { /** The center point of the chart. */ diff --git a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidgetBase.java b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidgetBase.java index 0e8234a20..df28270d3 100644 --- a/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidgetBase.java +++ b/org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidgetBase.java @@ -28,7 +28,7 @@ import org.fortiss.tooling.spiderchart.style.ChartStyle; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: C26D712A400E929262106865306F385E + * @ConQAT.Rating YELLOW Hash: F404998ACC41E6BCC1519B0B18831757 */ public abstract class SpiderChartWidgetBase { /** The spider chart this component belongs to. */ -- GitLab