summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/gui/tabs/outcome
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2013-05-03 16:53:32 +0200
committerAndrew Branson <andrew.branson@cern.ch>2013-05-03 16:53:32 +0200
commit094d1bd4e776c5a26ebd18fffa19a9515737e319 (patch)
tree9a669a6653119279aa9f113f69a49bcd7b7dc200 /src/main/java/com/c2kernel/gui/tabs/outcome
parentae09dbc6dc928c63752adccf08035bae3c7d2ff1 (diff)
Added missing generics declarations for Swing components
Diffstat (limited to 'src/main/java/com/c2kernel/gui/tabs/outcome')
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java11
1 files changed, 5 insertions, 6 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 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);
}