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

diff --git a/source/com/c2kernel/lifecycle/chooser/ActivityChooser.java b/source/com/c2kernel/lifecycle/chooser/ActivityChooser.java
index f79dedf..4b0ae4c 100755..100644
--- a/source/com/c2kernel/lifecycle/chooser/ActivityChooser.java
+++ b/source/com/c2kernel/lifecycle/chooser/ActivityChooser.java
@@ -1,6 +1,6 @@
 /*

  * Created on 1 sept. 2003

- * 

+ *

  * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments

  */

 package com.c2kernel.lifecycle.chooser;

@@ -22,15 +22,13 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;

 import javax.swing.JPanel;

 

-import com.c2kernel.lifecycle.ActivityDef;

 import com.c2kernel.utils.Language;

-import com.c2kernel.utils.LocalObjectLoader;

 import com.c2kernel.utils.Logger;

 import com.c2kernel.utils.Resource;

 

 /**

  * @author Developpement

- * 

+ *

  * To change the template for this generated type comment go to

  * Window>Preferences>Java>Code Generation>Code and Comments

  */

@@ -52,9 +50,9 @@ public class ActivityChooser extends JFrame
 

     private JLabel label = null;

 

-    HashMap mhashmap = null;

+    HashMap<?, ?> mhashmap = null;

 

-    public ActivityChooser(String message, String title, Image img, WorkflowDialogue parent, HashMap hashmap)

+    public ActivityChooser(String message, String title, Image img, WorkflowDialogue parent, HashMap<?, ?> hashmap)

     {

         super(title);

         mMessage = message;

@@ -93,7 +91,7 @@ public class ActivityChooser extends JFrame
             {

                 Logger.error(mExc);

             }

-        }        

+        }

         return mLDAPFileChooserActivity;

     }

 

@@ -101,14 +99,9 @@ public class ActivityChooser extends JFrame
     {

         getJButtonOK().addActionListener(new ActionListener()

         {

-            public void actionPerformed(ActionEvent e)

+            @Override

+			public void actionPerformed(ActionEvent e)

             {

-                try

-                {

-                    ActivityDef act = LocalObjectLoader.getActDef(mLDAPFileChooserActivity.getEntryName(), "last");

-                } catch (Exception ex)

-                {

-                }

                 Logger.debug(5, "mLDAPFileChooserActivity.getEntryName()" + mLDAPFileChooserActivity.getEntryName());

                 setCursor(new Cursor(Cursor.WAIT_CURSOR));

                 mParent.loadThisWorkflow(mLDAPFileChooserActivity.getEntryName(), mhashmap);

@@ -118,7 +111,8 @@ public class ActivityChooser extends JFrame
         });

         getJButtonCancel().addActionListener(new ActionListener()

         {

-            public void actionPerformed(ActionEvent e)

+            @Override

+			public void actionPerformed(ActionEvent e)

             {

                 close();

             }