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, 26 insertions, 14 deletions

diff --git a/source/com/c2kernel/gui/tabs/outcome/BasicOutcomeEditor.java b/source/com/c2kernel/gui/tabs/outcome/BasicOutcomeEditor.java
index 451b393..5ab5245 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/BasicOutcomeEditor.java
+++ b/source/com/c2kernel/gui/tabs/outcome/BasicOutcomeEditor.java
@@ -29,7 +29,7 @@ public class BasicOutcomeEditor extends JPanel implements OutcomeHandler {
     PlainDocument doc;

     JTextArea textarea;

     boolean unsaved;

-            

+

     public BasicOutcomeEditor() {

         super();

         this.setLayout(new GridLayout(1,1));

@@ -39,14 +39,18 @@ public class BasicOutcomeEditor extends JPanel implements OutcomeHandler {
         textarea.setFont(Font.decode("monospaced"));

         add(new JScrollPane(textarea));

         doc.addDocumentListener(new DocumentListener() {

-            public void changedUpdate(DocumentEvent e) { unsaved = true; }

-            public void insertUpdate(DocumentEvent e) { unsaved = true; }

-            public void removeUpdate(DocumentEvent e) { unsaved = true; }

-            

+            @Override

+			public void changedUpdate(DocumentEvent e) { unsaved = true; }

+            @Override

+			public void insertUpdate(DocumentEvent e) { unsaved = true; }

+            @Override

+			public void removeUpdate(DocumentEvent e) { unsaved = true; }

+

         });

     }

 

-    public void setOutcome(String outcome) throws InvalidOutcomeException {

+    @Override

+	public void setOutcome(String outcome) throws InvalidOutcomeException {

         try {

             doc.insertString(0, outcome, null);

             unsaved = false;

@@ -55,14 +59,17 @@ public class BasicOutcomeEditor extends JPanel implements OutcomeHandler {
         }

     }

 

-    public void setDescription(String description) throws InvalidSchemaException { }

+    @Override

+	public void setDescription(String description) throws InvalidSchemaException { }

 

-    public void setReadOnly(boolean readOnly) {

+    @Override

+	public void setReadOnly(boolean readOnly) {

         textarea.setEditable(!readOnly);

     }

 

 

-    public JPanel getPanel() throws OutcomeNotInitialisedException {

+    @Override

+	public JPanel getPanel() throws OutcomeNotInitialisedException {

         return this;

     }

 

@@ -70,7 +77,8 @@ public class BasicOutcomeEditor extends JPanel implements OutcomeHandler {
      *

      */

 

-    public String getOutcome() throws OutcomeException {

+    @Override

+	public String getOutcome() throws OutcomeException {

         try {

             return doc.getText(0, doc.getLength());

         } catch (Exception ex) {

@@ -82,18 +90,22 @@ public class BasicOutcomeEditor extends JPanel implements OutcomeHandler {
      *

      */

 

-    public void run() {

+    @Override

+	public void run() {

     }

 

 

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

 	}