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 :)

---
 source/com/c2kernel/gui/tabs/ViewpointPane.java | 35 ++++++++++++++-----------
 1 file changed, 20 insertions(+), 15 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/gui/tabs/ViewpointPane.java

(limited to 'source/com/c2kernel/gui/tabs/ViewpointPane.java')

diff --git a/source/com/c2kernel/gui/tabs/ViewpointPane.java b/source/com/c2kernel/gui/tabs/ViewpointPane.java
old mode 100755
new mode 100644
index 7bb6176..31e18c3
--- a/source/com/c2kernel/gui/tabs/ViewpointPane.java
+++ b/source/com/c2kernel/gui/tabs/ViewpointPane.java
@@ -10,6 +10,7 @@ import java.awt.event.ItemListener;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
@@ -40,16 +41,16 @@ import com.c2kernel.utils.Logger;
 
 public class ViewpointPane extends EntityTabPane implements ItemListener, ActionListener, EntityProxyObserver {
     
-    JComboBox schemas;
-    JComboBox views;
-    JComboBox events;
+    JComboBox<String> schemas;
+    JComboBox<Viewpoint> views;
+    JComboBox<EventItem> events;
     JLabel eventDetails;
     JButton exportButton;
     JButton viewButton;
     
-    ArrayList schemaList;
-    ArrayList viewpointList;
-    ArrayList eventList;
+    ArrayList<String> schemaList;
+    ArrayList<Viewpoint> viewpointList;
+    ArrayList<EventItem> eventList;
     String currentSchema = null;
     Outcome currentOutcome = null;
     OutcomeHandler thisOutcome;
@@ -82,7 +83,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         viewBox.add(label);
         viewBox.add(Box.createHorizontalStrut(7));
 
-        schemas = new JComboBox();
+        schemas = new JComboBox<String>();
         viewBox.add(schemas);
         viewBox.add(Box.createHorizontalGlue());
         schemas.addItemListener(this);
@@ -91,7 +92,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         viewBox.add(label);
         viewBox.add(Box.createHorizontalStrut(7));
 
-        views = new JComboBox();
+        views = new JComboBox<Viewpoint>();
         viewBox.add(views);
         viewBox.add(Box.createHorizontalGlue());
         views.addItemListener(this);
@@ -107,7 +108,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         eventBox.add(label);
         eventBox.add(Box.createHorizontalStrut(7));
 
-        events = new JComboBox();
+        events = new JComboBox<EventItem>();
         eventBox.add(events);
         eventBox.add(Box.createHorizontalStrut(7));
         events.addItemListener(this);
@@ -163,7 +164,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         clearView();
         schemas.addItem("--");
         currentSchema = null;
-        schemaList = new ArrayList();
+        schemaList = new ArrayList<String>();
         try {
             String outcomeTypes = sourceEntity.getEntity().queryData(ClusterStorage.VIEWPOINT+"/all");
             StringTokenizer tok = new StringTokenizer(outcomeTypes, ",");
@@ -197,8 +198,8 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         suspendSelection = true;
         views.removeAllItems(); 
         events.removeAllItems();
-        viewpointList = new ArrayList();
-        eventList = new ArrayList();
+        viewpointList = new ArrayList<Viewpoint>();
+        eventList = new ArrayList<EventItem>();
 
         currentSchema = schemaName;
         
@@ -233,8 +234,12 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
                         }
                         eventList.add(newEvent);
                     }
-                    Collections.sort(eventList);
-                    for (Iterator iter = eventList.iterator(); iter.hasNext();)
+                    Collections.sort(eventList, new Comparator<EventItem>() {
+                        public int compare(EventItem o1, EventItem o2) {
+                            return o1.compareTo(o2);
+                        }
+                    });
+                    for (Iterator<EventItem> iter = eventList.iterator(); iter.hasNext();)
                         events.addItem(iter.next());
             }
             
@@ -435,7 +440,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
     class EventItem implements Comparable {
         public int eventId;
         public int schemaVersion;
-        public ArrayList viewNames = new ArrayList();
+        public ArrayList<String> viewNames = new ArrayList<String>();
         public String viewList = "";
         
         public EventItem(int eventId, int schemaVersion) {
-- 
cgit v1.2.3