From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 2 Aug 2011 22:10:28 +0200
Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors
 or warnings :)

---
 .../com/c2kernel/graph/view/PropertyTableModel.java  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/graph/view/PropertyTableModel.java

(limited to 'source/com/c2kernel/graph/view/PropertyTableModel.java')

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<String, Object> sourceMap = new HashMap<String, Object>();
+    ArrayList<String> sortedNameList = new ArrayList<String>();
     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<String, Object> props) {
         synchronized (sourceMap) {
             sourceMap = props;
-            sortedNameList = new ArrayList(props.size());
-            for (Iterator keys = props.keySet().iterator(); keys.hasNext();)
+            sortedNameList = new ArrayList<String>(props.size());
+            for (Iterator<String> 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<String>() {
+                public int compare(String o1, String o2) {
+                    return (o1.compareToIgnoreCase(o2));
                 }
             });
         }
-- 
cgit v1.2.3