From 094d1bd4e776c5a26ebd18fffa19a9515737e319 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 3 May 2013 16:53:32 +0200 Subject: Added missing generics declarations for Swing components --- src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java | 2 +- src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java | 12 ++++++------ .../gui/tabs/collection/CollectionMemberPropertyPanel.java | 4 ++-- .../java/com/c2kernel/gui/tabs/execution/ActivityViewer.java | 2 +- .../com/c2kernel/gui/tabs/outcome/form/field/ComboField.java | 11 +++++------ 5 files changed, 15 insertions(+), 16 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/tabs') diff --git a/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java b/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java index 9d9a395..e59d1b3 100644 --- a/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java @@ -33,7 +33,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver< JLabel noActs = new JLabel(Language.translate("There are currently no activities that you can execute in this item.")); JPanel view = new JPanel(new GridLayout(1, 1)); ActivityViewer currentActView; - JComboBox activitySelector = new JComboBox(); + JComboBox activitySelector = new JComboBox(); Box activityBox = Box.createHorizontalBox(); String selAct = null; ArrayList activities; diff --git a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java index ab5a539..8f9b3d3 100644 --- a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java @@ -42,9 +42,9 @@ import com.c2kernel.utils.Logger; public class ViewpointPane extends EntityTabPane implements ItemListener, ActionListener, EntityProxyObserver { - JComboBox schemas; - JComboBox views; - JComboBox events; + JComboBox schemas; + JComboBox views; + JComboBox events; JLabel eventDetails; JButton exportButton; JButton viewButton; @@ -84,7 +84,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action viewBox.add(label); viewBox.add(Box.createHorizontalStrut(7)); - schemas = new JComboBox(); + schemas = new JComboBox(); viewBox.add(schemas); viewBox.add(Box.createHorizontalGlue()); schemas.addItemListener(this); @@ -93,7 +93,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action viewBox.add(label); viewBox.add(Box.createHorizontalStrut(7)); - views = new JComboBox(); + views = new JComboBox(); viewBox.add(views); viewBox.add(Box.createHorizontalGlue()); views.addItemListener(this); @@ -109,7 +109,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action eventBox.add(label); eventBox.add(Box.createHorizontalStrut(7)); - events = new JComboBox(); + events = new JComboBox(); eventBox.add(events); eventBox.add(Box.createHorizontalStrut(7)); events.addItemListener(this); 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 6004f59..75e1078 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 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(typeOptions); + newPropType = new JComboBox(typeOptions); newPropBox.add(newPropType); newPropBox.add(Box.createHorizontalStrut(1)); addPropButton = new JButton("Add"); diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java index 7723e16..bb4adbd 100644 --- a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java +++ b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java @@ -47,7 +47,7 @@ public class ActivityViewer extends JPanel implements Runnable { JLabel noOutcome = new JLabel(Language.translate("No outcome data is required for this activity")); ExecutionPane parent; JLabel status; - JComboBox executors; + JComboBox executors; JButton saveButton = new JButton("Save"); JButton loadButton = new JButton("Load"); GridBagLayout gridbag = new GridBagLayout(); 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 comboField; ListOfValues vals; - DefaultComboBoxModel comboModel; + DefaultComboBoxModel comboModel; AnyNode listNode; public ComboField(SimpleType type, AnyNode listNode) { super(); - comboField = new JComboBox(); + comboField = new JComboBox(); 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(vals.keySet().toArray(keyArray)); comboModel.setSelectedItem(vals.getDefaultKey()); comboField.setModel(comboModel); } -- cgit v1.2.3