Revert "Added missing generics declarations for Swing components"

This reverts commit 094d1bd4e776c5a26ebd18fffa19a9515737e319.

11 files changed, 32 insertions, 27 deletions

diff --git a/src/main/java/com/c2kernel/gui/MainFrame.java b/src/main/java/com/c2kernel/gui/MainFrame.java
index 78c1c6f..5edef4a 100644
--- a/src/main/java/com/c2kernel/gui/MainFrame.java
+++ b/src/main/java/com/c2kernel/gui/MainFrame.java
@@ -259,8 +259,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/src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java b/src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java
index 0f283ca..67b7a68 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java
+++ b/src/main/java/com/c2kernel/gui/graph/view/EditorPanel.java
@@ -32,9 +32,13 @@ public class EditorPanel extends JPanel
 	protected EditorPanel()

     {

     }

-    public EditorPanel(EdgeFactory eFactory, VertexFactory vFactory, 

-    		VertexOutlineCreator vOutlineCreator, boolean edgeCreationMode,	// True if edges can be created

-    		JButton[] otherButtons, GraphPanel graphPanel)

+    public EditorPanel(EdgeFactory eFactory, VertexFactory vFactory, VertexOutlineCreator vOutlineCreator, boolean edgeCreationMode,	// True

+																																		// if

+																																		// edges

+																																		// can

+																																		// be

+																																		// created

+	JButton[] otherButtons, GraphPanel graphPanel)

 	{

 		// Create the graph panel and editor tool bar

         setDoubleBuffered(true);

diff --git a/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java b/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java
index 75b9dce..8892fd7 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java
+++ b/src/main/java/com/c2kernel/gui/graph/view/EditorToolBar.java
@@ -57,9 +57,9 @@ public class EditorToolBar extends Box implements Printable
 		}

 	}

 	// Vertex types and ids

-	protected JComboBox<TypeNameAndConstructionInfo> mVertexTypeBox = new JComboBox<TypeNameAndConstructionInfo>();

+	protected JComboBox mVertexTypeBox = new JComboBox();

 	// Edge types and ids

-	protected JComboBox<TypeNameAndConstructionInfo> mEdgeTypeBox = new JComboBox<TypeNameAndConstructionInfo>();

+	protected JComboBox mEdgeTypeBox = new JComboBox();

 	// Mode buttons

 	protected ButtonGroup mModeButtonGroup = new ButtonGroup();

 	protected JToggleButton mVertexModeButton = new JToggleButton(ImageLoader.findImage("graph/newvertex.png"));

diff --git a/src/main/java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java b/src/main/java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java
index 0fd7d76..121d0c1 100644
--- a/src/main/java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java
+++ b/src/main/java/com/c2kernel/gui/graph/view/VertexPropertyPanel.java
@@ -54,7 +54,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;

@@ -197,7 +197,7 @@ public class VertexPropertyPanel extends JPanel implements Observer, TableModelL
         newPropBox.add(Box.createHorizontalGlue());

         newPropName = new JTextField(15);

         newPropBox.add(newPropName);

-        newPropType = new JComboBox<Object>(typeOptions);

+        newPropType = new JComboBox(typeOptions);

         newPropBox.add(newPropType);

         newPropBox.add(Box.createHorizontalStrut(1));

         addPropButton = new JButton("Add");

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java b/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java
index 780c5b9..8a2c0cc 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java
@@ -15,7 +15,7 @@ import javax.swing.JComboBox;
 import com.c2kernel.lookup.DomainPath;

 import com.c2kernel.process.Gateway;

 

-public class LDAPEntryChooser extends JComboBox<Object>

+public class LDAPEntryChooser extends JComboBox

 {

 

     DomainPath mDomainPath = null;

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java
index e8e3d04..b1406c5 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java
@@ -39,8 +39,8 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen
     protected GridBagLayout gridbag;

     protected GridBagConstraints c;

     protected Box transBox;

-    protected JComboBox<?> executors;

-    protected JComboBox<?> states = new JComboBox<Object>(States.states);

+    protected JComboBox executors;

+    protected JComboBox states = new JComboBox(States.states);

     protected JCheckBox active = new JCheckBox();

     protected JLabel status = new JLabel();

     protected ItemProxy mItem;

diff --git a/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java b/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java
index e59d1b3..9d9a395 100644
--- a/src/main/java/com/c2kernel/gui/tabs/ExecutionPane.java
+++ b/src/main/java/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/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java
index 8f9b3d3..ab5a539 100644
--- a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java
+++ b/src/main/java/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/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
index 75e1078..6004f59 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionMemberPropertyPanel.java
@@ -41,7 +41,7 @@ public class CollectionMemberPropertyPanel extends JPanel implements ActionListe
     JButton delPropButton;

     Box newPropBox;

     private JTextField newPropName;

-    private JComboBox<String> newPropType;

+    private JComboBox newPropType;

     String[] typeOptions = { "String", "Boolean", "Integer", "Float" };

     String[] typeInitVal = { "", "false", "0", "0.0"};

 

@@ -111,7 +111,7 @@ public class CollectionMemberPropertyPanel extends JPanel implements ActionListe
         newPropBox.add(Box.createHorizontalGlue());

         newPropName = new JTextField(15);

         newPropBox.add(newPropName);

-        newPropType = new JComboBox<String>(typeOptions);

+        newPropType = new JComboBox(typeOptions);

         newPropBox.add(newPropType);

         newPropBox.add(Box.createHorizontalStrut(1));

         addPropButton = new JButton("Add");

diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java
index bb4adbd..7723e16 100644
--- a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java
+++ b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java
@@ -47,7 +47,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/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java b/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
index c17c3fd..3be29f5 100644
--- a/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
+++ b/src/main/java/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
@@ -28,14 +28,14 @@ import com.c2kernel.scripting.Script;
 

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

@@ -45,7 +45,8 @@ public class ComboField extends StringEditField {
 	public String getDefaultValue() {

         if (vals.getDefaultKey() != null)

             return vals.get(vals.getDefaultKey()).toString();

-        return "";

+        else

+            return "";

     }

 

     @Override

@@ -93,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);

     }