From 53a7566dcb7c0dd18cd17f84a3ba845bcd4216a1 Mon Sep 17 00:00:00 2001 From: abranson Date: Wed, 7 Sep 2011 15:41:24 +0200 Subject: Rollback to Java 1.6 compliance --- source/com/c2kernel/graph/view/EditorToolBar.java | 4 ++-- source/com/c2kernel/graph/view/VertexPropertyPanel.java | 8 ++++---- source/com/c2kernel/gui/MainFrame.java | 4 ++-- source/com/c2kernel/gui/tabs/ExecutionPane.java | 2 +- source/com/c2kernel/gui/tabs/ViewpointPane.java | 12 ++++++------ source/com/c2kernel/gui/tabs/execution/ActivityViewer.java | 2 +- .../com/c2kernel/gui/tabs/outcome/form/field/ComboField.java | 8 ++++---- source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java | 2 +- .../lifecycle/instance/gui/view/TransitionPanel.java | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/source/com/c2kernel/graph/view/EditorToolBar.java b/source/com/c2kernel/graph/view/EditorToolBar.java index cc7ab41..f84b084 100644 --- a/source/com/c2kernel/graph/view/EditorToolBar.java +++ b/source/com/c2kernel/graph/view/EditorToolBar.java @@ -57,9 +57,9 @@ public class EditorToolBar extends Box implements Printable } } // Vertex types and ids - protected JComboBox mVertexTypeBox = new JComboBox(); + protected JComboBox mVertexTypeBox = new JComboBox(); // Edge types and ids - protected JComboBox mEdgeTypeBox = new JComboBox(); + protected JComboBox mEdgeTypeBox = new JComboBox(); // Mode buttons protected ButtonGroup mModeButtonGroup = new ButtonGroup(); protected JToggleButton mVertexModeButton = new JToggleButton(Resource.getImageResource("graph/newvertex.png")); diff --git a/source/com/c2kernel/graph/view/VertexPropertyPanel.java b/source/com/c2kernel/graph/view/VertexPropertyPanel.java index 2cc03c2..4e3e711 100644 --- a/source/com/c2kernel/graph/view/VertexPropertyPanel.java +++ b/source/com/c2kernel/graph/view/VertexPropertyPanel.java @@ -43,8 +43,8 @@ import com.c2kernel.utils.Logger; public class VertexPropertyPanel extends JPanel implements Observer, TableModelListener, ActionListener { - private PropertyTableModel mPropertyModel; - private PropertyTable mPropertyTable; + private final PropertyTableModel mPropertyModel; + private final PropertyTable mPropertyTable; private GraphModelManager mGraphModelManager; private boolean isEditable = false; GridBagLayout gridbag = new GridBagLayout(); @@ -54,7 +54,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL 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"}; SelectedVertexPanel mSelPanel; @@ -197,7 +197,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL 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/source/com/c2kernel/gui/MainFrame.java b/source/com/c2kernel/gui/MainFrame.java index 589e0b4..2e39d0d 100644 --- a/source/com/c2kernel/gui/MainFrame.java +++ b/source/com/c2kernel/gui/MainFrame.java @@ -269,8 +269,8 @@ public class MainFrame extends javax.swing.JFrame { getSplitPanel().validate(); } - public static JComboBox getExecutionPlugins() { - JComboBox plugins = new JComboBox(); + public static JComboBox getExecutionPlugins() { + JComboBox plugins = new JComboBox(); // create execution selector Executor defaultExecutor = new DefaultExecutor(); plugins.addItem(defaultExecutor); diff --git a/source/com/c2kernel/gui/tabs/ExecutionPane.java b/source/com/c2kernel/gui/tabs/ExecutionPane.java index 96b1129..a853695 100644 --- a/source/com/c2kernel/gui/tabs/ExecutionPane.java +++ b/source/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/source/com/c2kernel/gui/tabs/ViewpointPane.java b/source/com/c2kernel/gui/tabs/ViewpointPane.java index a793e5d..52c9cb3 100644 --- a/source/com/c2kernel/gui/tabs/ViewpointPane.java +++ b/source/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/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java index 73e9612..707f311 100644 --- a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java +++ b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java @@ -43,7 +43,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/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java index 58b2c37..62a900f 100644 --- 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 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(); @@ -94,7 +94,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); } diff --git a/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java b/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java index d86c0a0..d21f6d5 100644 --- a/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java +++ b/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java @@ -15,7 +15,7 @@ import com.c2kernel.lookup.DomainPath; import com.c2kernel.process.Gateway; import com.c2kernel.utils.Logger; -public class LDAPEntryChooser extends JComboBox +public class LDAPEntryChooser extends JComboBox { DomainPath mDomainPath = null; diff --git a/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java b/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java index 32b234e..094f900 100644 --- a/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java +++ b/source/com/c2kernel/lifecycle/instance/gui/view/TransitionPanel.java @@ -39,8 +39,8 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen protected GridBagLayout gridbag; protected GridBagConstraints c; protected Box transBox; - protected JComboBox executors; - protected JComboBox states = new JComboBox(States.states); + protected JComboBox executors; + protected JComboBox states = new JComboBox(States.states); protected JCheckBox active = new JCheckBox(); protected JLabel status = new JLabel(); protected ItemProxy mItem; -- cgit v1.2.3