From 379ed8a0e133bee650e0acb24f6b743f657a50d0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 16:08:49 +0200
Subject: Last bit of cleanup honest New castor and dependent commons libs

---
 source/com/c2kernel/gui/tabs/outcome/form/DataRecord.java      |  2 --
 source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java    |  5 ++---
 .../com/c2kernel/gui/tabs/outcome/form/field/ComboField.java   |  4 ++--
 .../c2kernel/gui/tabs/outcome/form/field/StringEditField.java  | 10 +++++-----
 4 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'source/com/c2kernel/gui/tabs/outcome')

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/DataRecord.java b/source/com/c2kernel/gui/tabs/outcome/form/DataRecord.java
index 7477ecd..3bfe3fd 100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/DataRecord.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/DataRecord.java
@@ -3,7 +3,6 @@ import java.awt.FlowLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.util.ArrayList;
 
 import javax.swing.JLabel;
 import javax.swing.JTabbedPane;
@@ -25,7 +24,6 @@ public class DataRecord extends OutcomeStructure implements ChangeListener {
     AttributeList myAttributes;
     JTabbedPane DRPanel = null;
     boolean deferred;
-    ArrayList<?> deferredChildren = new ArrayList<Object>();
     Document parentDoc;
     GridBagConstraints position;
     GridBagLayout gridbag;
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java b/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java
index 6d20183..63c1d3d 100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java
@@ -6,7 +6,6 @@ import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.URL;
-import java.util.Enumeration;
 
 import javax.swing.Box;
 import javax.swing.JComponent;
@@ -275,9 +274,9 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
         ElementDecl rootElementDecl = null;
         docElement = (outcomeDOM == null) ? null : outcomeDOM.getDocumentElement();
 
-        for (Enumeration<?> globalElements = schemaSOM.getElementDecls(); globalElements.hasMoreElements();)
+        for (ElementDecl elementDecl: schemaSOM.getElementDecls())
         {
-            rootElementDecl = (ElementDecl) globalElements.nextElement();
+            rootElementDecl = elementDecl;
             // REVISIT: We don't detect which is the most likely root element if there is more than one root decl
             // xmlspy looks for an element not referenced elsewhere. simple but hard
             // if we already have a document then use its root element to find the right decl
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 ef56046..58b2c37 100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/field/ComboField.java
@@ -86,9 +86,9 @@ public class ComboField extends StringEditField {
         // TODO: should be ANDed with above results
         if (content.hasFacet(Facet.ENUMERATION)) {
             //ListOfValues andList = new ListOfValues();
-            Enumeration<?> enums = content.getFacets(Facet.ENUMERATION);
+            Enumeration<Facet> enums = content.getFacets(Facet.ENUMERATION);
             while (enums.hasMoreElements()) {
-                Facet thisEnum = (Facet)enums.nextElement();
+                Facet thisEnum = enums.nextElement();
                 vals.put(thisEnum.getValue(), thisEnum.getValue(), false);
             }
         }
diff --git a/source/com/c2kernel/gui/tabs/outcome/form/field/StringEditField.java b/source/com/c2kernel/gui/tabs/outcome/form/field/StringEditField.java
index a9b55a4..5f6a384 100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/field/StringEditField.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/field/StringEditField.java
@@ -62,12 +62,12 @@ public class StringEditField implements FocusListener, DomainKeyConsumer {
         // is a combobox
         if (type.hasFacet(Facet.ENUMERATION))
             return new ComboField(type, null);
-        //find LOVscript
-        Enumeration<?> e = type.getAnnotations();
+        //find LOVscript TODO: Implement LOV
+        Enumeration<Annotation> e = type.getAnnotations();
         while (e.hasMoreElements()) {
-            Annotation note = (Annotation)e.nextElement();
-            for (Enumeration<?> f = note.getAppInfo(); f.hasMoreElements();) {
-                AppInfo thisAppInfo = (AppInfo)f.nextElement();
+            Annotation note = e.nextElement();
+            for (Enumeration<AppInfo> f = note.getAppInfo(); f.hasMoreElements();) {
+                AppInfo thisAppInfo = f.nextElement();
                 for (Enumeration<?> g = thisAppInfo.getObjects(); g.hasMoreElements();) {
                     AnyNode appInfoNode = (AnyNode)g.nextElement();
                     if (appInfoNode.getLocalName().equals("ScriptList")
-- 
cgit v1.2.3