Item closing bug correction (EXPDATA-500, EXPDATA-501)

src/main/java/org/cdma/gui/databrowser/DataBrowserController.java

@@ -742,7 +742,7 @@ public class DataBrowserController implements IAbstractController {
 
     public void selectItem(final IKey itemKey) {
         if (itemKey != null) {
-            if (currentItemKey != itemKey) {
+            if (!itemKey.equals(currentItemKey)) {
                 deselectCurrentItem();
             }
             currentItemKey = itemKey;
@@ -752,24 +752,20 @@ public class DataBrowserController implements IAbstractController {
     }
 
     public void deselectItem(final IKey itemKey) {
-        if (itemKey != null) {
-            if (currentItemKey == itemKey) {
+        if ((itemKey != null) && itemKey.equals(currentItemKey)) {
             currentItemKey = null;
             Item item = items.get(itemKey);
             fireItemDeselected(item);
         }
     }
-    }
 
     public void deselectCurrentItem() {
         if (currentItemKey != null) {
             IKey itemKey = currentItemKey;
             currentItemKey = null;
             Item item = items.get(itemKey);
-            // TODO lors de la suppression de la derniere source, on
-            // deselectionne
-            // puis on supprime, le displaymanager deselectionne aussi car
-            // sa selection change (l item est supprime de la table)
+            // TODO lors de la suppression de la derniere source, on deselectionne puis on supprime, le displaymanager
+            // deselectionne aussi car sa selection change (l'item est supprime de la table)
             if (item != null) {
                 fireItemDeselected(item);
             }

src/main/java/org/cdma/gui/databrowser/view/item/AbstractItemViewer.java

@@ -13,18 +13,22 @@ import fr.soleil.data.service.IKey;
 
 public abstract class AbstractItemViewer<T extends AbstractItem> extends JPanel implements IItemViewer {
 
-    private static final long serialVersionUID = -899982058903780075L;
+    private static final long serialVersionUID = 4069132962276880474L;
+
     protected final Map<IKey, T> displayedItems;
-    protected IKey selectedKey = null;
+    protected IKey selectedKey;
 
     protected DataBrowserController controller;
 
-    public AbstractItemViewer(final DataBrowserController controller) {
+    public AbstractItemViewer(final DataBrowserController controller, boolean init) {
         super();
         this.controller = controller;
-        displayedItems = new HashMap<IKey, T>();
+        displayedItems = new HashMap<>();
+        selectedKey = null;
+        if (init) {
             initComponents();
         }
+    }
 
     protected abstract void initComponents();
 

src/main/java/org/cdma/gui/databrowser/view/item/ChartSpectrumViewer.java

@@ -36,7 +36,7 @@ import fr.soleil.data.service.IKey;
 public class ChartSpectrumViewer extends AbstractItemViewer<ChartSpectrumItem>
         implements IItemViewer, IChartSpectrumItemListener {
 
-    private static final long serialVersionUID = 8555450804898443286L;
+    private static final long serialVersionUID = 1208635272009387007L;
 
     private static final Color[] COLOR_ARRAY = new Color[] { Color.BLUE, Color.RED, Color.GREEN, Color.ORANGE,
             Color.CYAN, Color.MAGENTA, Color.PINK, Color.DARK_GRAY, Color.BLACK };
@@ -47,12 +47,10 @@ public class ChartSpectrumViewer extends AbstractItemViewer<ChartSpectrumItem>
 
     private JSplitPane splitPane;
     private JScrollPane playerScrollPane;
-    private PlayerPanel playerPanel = null;
+    private PlayerPanel playerPanel;
     private WriteDataFrameMenu writeDataFrame;
 
-    private boolean settableMenu = false;
-
-    private DataBrowserController controller = null;
+    private boolean settableMenu;
 
     // TODO a voir
     // private List<IKey> spectrumY1Items;
@@ -60,7 +58,10 @@ public class ChartSpectrumViewer extends AbstractItemViewer<ChartSpectrumItem>
     private AbstractItem xItem;
 
     public ChartSpectrumViewer(final DataBrowserController controller) {
-        super(controller);
+        super(controller, false);
+        playerPanel = null;
+        settableMenu = false;
+        initComponents();
         layoutComponents();
     }
 

src/main/java/org/cdma/gui/databrowser/view/item/MatrixViewer.java

@@ -71,11 +71,11 @@ public class MatrixViewer extends AbstractItemViewer<MatrixItem>
     private DefaultComboBoxModel<Object> xScaleModel;
     private DefaultComboBoxModel<Object> yScaleModel;
 
-    private String imageSnapshotDirectory = null;
-    private String imageDataDirectory = null;
+    private String imageSnapshotDirectory;
+    private String imageDataDirectory;
 
     public MatrixViewer(DataBrowserController controller) {
-        super(controller);
+        super(controller, true);
         layoutComponent();
     }
 

src/main/java/org/cdma/gui/databrowser/view/item/ScalarViewer.java

@@ -48,7 +48,7 @@ public class ScalarViewer extends AbstractItemViewer<ScalarItem> implements IIte
     private GridBagConstraints gbc = new GridBagConstraints();
 
     public ScalarViewer(DataBrowserController controller) {
-        super(controller);
+        super(controller, true);
         layoutComponents();
     }
 

src/main/java/org/cdma/gui/databrowser/view/item/TextSpectrumViewer.java

@@ -14,8 +14,6 @@ import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 import javax.swing.SwingUtilities;
 
-import net.miginfocom.swing.MigLayout;
-
 import org.cdma.gui.databrowser.DataBrowserController;
 import org.cdma.gui.databrowser.interfaces.DataFormat;
 import org.cdma.gui.databrowser.interfaces.IDataSourceBrowser;
@@ -24,10 +22,11 @@ import org.cdma.gui.databrowser.interfaces.Item;
 import org.cdma.gui.databrowser.model.TextSpectrumItem;
 
 import fr.soleil.comete.box.scalarbox.StringScalarBox;
+import net.miginfocom.swing.MigLayout;
 
 public class TextSpectrumViewer extends AbstractItemViewer<TextSpectrumItem> implements IItemViewer {
 
-    private static final long serialVersionUID = 312054827522085942L;
+    private static final long serialVersionUID = -686927584905805112L;
 
     private static final int DEFAULT_TEXTAREA_NB_ROWS = 5;
 
@@ -42,7 +41,7 @@ public class TextSpectrumViewer extends AbstractItemViewer<TextSpectrumItem> imp
     private int nbRowsForTextArea;
 
     public TextSpectrumViewer(DataBrowserController controller) {
-        super(controller);
+        super(controller, true);
         layoutComponents();
     }