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, 6 insertions, 5 deletions

diff --git a/source/com/c2kernel/gui/tabs/outcome/form/DimensionInstance.java b/source/com/c2kernel/gui/tabs/outcome/form/DimensionInstance.java
index 07fbe1b..649886b 100755..100644
--- a/source/com/c2kernel/gui/tabs/outcome/form/DimensionInstance.java
+++ b/source/com/c2kernel/gui/tabs/outcome/form/DimensionInstance.java
@@ -9,7 +9,7 @@ public class DimensionInstance extends DataRecord {
     Dimension parentDimension;

     int tabNumber;

     String tabName = null;

-    

+

     public DimensionInstance(ElementDecl model, boolean readOnly , HelpPane help, boolean deferred) throws OutcomeException {

         super(model, readOnly, help, deferred);

     }

@@ -17,14 +17,15 @@ public class DimensionInstance extends DataRecord {
     public void setTabNumber(int tabNumber) {

         this.tabNumber=tabNumber;

     }

-    

+

     public void setParent(Dimension parent) {

         this.parentDimension = parent;

     }

-    

-    public String getName() {

+

+    @Override

+	public String getName() {

         //TODO appinfo for picking out attributes or child elements for tab name

-        if (tabName == null) 

+        if (tabName == null)

             return Integer.toString(tabNumber);

         else

             return tabName;