From 094d1bd4e776c5a26ebd18fffa19a9515737e319 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 May 2013 16:53:32 +0200
Subject: Added missing generics declarations for Swing components

---
 .../com/c2kernel/gui/tabs/outcome/form/field/ComboField.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/main/java/com/c2kernel/gui/tabs/outcome')

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 3be29f5..c17c3fd 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 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();
@@ -45,8 +45,7 @@ public class ComboField extends StringEditField {
 	public String getDefaultValue() {
         if (vals.getDefaultKey() != null)
             return vals.get(vals.getDefaultKey()).toString();
-        else
-            return "";
+        return "";
     }
 
     @Override
@@ -94,7 +93,7 @@ public class ComboField extends StringEditField {
         }
 
         String[] keyArray = new String[vals.keySet().size()];
-        comboModel = new DefaultComboBoxModel(vals.keySet().toArray(keyArray));
+        comboModel = new DefaultComboBoxModel<String>(vals.keySet().toArray(keyArray));
         comboModel.setSelectedItem(vals.getDefaultKey());
         comboField.setModel(comboModel);
     }
-- 
cgit v1.2.3