From 29bbf451a22916d39017ec1a3f53f4e0f0e65ee0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Mon, 1 Aug 2011 13:57:20 +0200
Subject: Java7 compatibility and some code refresh

---
 source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java  | 9 +++++----
 .../com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
 mode change 100755 => 100644 source/com/c2kernel/gui/tabs/outcome/form/field/ListOfValues.java

(limited to 'source/com/c2kernel/gui/tabs/outcome')

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
old mode 100755
new mode 100644
index 2a0b34a..303a870
--- 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
old mode 100755
new mode 100644
index 2557cbe..3204766
--- 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;
 
-- 
cgit v1.2.3