From 53a7566dcb7c0dd18cd17f84a3ba845bcd4216a1 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Wed, 7 Sep 2011 15:41:24 +0200
Subject: Rollback to Java 1.6 compliance

---
 source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java')

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 58b2c37..62a900f 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<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();
@@ -94,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);
     }
-- 
cgit v1.2.3