Revert "Added missing generics declarations for Swing components"

This reverts commit 094d1bd4e776c5a26ebd18fffa19a9515737e319.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java b/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
index c17c3fd..3be29f5 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
+++ b/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
@@ -28,14 +28,14 @@ import com.c2kernel.scripting.Script;
 

 public class ComboField extends StringEditField {

 

-    JComboBox<String> comboField;

+    JComboBox comboField;

     ListOfValues vals;

-    DefaultComboBoxModel<String> comboModel;

+    DefaultComboBoxModel comboModel;

     AnyNode listNode;

 

     public ComboField(SimpleType type, AnyNode listNode) {

         super();

-        comboField = new JComboBox<String>();

+        comboField = new JComboBox();

         content = type;

         this.listNode = listNode;

         createLOV();

@@ -45,7 +45,8 @@ public class ComboField extends StringEditField {
 	public String getDefaultValue() {

         if (vals.getDefaultKey() != null)

             return vals.get(vals.getDefaultKey()).toString();

-        return "";

+        else

+            return "";

     }

 

     @Override

@@ -93,7 +94,7 @@ public class ComboField extends StringEditField {
         }

 

         String[] keyArray = new String[vals.keySet().size()];

-        comboModel = new DefaultComboBoxModel<String>(vals.keySet().toArray(keyArray));

+        comboModel = new DefaultComboBoxModel(vals.keySet().toArray(keyArray));

         comboModel.setSelectedItem(vals.getDefaultKey());

         comboField.setModel(comboModel);

     }