From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001 From: abranson Date: Thu, 4 Aug 2011 00:42:34 +0200 Subject: 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 --- .../lifecycle/chooser/ActivityChooser.java | 24 ++++++++-------------- .../lifecycle/chooser/LDAPEntryChooser.java | 17 +++++++-------- .../lifecycle/chooser/LDAPFileChooser.java | 10 +++++---- .../lifecycle/chooser/WorkflowDialogue.java | 2 +- 4 files changed, 25 insertions(+), 28 deletions(-) mode change 100755 => 100644 source/com/c2kernel/lifecycle/chooser/ActivityChooser.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/chooser/LDAPFileChooser.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/chooser/WorkflowDialogue.java (limited to 'source/com/c2kernel/lifecycle/chooser') diff --git a/source/com/c2kernel/lifecycle/chooser/ActivityChooser.java b/source/com/c2kernel/lifecycle/chooser/ActivityChooser.java old mode 100755 new mode 100644 index f79dedf..4b0ae4c --- 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(); } diff --git a/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java b/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java index e8143be..d86c0a0 100644 --- a/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java +++ b/source/com/c2kernel/lifecycle/chooser/LDAPEntryChooser.java @@ -17,10 +17,10 @@ import com.c2kernel.utils.Logger; public class LDAPEntryChooser extends JComboBox { - + DomainPath mDomainPath = null; ArrayList allItems = new ArrayList(); - + public LDAPEntryChooser(DomainPath domPath, boolean editable) { super(); @@ -28,12 +28,12 @@ public class LDAPEntryChooser extends JComboBox mDomainPath = domPath; initialise(); } - + private void initialise() { try { - Enumeration children = Gateway.getLDAPLookup().searchAliases(mDomainPath); + Enumeration children = Gateway.getLDAPLookup().searchAliases(mDomainPath); while (children.hasMoreElements()) { DomainPath domPath = (DomainPath)children.nextElement(); @@ -44,13 +44,13 @@ public class LDAPEntryChooser extends JComboBox { Logger.exceptionDialog(ex); } - + Collections.sort(allItems); addItem(""); for (String element : allItems) { addItem(element); } - + } public void reload() @@ -58,8 +58,9 @@ public class LDAPEntryChooser extends JComboBox removeAllItems(); initialise(); } - - public synchronized Dimension getSize() + + @Override + public synchronized Dimension getSize() { if ("1".equals(Gateway.getProperty("ResizeCombo"))) return new Dimension(super.getSize().width<400?400:super.getSize().width,super.getSize().height); diff --git a/source/com/c2kernel/lifecycle/chooser/LDAPFileChooser.java b/source/com/c2kernel/lifecycle/chooser/LDAPFileChooser.java old mode 100755 new mode 100644 index 08f4387..9843d61 --- a/source/com/c2kernel/lifecycle/chooser/LDAPFileChooser.java +++ b/source/com/c2kernel/lifecycle/chooser/LDAPFileChooser.java @@ -22,7 +22,7 @@ public class LDAPFileChooser extends JPanel public static String SCHEMA_CHOOSER = "Schema"; public static String ACTIVITY_CHOOSER = "Activity"; private String chooserMode = null; - private HashMap mHashList = null; + private HashMap mHashList = null; public LDAPEntryChooser mLec; private boolean mEditable = false; DomainPath domainPath; @@ -83,7 +83,7 @@ public class LDAPFileChooser extends JPanel public void setSelectedItem(String name, String version) { Logger.debug(5,"setSelectedItem " + name + " " + version); - if (name == null||name.equals("-1")) name=""; + if (name == null||name.equals("-1")) name=""; mLec.setSelectedItem(name); } @@ -106,13 +106,15 @@ public class LDAPFileChooser extends JPanel mLec.setEditable(b); } - public void updateUI() + @Override + public void updateUI() { if (mLec!=null) mLec.updateUI(); super.updateUI(); } - public void setEnabled(boolean enabled) + @Override + public void setEnabled(boolean enabled) { mLec.setEnabled(enabled); } diff --git a/source/com/c2kernel/lifecycle/chooser/WorkflowDialogue.java b/source/com/c2kernel/lifecycle/chooser/WorkflowDialogue.java old mode 100755 new mode 100644 index 8453ad2..2ddd489 --- a/source/com/c2kernel/lifecycle/chooser/WorkflowDialogue.java +++ b/source/com/c2kernel/lifecycle/chooser/WorkflowDialogue.java @@ -16,5 +16,5 @@ import java.util.HashMap; */ public interface WorkflowDialogue { - public void loadThisWorkflow(String name, HashMap hashMap); + public void loadThisWorkflow(String name, HashMap hashMap); } -- cgit v1.2.3