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 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source/com/c2kernel/graph') 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"); -- cgit v1.2.3