diff --git a/src/main/java/fr/cemagref/observation/observers/jfreechart/TemporalChart.java b/src/main/java/fr/cemagref/observation/observers/jfreechart/TemporalChart.java
index d3f463e9d34937e164619a906b9201e0556117bc..709447d5e1771e4a623e0b0dbd6826c464e78845 100644
--- a/src/main/java/fr/cemagref/observation/observers/jfreechart/TemporalChart.java
+++ b/src/main/java/fr/cemagref/observation/observers/jfreechart/TemporalChart.java
@@ -19,83 +19,88 @@ import fr.cemagref.ohoui.swing.OhOUI;
 import fr.cemagref.ohoui.swing.OhOUIDialog;
 
 public abstract class TemporalChart implements ObserverListener, Configurable, Drawable {
-	
+
     private transient ChartPanel chartPanel;
     private transient JFreeChart jfchart;
-	protected transient XYSeriesCollection dataset;
+    protected transient XYSeriesCollection dataset;
     protected GraphType graphType = GraphType.LINE;
-    
     /**
      * <code>variable</code> is the variable to represent
      */
     protected transient ObservablesHandler.ObservableFetcher variable;
     protected transient ObservablesHandler classObservable;
-	private String title = "", xAxisLabel = "Time", yAxisLabel = "";
-	
+    private String title = "", xAxisLabel = "Time", yAxisLabel = "";
+
     public TemporalChart() {
         graphTypeUpdated();
     }
-    
+
     public TemporalChart(ObservablesHandler.ObservableFetcher variable) {
         this();
         this.variable = variable;
         variableUpdated();
     }
-    
+
     protected void variableUpdated() {
         if (variable != null) {
             yAxisLabel = variable.getDescription();
             title = "Observation of " + yAxisLabel;
         }
     }
-    
+
     protected void graphTypeUpdated() {
-		PlotOrientation orientation = PlotOrientation.VERTICAL;
-		boolean legend = true;
-		boolean tooltips = true;
-		boolean urls = false;
-		
-		if(graphType.equals(GraphType.POINT)){
-			jfchart=ChartFactory.createScatterPlot(title,xAxisLabel,yAxisLabel,dataset,orientation,legend,tooltips,urls);
-		}else if(graphType.equals(GraphType.LINE)){
-			jfchart = ChartFactory.createXYLineChart(title,xAxisLabel,yAxisLabel,dataset,orientation,legend,tooltips,urls);
-		}else if(graphType.equals(GraphType.AREA)){
-			jfchart = ChartFactory.createXYAreaChart(title,xAxisLabel,yAxisLabel,dataset,orientation,legend,tooltips,urls);
-		}else if(graphType.equals(GraphType.STEP)){
-			jfchart = ChartFactory.createXYStepChart(title,xAxisLabel,yAxisLabel,dataset,orientation,legend,tooltips,urls);
-		}else if(graphType.equals(GraphType.AREASTEP)){
-			jfchart = ChartFactory.createXYStepAreaChart(title,xAxisLabel,yAxisLabel,dataset,orientation,legend,tooltips,urls);
-		}
-        if (chartPanel == null)
+        PlotOrientation orientation = PlotOrientation.VERTICAL;
+        boolean legend = true;
+        boolean tooltips = true;
+        boolean urls = false;
+
+        if (graphType.equals(GraphType.POINT)) {
+            jfchart = ChartFactory.createScatterPlot(title, xAxisLabel, yAxisLabel, dataset, orientation, legend, tooltips, urls);
+        } else if (graphType.equals(GraphType.LINE)) {
+            jfchart = ChartFactory.createXYLineChart(title, xAxisLabel, yAxisLabel, dataset, orientation, legend, tooltips, urls);
+        } else if (graphType.equals(GraphType.AREA)) {
+            jfchart = ChartFactory.createXYAreaChart(title, xAxisLabel, yAxisLabel, dataset, orientation, legend, tooltips, urls);
+        } else if (graphType.equals(GraphType.STEP)) {
+            jfchart = ChartFactory.createXYStepChart(title, xAxisLabel, yAxisLabel, dataset, orientation, legend, tooltips, urls);
+        } else if (graphType.equals(GraphType.AREASTEP)) {
+            jfchart = ChartFactory.createXYStepAreaChart(title, xAxisLabel, yAxisLabel, dataset, orientation, legend, tooltips, urls);
+        }
+        if (chartPanel == null) {
             chartPanel = new ChartPanel(jfchart);
-        else
+        } else {
             chartPanel.setChart(jfchart);
-	}
-	
-	public JFreeChart getJfchart() {
-		return jfchart;
-	}
+        }
+    }
 
+    public JFreeChart getJfchart() {
+        return jfchart;
+    }
+
+    @Override
     public void configure() {
         ObservablesHandler.ObservableFetcher variableBak = variable;
-        OhOUIDialog dialog = OhOUI.getDialog(null,this,new NoTransientField());
+        OhOUIDialog dialog = OhOUI.getDialog(null, this, new NoTransientField());
         JComboBox comboBox = new JComboBox(classObservable.getDescriptions());
-        if (variable != null)
+        if (variable != null) {
             comboBox.setSelectedItem(variable.getDescription());
+        }
         OUIPanel ouiPanel = OUIPanel.makeLabelComponentOUIPanel(variable, comboBox, "Variable", "");
-        dialog.getContentPane().add(ouiPanel.getPanel(),0);
+        dialog.getContentPane().add(ouiPanel.getPanel(), 0);
         dialog.pack();
         dialog.setVisible(true);
-        variable = classObservable.getObservableFetcher((String)comboBox.getSelectedItem());
-        if (variable != null)
-            if ( ! variable.equals(variableBak))
+        variable = classObservable.getObservableFetcher((String) comboBox.getSelectedItem());
+        if (variable != null) {
+            if (!variable.equals(variableBak)) {
                 variableUpdated();
+            }
+        }
         graphTypeUpdated();
-    } 
+    }
 
     /**
      * @see fr.cemagref.observation.kernel.ObserverListener#addObservable(fr.cemagref.observation.kernel.ObservablesHandler)
      */
+    @Override
     public void addObservable(ObservablesHandler classObservable) {
         this.classObservable = classObservable;
     }
@@ -103,6 +108,7 @@ public abstract class TemporalChart implements ObserverListener, Configurable, D
     /**
      * @see fr.cemagref.observation.gui.Drawable#getDisplay()
      */
+    @Override
     public JComponent getDisplay() {
         return chartPanel;
     }
@@ -110,6 +116,7 @@ public abstract class TemporalChart implements ObserverListener, Configurable, D
     /**
      * @see fr.cemagref.observation.gui.Drawable#getTitle()
      */
+    @Override
     public String getTitle() {
         return title;
     }
@@ -117,12 +124,15 @@ public abstract class TemporalChart implements ObserverListener, Configurable, D
     /**
      * @see fr.cemagref.observation.kernel.ObserverListener#init()
      */
+    @Override
     public void init() {
-        if (classObservable != null)
-            if (classObservable.numberOfAttributes() > 0)
-                variable = classObservable.getObservableFetcher(0);
+        if (variable == null) {
+            if (classObservable != null) {
+                if (classObservable.numberOfAttributes() > 0) {
+                    variable = classObservable.getObservableFetcher(0);
+                }
+            }
             // TODO classObservable.getAttributes().length *must* be > 0
+        }
     }
-   
-    
 }