Skip to content
Snippets Groups Projects
Commit 8761a5ae authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

NullPointerException avoided

parent 2571cc6d
No related branches found
No related tags found
No related merge requests found
......@@ -61,7 +61,7 @@ public class ChartSpectrumItem extends AbstractItem<Chart> implements IChartSpec
@Override
public void computeKeys() {
IChartViewer chartViewer = viewer;
chartViewer.setAxisName("", IChartViewer.X);
chartViewer.setAxisName(ObjectUtils.EMPTY_STRING, IChartViewer.X);
super.computeKeys();
Item xLocalItem = getXItem();
......@@ -171,7 +171,7 @@ public class ChartSpectrumItem extends AbstractItem<Chart> implements IChartSpec
protected void applyDisplayName() {
ChartSpectrumViewer chartSpectrumViewer = ObjectUtils.recoverObject(chartSpectrumViewerRef);
if (chartSpectrumViewer != null) {
if ((chartSpectrumViewer != null) && (readKey != null)) {
IChartViewer chartViewer = chartSpectrumViewer.getChartViewer();
// Get display name
......@@ -195,7 +195,7 @@ public class ChartSpectrumItem extends AbstractItem<Chart> implements IChartSpec
protected void applyCurveStyle() {
ChartSpectrumViewer chartSpectrumViewer = ObjectUtils.recoverObject(chartSpectrumViewerRef);
if (chartSpectrumViewer != null) {
if ((chartSpectrumViewer != null) && (readKey != null)) {
IChartViewer chartViewer = chartSpectrumViewer.getChartViewer();
int nbCurves = getNbCurves();
......@@ -236,7 +236,7 @@ public class ChartSpectrumItem extends AbstractItem<Chart> implements IChartSpec
public void applySelectionStyle() {
ChartSpectrumViewer chartSpectrumViewer = ObjectUtils.recoverObject(chartSpectrumViewerRef);
if (chartSpectrumViewer != null) {
if ((chartSpectrumViewer != null) && (readKey != null)) {
IChartViewer chartViewer = chartSpectrumViewer.getChartViewer();
String readDataViewId = readKey.getInformationKey();
......@@ -278,7 +278,7 @@ public class ChartSpectrumItem extends AbstractItem<Chart> implements IChartSpec
protected void applyAxisStyle() {
ChartSpectrumViewer chartSpectrumViewer = ObjectUtils.recoverObject(chartSpectrumViewerRef);
if (chartSpectrumViewer != null) {
if ((chartSpectrumViewer != null) && (readKey != null)) {
IChartViewer chartViewer = chartSpectrumViewer.getChartViewer();
PlotProperties dataViewPlotProperties = null;
int chartAxis = -1;
......@@ -359,10 +359,5 @@ public class ChartSpectrumItem extends AbstractItem<Chart> implements IChartSpec
public void setMarkerEnabled(boolean markerEnabled) {
this.markerEnabled = markerEnabled;
}
// public void setLineWidthMarkerSize(final int lineWidth, final int markerSize) {
// this.lineWidth = lineWidth;
// this.markerSize = markerSize;
// applySelectionStyle();
// }
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment