Fix bug in ChartSpectrumViewer to display Player if necessary

databrowser-gui/pom_cea.xml

@@ -11,6 +11,11 @@
 	<description>Contains all interfaces common to all modules</description>
 
 	<dependencies>
+		<dependency>
+			<groupId>fr.cea.irfu</groupId>
+			<artifactId>IrfuPlugin</artifactId>
+			<version>1.3.0</version>
+		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
@@ -21,6 +26,11 @@
 			<artifactId>databrowser-core</artifactId>
 			<version>1.3.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.cdma.gui.plugin</groupId>
+			<artifactId>cdma-plugin</artifactId>
+			<version>1.3.0</version>
+		</dependency>
 		<!-- comete https://svn.code.sf.net/p/comete/ -->
 		<dependency>
 			<groupId>fr.soleil.lib.comete</groupId>

databrowser-gui/src/main/java/org/cdma/gui/databrowser/DataBrowser.java

@@ -68,6 +68,7 @@ import fr.soleil.comete.definition.listener.IMouseListener;
 import fr.soleil.comete.definition.widget.properties.ChartProperties;
 import fr.soleil.comete.definition.widget.util.CometeColor;
 import fr.soleil.comete.definition.widget.util.CometeFont;
+import fr.soleil.comete.definition.widget.util.IDrawingThreadManager;
 import fr.soleil.comete.swing.util.ErrorNotificationDelegate;
 import fr.soleil.data.controller.BasicBooleanTargetController;
 import fr.soleil.data.mediator.Mediator;
@@ -720,5 +721,11 @@ public class DataBrowser extends JPanel {
         public void notifyForError(String message, Throwable error) {
             errorNotificationDelegate.notifyForError(message, error);
         }
+
+		@Override
+		public IDrawingThreadManager getDrawingThreadManager() {
+			// TODO Auto-generated method stub
+			return null;
+		}
     }
 }

databrowser-gui/src/main/java/org/cdma/gui/databrowser/view/information/InformationViewer.java

@@ -103,7 +103,8 @@ public class InformationViewer extends JPanel implements IDataBrowserItemListene
 				return result;
 			}
 		};
-        // set a specific column factory to allow referring each column with its enum constant
+		// set a specific column factory to allow referring each column with its enum
+		// constant
 		table.setColumnFactory(new ColumnFactory() {
 			@Override
 			public void configureTableColumn(final TableModel model, final TableColumnExt columnExt) {
@@ -170,7 +171,9 @@ public class InformationViewer extends JPanel implements IDataBrowserItemListene
 			} else {
 				if (browser != null) {
 					tableModel.setEditable(browser.isTypeModifiable());
+					try {
 						final Map<String, String> informationMap = browser.getInformations(currentItemKey);
+
 						DataBrowser.runInEDT(new Runnable() {
 
 							@Override
@@ -179,8 +182,10 @@ public class InformationViewer extends JPanel implements IDataBrowserItemListene
 								// deactivated as it had some undesired side effects
 								// table.packAll();
 							}
-
 						});
+					} catch (Exception e) {
+						controller.showErrorDialog(e.getMessage(), "Cannot set Key");
+					}
 				}
 			}
 		}

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

@@ -63,7 +63,6 @@ public class ChartSpectrumViewer extends AbstractItemViewer<ChartSpectrumItem>
 
     public ChartSpectrumViewer(final DataBrowserController controller) {
         super(controller, false);
-        playerPanel = null;
         settableMenu = false;
         markerEnabled = true;
         initComponents();
@@ -101,6 +100,9 @@ public class ChartSpectrumViewer extends AbstractItemViewer<ChartSpectrumItem>
         splitPane.setOneTouchExpandable(true);
         playerScrollPane = new JScrollPane();
         
+        //Add player panel if necessary
+        
+
         // spectrumY1Items = new ArrayList<IKey>();
         // spectrumY2Items = new ArrayList<IKey>();
         xItem = null;
@@ -146,6 +148,8 @@ public class ChartSpectrumViewer extends AbstractItemViewer<ChartSpectrumItem>
         // Check if the item is already add in the viewer
         writeDataFrame.addItem(item);
         ChartSpectrumItem spectrumItem = displayedItems.get(item.getKey());
+       
+        
         // Menu of writeDataFrame is visible if add source writable
         boolean settableSource = writeDataFrame.isSettableSource(item);
         if (settableSource) {
@@ -156,11 +160,19 @@ public class ChartSpectrumViewer extends AbstractItemViewer<ChartSpectrumItem>
         // Should be always null
         if (spectrumItem == null) {
             spectrumItem = new ChartSpectrumItem(this, item, controller, markerEnabled);
-
             displayedItems.put(item.getKey(), spectrumItem);
             spectrumItem.addChartSpectrumItemListener(this);
         }
         
+        this.playerPanel = spectrumItem.getPlayerPanel();
+        if (playerPanel != null) {
+            playerScrollPane.setViewportView(playerPanel);
+            splitPane.setLeftComponent(playerScrollPane);
+            // splitPane.resetToPreferredSizes();
+            splitPane.setResizeWeight(0.3);
+        }
+       
+
         if ((item != null) && (spectrumItem != null)) {
             AxisType axis = item.getAxis();
             if (axis == AxisType.X) {
@@ -226,7 +238,6 @@ public class ChartSpectrumViewer extends AbstractItemViewer<ChartSpectrumItem>
 
             playerPanel = spectrumItem.getPlayerPanel();
             if (playerPanel != null) {
-
                 playerScrollPane.setViewportView(playerPanel);
                 splitPane.setLeftComponent(playerScrollPane);
                 // splitPane.resetToPreferredSizes();

databrowser-gui/src/main/java/org/cdma/gui/databrowser/view/item/SpectrumViewer.java

@@ -95,6 +95,9 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer {
                 // nop
                 break;
         }
+        if(itemViewer != null) {
+        	 setSelectedComponent((Component)itemViewer);
+        }
 
         return itemViewer;
     }

databrowser-gui/src/main/java/org/cdma/gui/databrowser/view/tree/TreeViewer.java

@@ -319,7 +319,7 @@ public class TreeViewer extends JPanel implements MouseListener, ITreeNodeSelect
             }
         };
         closeItem = new AbstractActionExt(DataBrowser.MESSAGES.getString("Action.SourceTree.CloseItem"),
-                DataBrowser.ICONS.getIcon("Action.CloseSource")) {
+                DataBrowser.ICONS.getIcon("Action.RemoveItems")) {
 
             private static final long serialVersionUID = 6581422153408721280L;