Fixes the sizes when the field name or the type is too long

Author: CesarCoelho

sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/Entry.java

@@ -23,6 +23,7 @@
 import java.lang.reflect.Field;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.swing.BoxLayout;
 import javax.swing.JLabel;
 import org.ccsds.moims.mo.mal.helpertools.helpers.HelperAttributes;
 import org.ccsds.moims.mo.mal.structures.Union;
@@ -39,6 +40,7 @@ public abstract class Entry extends javax.swing.JPanel {
     @SuppressWarnings("unchecked")
     public Entry(String fieldName, Object obj, boolean editable, boolean objIsNull) {
         initComponents();
+        this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
 
         this.fieldName.setText(fieldName);
         String className = "--";

sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/FieldsHandler.java

@@ -125,7 +125,8 @@ private static Object generateFieldObjectFromField(Object rawObj, Field field) {
                     | InvocationTargetException
                     | IllegalArgumentException
                     | IllegalAccessException ex) {
-                Logger.getLogger(MOWindow.class.getName()).log(Level.SEVERE, null, ex);
+                Logger.getLogger(MOWindow.class.getName()).log(Level.SEVERE,
+                        "Could not instantiate a new Object for class: " + constructor.getName(), ex);
             }
         }
 
@@ -147,12 +148,18 @@ private static Object generateFieldObjectFromField(Object rawObj, Field field) {
                     return HelperAttributes.javaType2Attribute(constructor.newInstance((byte) 1));
                 }
 
-                return HelperAttributes.javaType2Attribute(constructor.newInstance(1));
+                if (name.equals("java.lang.Long")) {
+                    return HelperAttributes.javaType2Attribute(0L);
+                }
+
+                Object newObj = constructor.newInstance(1);
+                return HelperAttributes.javaType2Attribute(newObj);
             } catch (InstantiationException
                     | InvocationTargetException
                     | IllegalArgumentException
                     | IllegalAccessException ex) {
-                Logger.getLogger(MOWindow.class.getName()).log(Level.SEVERE, null, ex);
+                Logger.getLogger(MOWindow.class.getName()).log(Level.SEVERE,
+                        "Could not instantiate a new Object for class: " + name, ex);
             }
         }
 

sdk/consumer-test-tool/src/main/java/esa/mo/nmf/ctt/windows/element/MOWindow.java

@@ -73,7 +73,7 @@ public MOWindow(Object obj, boolean editable, String title) {
         initComponents();
         this.setLocationRelativeTo(null);
         this.setModal(true);
-        componentsPanel.setLayout(new BoxLayout(componentsPanel, BoxLayout.PAGE_AXIS));
+        componentsPanel.setLayout(new BoxLayout(componentsPanel, BoxLayout.Y_AXIS));
 
         if (title != null && !title.trim().isEmpty()) {
             this.setTitle(title);
@@ -120,15 +120,19 @@ public MOWindow(Object obj, boolean editable, String title) {
     }
 
     private void interpretReceivedObj(Object obj, boolean editable) {
-        // Is the object a List?
-        if (obj instanceof ElementList) {
+        if (obj instanceof ElementList) { // Is the object a List?
             ElementList list = (ElementList) obj;
 
             for (int i = 0; i < list.size(); i++) {
                 String fieldName = String.valueOf(componentsPanel.getComponentCount());
+                boolean isNull = (list.get(i) == null);
 
-                if (!(list.get(i) instanceof Element)) {
-                    if (list.get(i) == null) {
+                if (list.get(i) instanceof Element) {
+                    ListEntry moElementList = new ListEntry(this,
+                            fieldName, list.get(i), editable, isNull);
+                    componentsPanel.add(moElementList);
+                } else {
+                    if (isNull) {
                         try {
                             Element something = MALElementsRegistry.elementToElementList(list);
                             ListEntry moElementList = new ListEntry(this,
@@ -138,19 +142,12 @@ private void interpretReceivedObj(Object obj, boolean editable) {
                             Logger.getLogger(MOWindow.class.getName()).log(Level.SEVERE, null, ex);
                         }
                     } else {
-                        ListEntry moElementList = new ListEntry(this,
-                                fieldName,
+                        ListEntry moElementList = new ListEntry(this, fieldName,
                                 FieldsHandler.filterRawObject(list.get(i)), editable,
-                                (list.get(i) == null));
+                                isNull);
                         componentsPanel.add(moElementList);
                     }
-                } else {
-                    ListEntry moElementList = new ListEntry(this,
-                            fieldName,
-                            list.get(i), editable, (list.get(i) == null));
-                    componentsPanel.add(moElementList);
                 }
-
             }
 
             java.awt.event.ActionListener actionListener = this::buttonAddActionPerformed;
@@ -237,7 +234,7 @@ public void refreshHorizontalSize() {
             String paramType = entry.getFieldTypeString();
 
             // Calculate the size we want...
-            int horizontalSize = paramType.length() * 8 + 450;
+            int horizontalSize = paramType.length() * 12 + 450;
 
             // Is the value greater than the current one?
             if (horizontalSize > this.getWidth()) {
@@ -247,38 +244,6 @@ public void refreshHorizontalSize() {
 
         this.validate();
         this.repaint();
-        /*
-        double maxFieldName = 0;
-        double maxFieldType = 0;
-
-        for (int i = 0; i < componentsPanel.getComponentCount(); i++) {
-            Entry entry = (Entry) componentsPanel.getComponent(i);
-            double width1 = entry.getFieldName().getSize().getWidth();
-            maxFieldName = (width1 > maxFieldName) ? width1 : maxFieldName;
-
-            double width2 = entry.getFieldType().getSize().getWidth();
-            maxFieldType = (width2 > maxFieldType) ? width2 : maxFieldType;
-        }
-
-        for (int i = 0; i < componentsPanel.getComponentCount(); i++) {
-            Entry entry = (Entry) componentsPanel.getComponent(i);
-            
-            Dimension dimName = entry.getFieldName().getSize();
-            Dimension newDimName = new Dimension();
-            newDimName.setSize(maxFieldName, dimName.getHeight());
-            entry.getFieldName().setPreferredSize(newDimName);
-            entry.getFieldName().setSize(newDimName);
-            
-            Dimension dimType = entry.getFieldType().getSize();
-            Dimension newDimType = new Dimension();
-            newDimType.setSize(maxFieldType, dimType.getHeight());
-            entry.getFieldType().setPreferredSize(newDimType);
-            entry.getFieldType().setSize(newDimType);
-        }
-        
-        this.validate();
-        this.repaint();
-         */
     }
 
     public javax.swing.JPanel getComponentsPanel() {