From 53a7566dcb7c0dd18cd17f84a3ba845bcd4216a1 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Wed, 7 Sep 2011 15:41:24 +0200
Subject: Rollback to Java 1.6 compliance

---
 source/com/c2kernel/gui/tabs/ViewpointPane.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(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
index a793e5d..52c9cb3 100644
--- a/source/com/c2kernel/gui/tabs/ViewpointPane.java
+++ b/source/com/c2kernel/gui/tabs/ViewpointPane.java
@@ -42,9 +42,9 @@ import com.c2kernel.utils.Logger;
 
 public class ViewpointPane extends EntityTabPane implements ItemListener, ActionListener, EntityProxyObserver<C2KLocalObject> {
 
-    JComboBox<String> schemas;
-    JComboBox<Viewpoint> views;
-    JComboBox<EventItem> events;
+    JComboBox schemas;
+    JComboBox views;
+    JComboBox events;
     JLabel eventDetails;
     JButton exportButton;
     JButton viewButton;
@@ -84,7 +84,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         viewBox.add(label);
         viewBox.add(Box.createHorizontalStrut(7));
 
-        schemas = new JComboBox<String>();
+        schemas = new JComboBox();
         viewBox.add(schemas);
         viewBox.add(Box.createHorizontalGlue());
         schemas.addItemListener(this);
@@ -93,7 +93,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         viewBox.add(label);
         viewBox.add(Box.createHorizontalStrut(7));
 
-        views = new JComboBox<Viewpoint>();
+        views = new JComboBox();
         viewBox.add(views);
         viewBox.add(Box.createHorizontalGlue());
         views.addItemListener(this);
@@ -109,7 +109,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         eventBox.add(label);
         eventBox.add(Box.createHorizontalStrut(7));
 
-        events = new JComboBox<EventItem>();
+        events = new JComboBox();
         eventBox.add(events);
         eventBox.add(Box.createHorizontalStrut(7));
         events.addItemListener(this);
-- 
cgit v1.2.3