From 379ed8a0e133bee650e0acb24f6b743f657a50d0 Mon Sep 17 00:00:00 2001 From: abranson Date: Thu, 4 Aug 2011 16:08:49 +0200 Subject: Last bit of cleanup honest New castor and dependent commons libs --- .../com/c2kernel/gui/tabs/outcome/form/field/ComboField.java | 4 ++-- .../c2kernel/gui/tabs/outcome/form/field/StringEditField.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source/com/c2kernel/gui/tabs/outcome/form/field') 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 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 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 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