From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001 From: abranson Date: Tue, 2 Aug 2011 22:10:28 +0200 Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors or warnings :) --- source/com/c2kernel/graph/view/EditorToolBar.java | 6 +++--- .../com/c2kernel/graph/view/PropertyTableModel.java | 20 ++++++++++---------- .../com/c2kernel/graph/view/VertexPropertyPanel.java | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) mode change 100755 => 100644 source/com/c2kernel/graph/view/EditorToolBar.java mode change 100755 => 100644 source/com/c2kernel/graph/view/PropertyTableModel.java mode change 100755 => 100644 source/com/c2kernel/graph/view/VertexPropertyPanel.java (limited to 'source/com/c2kernel/graph/view') diff --git a/source/com/c2kernel/graph/view/EditorToolBar.java b/source/com/c2kernel/graph/view/EditorToolBar.java old mode 100755 new mode 100644 index 2730ab7..e01056f --- a/source/com/c2kernel/graph/view/EditorToolBar.java +++ b/source/com/c2kernel/graph/view/EditorToolBar.java @@ -56,9 +56,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")); @@ -74,7 +74,7 @@ public class EditorToolBar extends Box implements Printable protected StartVertexController mStartVertexController = new StartVertexController(); protected DeletionController mDeletionController = new DeletionController(); // Editor mode listeners - protected Vector mListenerVector = new Vector(10, 10); + protected Vector mListenerVector = new Vector(10, 10); public EditorToolBar(boolean edgeCreationMode, // True if edges can be created JButton[] otherButtons, GraphPanel graphP) { diff --git a/source/com/c2kernel/graph/view/PropertyTableModel.java b/source/com/c2kernel/graph/view/PropertyTableModel.java old mode 100755 new mode 100644 index 9755cf6..22ba4f3 --- a/source/com/c2kernel/graph/view/PropertyTableModel.java +++ b/source/com/c2kernel/graph/view/PropertyTableModel.java @@ -20,8 +20,8 @@ import com.c2kernel.utils.Language; public class PropertyTableModel extends AbstractTableModel { private String[] mColumnNames = { Language.translate("Name"), Language.translate("Value") }; - HashMap sourceMap = new HashMap(); - ArrayList sortedNameList = new ArrayList(); + HashMap sourceMap = new HashMap(); + ArrayList sortedNameList = new ArrayList(); boolean isEditable = false; public PropertyTableModel() { @@ -45,7 +45,7 @@ public class PropertyTableModel extends AbstractTableModel { public Object getValueAt(int rowIndex, int colIndex) { synchronized (sourceMap) { - String rowName = (String)sortedNameList.get(rowIndex); + String rowName = sortedNameList.get(rowIndex); if (colIndex == 0) return rowName; else @@ -57,7 +57,7 @@ public class PropertyTableModel extends AbstractTableModel { { synchronized (sourceMap) { if (colIndex == 0) return; - String rowName = (String)sortedNameList.get(rowIndex); + String rowName = sortedNameList.get(rowIndex); Class oldElement = sourceMap.get(rowName).getClass(); if (oldElement == Float.class && value.getClass() == String.class) try { @@ -72,16 +72,16 @@ public class PropertyTableModel extends AbstractTableModel { } } - public void setMap(HashMap props) { + public void setMap(HashMap props) { synchronized (sourceMap) { sourceMap = props; - sortedNameList = new ArrayList(props.size()); - for (Iterator keys = props.keySet().iterator(); keys.hasNext();) + sortedNameList = new ArrayList(props.size()); + for (Iterator keys = props.keySet().iterator(); keys.hasNext();) sortedNameList.add(keys.next()); - Collections.sort(sortedNameList, new Comparator() { - public int compare(Object o1, Object o2) { - return ((String)o1).compareToIgnoreCase((String)o2); + Collections.sort(sortedNameList, new Comparator() { + public int compare(String o1, String o2) { + return (o1.compareToIgnoreCase(o2)); } }); } diff --git a/source/com/c2kernel/graph/view/VertexPropertyPanel.java b/source/com/c2kernel/graph/view/VertexPropertyPanel.java old mode 100755 new mode 100644 index be08b53..dd5fbd2 --- a/source/com/c2kernel/graph/view/VertexPropertyPanel.java +++ b/source/com/c2kernel/graph/view/VertexPropertyPanel.java @@ -43,7 +43,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; @@ -125,7 +125,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL public void clear() { selObjName.setText(""); selObjClass.setText("Nothing Selected"); - mPropertyModel.setMap(new HashMap()); + mPropertyModel.setMap(new HashMap()); if (mSelPanel != null) mSelPanel.clear(); addPropButton.setEnabled(false); delPropButton.setEnabled(false); @@ -184,7 +184,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"); @@ -224,7 +224,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL mPropertyTable.getCellEditor().stopCellEditing(); try { - Class newPropClass = Class.forName("java.lang."+typeOptions[newPropType.getSelectedIndex()]); + Class newPropClass = Class.forName("java.lang."+typeOptions[newPropType.getSelectedIndex()]); Class[] params = {String.class}; Constructor init = newPropClass.getConstructor(params); Object[] initParams = { typeInitVal[newPropType.getSelectedIndex()] }; -- cgit v1.2.3