More code cleanup:

Refactored Entity Proxy Subscription to handle generics better
Rewrote RemoteMap to use TreeMap instead of the internal array for
order. It now sorts its keys by number if they parse, else as strings.
Removed a no-longer-in-progress outcome form class

1 files changed, 14 insertions, 9 deletions

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/Field.java b/source/com/c2kernel/gui/tabs/outcome/form/Field.java
index e1bc35c..9d21c97 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/Field.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/Field.java
@@ -58,16 +58,18 @@ public class Field extends OutcomeStructure {
         return myAttributes;

     }

 

-    public void addStructure(OutcomeStructure newElement) throws StructuralException {

+    @Override

+	public void addStructure(OutcomeStructure newElement) throws StructuralException {

         throw new StructuralException("Field "+model.getName()+" cannot have child structures");

     }

 

-    public void addInstance(Element myElement, Document parentDoc) throws OutcomeException {

+    @Override

+	public void addInstance(Element myElement, Document parentDoc) throws OutcomeException {

         Logger.msg(6, "Accepting Field "+myElement.getTagName());

         if (this.myElement != null) throw new CardinalException("Field "+this.getName()+" cannot repeat");

         this.myElement = myElement;

 

-        try {        

+        try {

             if (myElementPanel == null)

                 Logger.error("Field should be empty. Discarding contents.");

             else {

@@ -77,9 +79,9 @@ public class Field extends OutcomeStructure {
                     textNode = parentDoc.createTextNode(getDefaultValue());

                     myElement.appendChild(textNode);

                 }

-                    

+

                 myElementPanel.setData(textNode);

-            }                    

+            }

         } catch (ClassCastException ex) {

             throw new StructuralException("First child node of Field " + this.getName() + " was not Text: "+myElement.getFirstChild().getNodeType());

         }

@@ -88,7 +90,8 @@ public class Field extends OutcomeStructure {
 

         // check if valid

 

-    public String validateStructure() {

+    @Override

+	public String validateStructure() {

         myAttributes.validateAttributes();

         if (myElementPanel != null) myElementPanel.updateNode();

         Text contents = (Text)myElement.getFirstChild();

@@ -99,7 +102,8 @@ public class Field extends OutcomeStructure {
         return null;

     }

 

-    public Element initNew(Document parent) {

+    @Override

+	public Element initNew(Document parent) {

         Logger.msg(6, "Creating Field "+this.getName());

 

         // make a new Element

@@ -119,7 +123,7 @@ public class Field extends OutcomeStructure {
 

         return myElement;

     }

-    

+

     private String getDefaultValue() {

         String defaultValue = model.getFixedValue();

         if (defaultValue == null) defaultValue = model.getDefaultValue();

@@ -127,7 +131,8 @@ public class Field extends OutcomeStructure {
         return defaultValue;

     }

 

-    public void grabFocus() {

+    @Override

+	public void grabFocus() {

         if (myElementPanel != null)

             myElementPanel.grabFocus();

         else