Rollback to Java 1.6 compliance

5 files changed, 14 insertions, 14 deletions

diff --git a/source/com/c2kernel/gui/MainFrame.java b/source/com/c2kernel/gui/MainFrame.java
index 589e0b4..2e39d0d 100644
--- a/source/com/c2kernel/gui/MainFrame.java
+++ b/source/com/c2kernel/gui/MainFrame.java
@@ -269,8 +269,8 @@ public class MainFrame extends javax.swing.JFrame {
         getSplitPanel().validate();

     }

 

-    public static JComboBox<Executor> getExecutionPlugins() {

-        JComboBox<Executor> plugins = new JComboBox<Executor>();

+    public static JComboBox getExecutionPlugins() {

+        JComboBox plugins = new JComboBox();

         // create execution selector

         Executor defaultExecutor = new DefaultExecutor();

         plugins.addItem(defaultExecutor);

diff --git a/source/com/c2kernel/gui/tabs/ExecutionPane.java b/source/com/c2kernel/gui/tabs/ExecutionPane.java
index 96b1129..a853695 100644
--- a/source/com/c2kernel/gui/tabs/ExecutionPane.java
+++ b/source/com/c2kernel/gui/tabs/ExecutionPane.java
@@ -33,7 +33,7 @@ public class ExecutionPane extends EntityTabPane implements EntityProxyObserver<
     JLabel noActs = new JLabel(Language.translate("There are currently no activities that you can execute in this item."));

     JPanel view = new JPanel(new GridLayout(1, 1));

     ActivityViewer currentActView;

-    JComboBox<ActivityItem> activitySelector = new JComboBox<ActivityItem>();

+    JComboBox activitySelector = new JComboBox();

     Box activityBox = Box.createHorizontalBox();

     String selAct = null;

     ArrayList<ActivityItem> activities;

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

diff --git a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java
index 73e9612..707f311 100644
--- a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java
+++ b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java
@@ -43,7 +43,7 @@ public class ActivityViewer extends JPanel implements Runnable {
     JLabel noOutcome = new JLabel(Language.translate("No outcome data is required for this activity"));

     ExecutionPane parent;

     JLabel status;

-    JComboBox<Executor> executors;

+    JComboBox executors;

     JButton saveButton  = new JButton("Save");

     JButton loadButton  = new JButton("Load");

     GridBagLayout gridbag = new GridBagLayout();

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
index 58b2c37..62a900f 100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
@@ -28,14 +28,14 @@ import com.c2kernel.utils.Logger;
 

 public class ComboField extends StringEditField {

 

-    JComboBox<String> comboField;

+    JComboBox comboField;

     ListOfValues vals;

-    DefaultComboBoxModel<String> comboModel;

+    DefaultComboBoxModel comboModel;

     AnyNode listNode;

 

     public ComboField(SimpleType type, AnyNode listNode) {

         super();

-        comboField = new JComboBox<String>();

+        comboField = new JComboBox();

         content = type;

         this.listNode = listNode;

         createLOV();

@@ -94,7 +94,7 @@ public class ComboField extends StringEditField {
         }

 

         String[] keyArray = new String[vals.keySet().size()];

-        comboModel = new DefaultComboBoxModel<String>(vals.keySet().toArray(keyArray));

+        comboModel = new DefaultComboBoxModel(vals.keySet().toArray(keyArray));

         comboModel.setSelectedItem(vals.getDefaultKey());

         comboField.setModel(comboModel);

     }