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, 24 insertions, 15 deletions

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java b/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java
index 4bb7347..6d20183 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/OutcomePanel.java
@@ -89,7 +89,7 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
         splitPane.setDividerSize(9);

         pane = splitPane;

         }

-        

+

         GridBagConstraints c = new GridBagConstraints();

 

         c.gridx = 0;

@@ -165,8 +165,9 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
         this.setOutcome(outcomeURL);

     }

 

-    // Parse from Strings    

-    public void setOutcome(String outcome) throws InvalidOutcomeException

+    // Parse from Strings

+    @Override

+	public void setOutcome(String outcome) throws InvalidOutcomeException

     {

 

         try

@@ -179,7 +180,8 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
         }

     }

 

-    public void setDescription(String schema) throws InvalidSchemaException

+    @Override

+	public void setDescription(String schema) throws InvalidSchemaException

     {

         if (schema == null)

             throw new InvalidSchemaException("Null schema supplied");

@@ -194,7 +196,8 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
 

     }

 

-    public void setReadOnly(boolean readOnly)

+    @Override

+	public void setReadOnly(boolean readOnly)

     {

         this.readOnly = readOnly;

     }

@@ -218,7 +221,8 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
         }

     }

 

-    public void run()

+    @Override

+	public void run()

     {

         Thread.currentThread().setName("Outcome Panel Builder");

         try

@@ -271,7 +275,7 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
         ElementDecl rootElementDecl = null;

         docElement = (outcomeDOM == null) ? null : outcomeDOM.getDocumentElement();

 

-        for (Enumeration globalElements = schemaSOM.getElementDecls(); globalElements.hasMoreElements();)

+        for (Enumeration<?> globalElements = schemaSOM.getElementDecls(); globalElements.hasMoreElements();)

         {

             rootElementDecl = (ElementDecl) globalElements.nextElement();

             // REVISIT: We don't detect which is the most likely root element if there is more than one root decl

@@ -284,7 +288,7 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
         if (rootElementDecl == null)

             throw new InvalidSchemaException("No root elements defined");

         documentRoot = new DataRecord(rootElementDecl, readOnly, help, false);

-        

+

         Logger.msg(5, "Finished structure. Populating...");

         if (docElement == null)

         {

@@ -302,7 +306,7 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
         outcomeTab.addTab(rootElementDecl.getName(), documentRoot);

         outcomeTab.setSelectedIndex(0);

 

-        scrollpane.setViewportView(outcomeTab);        

+        scrollpane.setViewportView(outcomeTab);

         panelBuilt = true;

 

         revalidate();

@@ -311,12 +315,14 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
             documentRoot.grabFocus();

     }

 

-    public JPanel getPanel() throws OutcomeNotInitialisedException

+    @Override

+	public JPanel getPanel() throws OutcomeNotInitialisedException

     {

         return this;

     }

 

-    public String getOutcome()

+    @Override

+	public String getOutcome()

     {

         if (useForm)

         {

@@ -348,14 +354,17 @@ public class OutcomePanel extends JPanel implements OutcomeHandler
         return serializedDoc;

     }

 

-    public boolean isUnsaved() {

+    @Override

+	public boolean isUnsaved() {

         return unsaved;

     }

-    

-    public void saved() {

+

+    @Override

+	public void saved() {

         unsaved = false;

     }

-    

+

+	@Override

 	public void export(File targetFile) throws Exception {

 		FileStringUtility.string2File(targetFile, getOutcome());

 	}