string spectrum displaying bug correction (EXPDATA-676)

databrowser-gui/src/main/java/org/cdma/gui/databrowser/model/ARowContainerItem.java

@@ -74,10 +74,14 @@ public abstract class ARowContainerItem<C extends JComponent & IScalarTarget, S
         }
     }
 
+    protected void setupArea(AdaptableTextArea area) {
+        area.setOpaque(false);
+        area.setRows(DEFAULT_TEXTAREA_NB_ROWS);
+    }
+
     public AdaptableTextArea createArea() {
         DynamicForegroundAdaptableTextArea adaptableTextArea = new DynamicForegroundAdaptableTextArea();
-        adaptableTextArea.setOpaque(false);
-        adaptableTextArea.setRows(DEFAULT_TEXTAREA_NB_ROWS);
+        setupArea(adaptableTextArea);
         return adaptableTextArea;
     }
 

databrowser-gui/src/main/java/org/cdma/gui/databrowser/model/TextSpectrumItem.java

@@ -14,14 +14,18 @@
  */
 package org.cdma.gui.databrowser.model;
 
+import java.awt.event.KeyEvent;
+
 import org.cdma.gui.databrowser.DataBrowserController;
 import org.cdma.gui.databrowser.interfaces.Item;
+import org.cdma.gui.databrowser.view.DynamicForegroundAdaptableTextArea;
 import org.cdma.gui.databrowser.view.item.RowContainer;
 import org.cdma.gui.databrowser.view.item.TextSpectrumViewer;
 
 import fr.soleil.comete.box.scalarbox.StringScalarBox;
 import fr.soleil.comete.definition.widget.ITextArea;
 import fr.soleil.comete.swing.AdaptableTextArea;
+import fr.soleil.comete.swing.util.DynamicSizeTextArea;
 
 public class TextSpectrumItem extends ARowContainerItem<AdaptableTextArea, AdaptableTextArea, TextSpectrumViewer> {
 
@@ -39,7 +43,7 @@ public class TextSpectrumItem extends ARowContainerItem<AdaptableTextArea, Adapt
 
     @Override
     public AdaptableTextArea createViewer() {
-        return createArea();
+        return new AccessibleTextArea();
     }
 
     @Override
@@ -60,4 +64,45 @@ public class TextSpectrumItem extends ARowContainerItem<AdaptableTextArea, Adapt
         stringBox.disconnectWidget((ITextArea) viewer, readKey);
     }
 
+    // ///////////// //
+    // Inner classes //
+    // ///////////// //
+
+    protected class AccessibleTextArea extends DynamicForegroundAdaptableTextArea {
+
+        private static final long serialVersionUID = -6277702509676756888L;
+
+        public AccessibleTextArea() {
+            super();
+        }
+
+        public AccessibleTextArea(String text) {
+            super(text);
+        }
+
+        @Override
+        protected DynamicSizeTextArea generateTextArea() {
+            DynamicSizeTextArea area = new DynamicSizeTextArea() {
+
+                private static final long serialVersionUID = 171394142405332067L;
+
+                @Override
+                public void keyPressed(KeyEvent e) {
+                    super.keyPressed(e);
+                    if ((e.getKeyCode() == KeyEvent.VK_ENTER)
+                            && (e.isControlDown() || e.isMetaDown() || e.isAltDown() || e.isAltGraphDown())) {
+                        send();
+                    }
+                }
+            };
+            return area;
+        }
+
+        @Override
+        public DynamicSizeTextArea getTextArea() {
+            return textArea;
+        }
+
+    }
+
 }

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

@@ -120,9 +120,8 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer {
         if (item != null) {
             IItemViewer viewer = getItemViewer(item.getFormat());
             if (viewer != null) {
-                viewer.addItem(item);
+                toRunInEDT.addAll(viewer.addItem(item));
             }
-
             DataFormat format = item.getFormat();
             Runnable r = null;
             if (activTabForWritableItem && format != DataFormat.TEXT && !openTabWithManyItem) {

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

@@ -23,7 +23,7 @@ import fr.soleil.comete.box.scalarbox.StringScalarBox;
 
 public class TextSpectrumViewer extends ARowContainerItemViewer<TextSpectrumViewer> {
 
-    private static final long serialVersionUID = -1219029750339263153L;
+    private static final long serialVersionUID = -5389066247142110767L;
 
     private static final int DEFAULT_TEXTAREA_NB_ROWS = 5;
 
@@ -55,14 +55,10 @@ public class TextSpectrumViewer extends ARowContainerItemViewer<TextSpectrumView
     @Override
     protected TextSpectrumItem getRowContainerItem(Item item, DataFormat format) {
         TextSpectrumItem spectrumItem;
-        switch (format) {
-            case TEXT:
+        if (format == DataFormat.TEXT) {
             spectrumItem = new TextSpectrumItem(this, item, controller);
-                break;
-
-            default:
+        } else {
             spectrumItem = null;
-                break;
         }
         return spectrumItem;
     }