summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/gui/tabs/collection
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2013-05-14 17:25:43 +0200
committerAndrew Branson <andrew.branson@cern.ch>2013-05-14 17:25:43 +0200
commitd08240a1575cfbf0fd19f8c4664140928b8d386d (patch)
tree470139ef7728e6b8a83810d9a7d0c09ec8e5c9ea /src/main/java/com/c2kernel/gui/tabs/collection
parent094d1bd4e776c5a26ebd18fffa19a9515737e319 (diff)
Revert "Added missing generics declarations for Swing components"
This reverts commit 094d1bd4e776c5a26ebd18fffa19a9515737e319.
Diffstat (limited to 'src/main/java/com/c2kernel/gui/tabs/collection')
-rw-r--r--src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
index 75e1078..6004f59 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
@@ -41,7 +41,7 @@ public class CollectionMemberPropertyPanel extends JPanel implements ActionListe
JButton delPropButton;
Box newPropBox;
private JTextField newPropName;
- private JComboBox<String> newPropType;
+ private JComboBox newPropType;
String[] typeOptions = { "String", "Boolean", "Integer", "Float" };
String[] typeInitVal = { "", "false", "0", "0.0"};
@@ -111,7 +111,7 @@ public class CollectionMemberPropertyPanel extends JPanel implements ActionListe
newPropBox.add(Box.createHorizontalGlue());
newPropName = new JTextField(15);
newPropBox.add(newPropName);
- newPropType = new JComboBox<String>(typeOptions);
+ newPropType = new JComboBox(typeOptions);
newPropBox.add(newPropType);
newPropBox.add(Box.createHorizontalStrut(1));
addPropButton = new JButton("Add");