Prefer using ObjectProperties getString and getInstance where possible.

6 files changed, 25 insertions, 29 deletions

diff --git a/src/main/java/com/c2kernel/gui/ItemFinder.java b/src/main/java/com/c2kernel/gui/ItemFinder.java
index 9197ea0..1b0a895 100644
--- a/src/main/java/com/c2kernel/gui/ItemFinder.java
+++ b/src/main/java/com/c2kernel/gui/ItemFinder.java
@@ -119,7 +119,7 @@ public class ItemFinder extends Box implements Runnable {
 

         // create plugins

         Logger.msg(6, "ItemFinder() - creating plugins");

-        String requiredListeners = Gateway.getProperties().getProperty("DomainKeyListeners");

+        String requiredListeners = Gateway.getProperties().getString("DomainKeyListeners");

         if (requiredListeners != null) {

             StringTokenizer tok = new StringTokenizer(requiredListeners, ",");

             while (tok.hasMoreTokens()) {

diff --git a/src/main/java/com/c2kernel/gui/LoginBox.java b/src/main/java/com/c2kernel/gui/LoginBox.java
index cae89ab..14c63e9 100644
--- a/src/main/java/com/c2kernel/gui/LoginBox.java
+++ b/src/main/java/com/c2kernel/gui/LoginBox.java
@@ -68,7 +68,7 @@ public  class LoginBox extends JFrame {
 

   public LoginBox(int attempt,String title,String lastUser,String bottomMessage,

                   javax.swing.ImageIcon imageHolder,MainFrame mainFrame) {

-	String iconFile = Gateway.getProperties().getProperty("AppIcon");

+	String iconFile = Gateway.getProperties().getString("AppIcon");

 	if (iconFile != null)

 		this.setIconImage(ImageLoader.findImage(iconFile).getImage());

     this.errorLabel.setText(bottomMessage);

diff --git a/src/main/java/com/c2kernel/gui/MainFrame.java b/src/main/java/com/c2kernel/gui/MainFrame.java
index 5050e5c..ea80e3e 100644
--- a/src/main/java/com/c2kernel/gui/MainFrame.java
+++ b/src/main/java/com/c2kernel/gui/MainFrame.java
@@ -97,7 +97,7 @@ public class MainFrame extends javax.swing.JFrame {
 

     public void showLogin() {

         // Log in

-        logoURL = Gateway.getProperties().getProperty("Logo");

+        logoURL = Gateway.getProperties().getString("Logo");

         URL pictureUrl;

         String bottomMessage =

             Language.translate("Please enter username & password");

@@ -112,7 +112,7 @@ public class MainFrame extends javax.swing.JFrame {
         LoginBox login =

             new LoginBox(

                 5,

-                Gateway.getProperties().getProperty("Name"),

+                Gateway.getProperties().getString("Name"),

                 getPref("lastUser."+Gateway.getCentreId(), null),

                 bottomMessage,

                 imageHolder, this);

@@ -127,9 +127,9 @@ public class MainFrame extends javax.swing.JFrame {
         getContentPane().setLayout(gridbag);

 

         this.setTitle(

-                userAgent.getName()+"@"+Gateway.getProperties().getProperty("Name") + " - " + Language.translate("Cristal 2"));

+                userAgent.getName()+"@"+Gateway.getProperties().getString("Name") + " - " + Language.translate("Cristal 2"));

 

-        String iconFile = Gateway.getProperties().getProperty("AppIcon");

+        String iconFile = Gateway.getProperties().getString("AppIcon");

         if (iconFile != null)

             this.setIconImage(ImageLoader.findImage(iconFile).getImage());

 

@@ -267,7 +267,7 @@ public class MainFrame extends javax.swing.JFrame {
         plugins.setSelectedIndex(0);

 

         // load execution plugins

-        String pluginList = Gateway.getProperties().getProperty("Executors");

+        String pluginList = Gateway.getProperties().getString("Executors");

         if (pluginList != null) {

             StringTokenizer tok = new StringTokenizer(pluginList, ",");

             while (tok.hasMoreTokens()) {

diff --git a/src/main/java/com/c2kernel/gui/MenuBuilder.java b/src/main/java/com/c2kernel/gui/MenuBuilder.java
index ec01b4d..100d989 100644
--- a/src/main/java/com/c2kernel/gui/MenuBuilder.java
+++ b/src/main/java/com/c2kernel/gui/MenuBuilder.java
@@ -216,7 +216,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene
 		String aboutInfo;

 		try

 		{

-			aboutInfo = FileStringUtility.file2String(Gateway.getProperties().getProperty("about"));

+			aboutInfo = FileStringUtility.file2String(Gateway.getProperties().getString("about"));

 		}

 		catch (Exception e)

 		{

@@ -258,7 +258,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene
 		myPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);

 		JDialog dialog = myPane.createDialog(null, Language.translate("About"));

 		dialog.setResizable(false);

-		Icon icon = ImageLoader.findImage(Gateway.getProperties().getProperty("banner"));

+		Icon icon = ImageLoader.findImage(Gateway.getProperties().getString("banner"));

 		myPane.setIcon(icon);

         dialog.pack();

         dialog.setVisible(true);

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java b/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java
index e959e87..87f4a9b 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java
@@ -204,11 +204,10 @@ public class CompActDefOutcomeHandler
 

     public VertexPropertyPanel loadPropertyPanel()

     {

-        String wfPanelClass = Gateway.getProperties().getProperty("WfPropertyPanel");

+        String wfPanelClass = Gateway.getProperties().getString("WfPropertyPanel");

         if (wfPanelClass != null) {

             try {

-                Class<?> panelClass = Class.forName(wfPanelClass);

-                return (VertexPropertyPanel)panelClass.newInstance();

+                return (VertexPropertyPanel)Gateway.getProperties().getInstance("WfPropertyPanel");

             } catch (Exception ex) {

                 Logger.error("Could not load wf props panel:"+wfPanelClass);

                 Logger.error(ex);

diff --git a/src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java b/src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java
index 46bfcdf..7fa17a0 100644
--- a/src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java
@@ -173,25 +173,22 @@ public class ItemTabPane extends JPanel implements Runnable {
     }

 

     static public OutcomeHandler getOutcomeHandler(String schema, int version) {

-        String ohClassName = Gateway.getProperties().getProperty("OutcomeHandler."+schema+"."+version);

-        try {

-            if (ohClassName != null && ohClassName.length() > 0) {

-                Class<?> ohClass = Class.forName(ohClassName);

-                return (OutcomeHandler) ohClass.newInstance();

+    	String propName = "OutcomeHandler."+schema+"."+version;

+    	if (Gateway.getProperties().containsKey(propName))

+            try {

+            	return (OutcomeHandler)Gateway.getProperties().getInstance(propName);

+            } catch (Exception ex) {

+                Logger.error("Error creating handler "+Gateway.getProperties().getString(propName)+". using default outcome editor");

             }

-        } catch (Exception ex) {

-            Logger.error("Error creating handler "+ohClassName+". using default outcome editor");

-        }

-        ohClassName = Gateway.getProperties().getProperty("OutcomeHandler.*");

-        try {

-            if (ohClassName != null && ohClassName.length() > 0) {

-                Class<?> ohClass = Class.forName(ohClassName);

-                return (OutcomeHandler) ohClass.newInstance();

+

+    	propName = "OutcomeHandler.*";

+    	if (Gateway.getProperties().containsKey(propName))

+            try {

+            	return (OutcomeHandler)Gateway.getProperties().getInstance(propName);

+            } catch (Exception ex) {

+                Logger.error("Error creating handler "+Gateway.getProperties().getString(propName)+". using default outcome editor");

             }

-        } catch (Exception ex) {

-            Logger.error("Error creating handler "+ohClassName+". using default outcome editor");

-            Logger.error(ex);

-        }

         return new OutcomePanel();

     }

+    

 }