diff --git a/tools.descartes.pavo/src/tools/descartes/pavo/types/BoxPlot.java b/tools.descartes.pavo/src/tools/descartes/pavo/types/BoxPlot.java index b77dc7a67e7cd34be1a71f7cb17722bce6b37402..751d1a2ba8e833aa2b4b4c260c09366a611a9abf 100644 --- a/tools.descartes.pavo/src/tools/descartes/pavo/types/BoxPlot.java +++ b/tools.descartes.pavo/src/tools/descartes/pavo/types/BoxPlot.java @@ -72,7 +72,7 @@ public class BoxPlot extends AbstractVisualizationType implements IVisualization CategoryPlot plot = new CategoryPlot(dataset, xAxis, yAxis, renderer); JFreeChart chart = new JFreeChart(plot); - for (AbstractQuantitativeResult r : result.getResults()) { + for (AbstractQuantitativeResult r : getResult().getResults()) { if (r instanceof SeriesResultPavo) { List<Double> list = new LinkedList<Double>(); for (Point p : ((SeriesResultPavo) r).getValues()) { diff --git a/tools.descartes.pavo/src/tools/descartes/pavo/types/BubbleChart.java b/tools.descartes.pavo/src/tools/descartes/pavo/types/BubbleChart.java index 781187c2a938bf19f3842b3490413f4fe6a35789..8576bdb1d84ba29266377e935a720709cabb0c80 100644 --- a/tools.descartes.pavo/src/tools/descartes/pavo/types/BubbleChart.java +++ b/tools.descartes.pavo/src/tools/descartes/pavo/types/BubbleChart.java @@ -112,7 +112,7 @@ public class BubbleChart extends AbstractVisualizationType implements IVisualiza setActionListeners(); // erstelle Liste aller Series - for (AbstractQuantitativeResult r : result.getResults()) { + for (AbstractQuantitativeResult r : getResult().getResults()) { if (r instanceof ValueResultPavo) { { for (dof d : ((ValueResultPavo) r).getDofs()) { @@ -139,7 +139,7 @@ public class BubbleChart extends AbstractVisualizationType implements IVisualiza } public int getItemCount(int series) { - return result.getResults().size(); + return getResult().getResults().size(); } public Number getX(int series, int item) { @@ -150,7 +150,7 @@ public class BubbleChart extends AbstractVisualizationType implements IVisualiza public double getXValue(int series, int item) { // Hier x dof nehmen - for (dof d : ((ValueResultPavo) result.getResults().get(item)).getDofs()) { + for (dof d : ((ValueResultPavo) getResult().getResults().get(item)).getDofs()) { if (d.getDofname().equals(actualX)) { return d.getDofvalue(); } @@ -163,7 +163,7 @@ public class BubbleChart extends AbstractVisualizationType implements IVisualiza } public double getYValue(int series, int item) { - for (dof d : ((ValueResultPavo) result.getResults().get(item)).getDofs()) { + for (dof d : ((ValueResultPavo) getResult().getResults().get(item)).getDofs()) { if (d.getDofname().equals(actualY)) { return d.getDofvalue(); } @@ -176,7 +176,7 @@ public class BubbleChart extends AbstractVisualizationType implements IVisualiza } public double getZValue(int series, int item) { - return ((ValueResultPavo) result.getResults().get(item)).getValue() * sizefactor; + return ((ValueResultPavo) getResult().getResults().get(item)).getValue() * sizefactor; } public void addChangeListener(DatasetChangeListener listener) { @@ -197,7 +197,7 @@ public class BubbleChart extends AbstractVisualizationType implements IVisualiza @SuppressWarnings("rawtypes") public Comparable getSeriesKey(int series) { - return result.getMetric(); + return getResult().getMetric(); } @SuppressWarnings("rawtypes") @@ -227,7 +227,7 @@ public class BubbleChart extends AbstractVisualizationType implements IVisualiza @Override public boolean canVisualize() { - for (AbstractQuantitativeResult r : this.result.getResults()) { + for (AbstractQuantitativeResult r : this.getResult().getResults()) { if (!(r instanceof ValueResultPavo)) return false; if (!(((ValueResultPavo) r).getDofs().size() == 2)) diff --git a/tools.descartes.pavo/src/tools/descartes/pavo/types/HeatMap.java b/tools.descartes.pavo/src/tools/descartes/pavo/types/HeatMap.java index 8b092f5ba3c7cc3df9dca8bb5b1ecae63bdaeb54..4a91e72320f11f64f3aa4c44415e5425b9a46304 100644 --- a/tools.descartes.pavo/src/tools/descartes/pavo/types/HeatMap.java +++ b/tools.descartes.pavo/src/tools/descartes/pavo/types/HeatMap.java @@ -98,7 +98,7 @@ public class HeatMap extends AbstractVisualizationType implements IVisualization panelX.add(comboX); panelY.add(comboY); setActionListeners(); - for (AbstractQuantitativeResult r : result.getResults()) { + for (AbstractQuantitativeResult r : this.getResult().getResults()) { if (r instanceof ValueResultPavo) { { for (dof d : ((ValueResultPavo) r).getDofs()) { @@ -135,7 +135,7 @@ public class HeatMap extends AbstractVisualizationType implements IVisualization } public int getItemCount(int series) { - return result.getResults().size(); + return getResult().getResults().size(); } public Number getX(int series, int item) { @@ -145,7 +145,7 @@ public class HeatMap extends AbstractVisualizationType implements IVisualization public double getXValue(int series, int item) { // Hier x dof nehmen - for (dof d : ((ValueResultPavo) result.getResults().get(item)).getDofs()) { + for (dof d : ((ValueResultPavo) getResult().getResults().get(item)).getDofs()) { if (d.getDofname().equals(actualX)) { return d.getDofvalue(); } @@ -158,7 +158,7 @@ public class HeatMap extends AbstractVisualizationType implements IVisualization } public double getYValue(int series, int item) { - for (dof d : ((ValueResultPavo) result.getResults().get(item)).getDofs()) { + for (dof d : ((ValueResultPavo) getResult().getResults().get(item)).getDofs()) { if (d.getDofname().equals(actualY)) { return d.getDofvalue(); } @@ -171,7 +171,7 @@ public class HeatMap extends AbstractVisualizationType implements IVisualization } public double getZValue(int series, int item) { - return ((ValueResultPavo) result.getResults().get(item)).getValue(); + return ((ValueResultPavo) getResult().getResults().get(item)).getValue(); } public void addChangeListener(DatasetChangeListener listener) { @@ -192,7 +192,7 @@ public class HeatMap extends AbstractVisualizationType implements IVisualization @SuppressWarnings("rawtypes") public Comparable getSeriesKey(int series) { - return result.getMetric(); + return getResult().getMetric(); } @SuppressWarnings("rawtypes") @@ -220,7 +220,7 @@ public class HeatMap extends AbstractVisualizationType implements IVisualization double lastdof1 = Double.MIN_VALUE; double lastdof2 = Double.MIN_VALUE; List<String> dofs = new LinkedList<String>(); - for (AbstractQuantitativeResult r : this.result.getResults()) { + for (AbstractQuantitativeResult r : this.getResult().getResults()) { if (!(r instanceof ValueResultPavo)) { return false; @@ -240,7 +240,7 @@ public class HeatMap extends AbstractVisualizationType implements IVisualization return false; } } - for (AbstractQuantitativeResult r : this.result.getResults()) { + for (AbstractQuantitativeResult r : this.getResult().getResults()) { if (lastdof1 == Double.MIN_VALUE) lastdof1 = ((ValueResultPavo) r).getDofs().get(0).getDofvalue();