2 files changed, 6 insertions, 5 deletions
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
index 2a0b34a..303a870 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
@@ -28,14 +28,14 @@ import com.c2kernel.utils.Logger;
 
 public class ComboField extends StringEditField {
 
-    JComboBox comboField;
+    JComboBox<String> comboField;
     ListOfValues vals;
-    DefaultComboBoxModel comboModel;
+    DefaultComboBoxModel<String> comboModel;
     AnyNode listNode;
 
     public ComboField(SimpleType type, AnyNode listNode) {
         super();
-        comboField = new JComboBox();
+        comboField = new JComboBox<String>();
         content = type;
         this.listNode = listNode;
         createLOV();
@@ -88,7 +88,8 @@ public class ComboField extends StringEditField {
             }
         }
 
-        comboModel = new DefaultComboBoxModel(vals.keySet().toArray());
+        String[] keyArray = new String[vals.keySet().size()];
+        comboModel = new DefaultComboBoxModel<String>(vals.keySet().toArray(keyArray));
         comboModel.setSelectedItem(vals.getDefaultKey());
         comboField.setModel(comboModel);
     }
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java
index 2557cbe..3204766 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
  * All rights reserved.
  **************************************************************************/
 
-public class ListOfValues extends HashMap {
+public class ListOfValues extends HashMap<String, Object> {
 
     String defaultKey = null;