From d08240a1575cfbf0fd19f8c4664140928b8d386d Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 14 May 2013 17:25:43 +0200 Subject: Revert "Added missing generics declarations for Swing components" This reverts commit 094d1bd4e776c5a26ebd18fffa19a9515737e319. --- src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java | 10 +++++++--- src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java | 4 ++-- .../java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/graph') diff --git a/src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java b/src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java index 0f283ca..67b7a68 100644 --- a/src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java +++ b/src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java @@ -32,9 +32,13 @@ public class EditorPanel extends JPanel protected EditorPanel() { } - public EditorPanel(EdgeFactory eFactory, VertexFactory vFactory, - VertexOutlineCreator vOutlineCreator, boolean edgeCreationMode, // True if edges can be created - JButton[] otherButtons, GraphPanel graphPanel) + public EditorPanel(EdgeFactory eFactory, VertexFactory vFactory, VertexOutlineCreator vOutlineCreator, boolean edgeCreationMode, // True + // if + // edges + // can + // be + // created + JButton[] otherButtons, GraphPanel graphPanel) { // Create the graph panel and editor tool bar setDoubleBuffered(true); diff --git a/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java b/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java index 75b9dce..8892fd7 100644 --- a/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java +++ b/src/main/java/com/c2kernel/gui/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(ImageLoader.findImage("graph/newvertex.png")); diff --git a/src/main/java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java b/src/main/java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java index 0fd7d76..121d0c1 100644 --- a/src/main/java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java +++ b/src/main/java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java @@ -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