From 7381a549557ff474469b7b805f2506eba8220420 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 26 Feb 2014 10:30:04 +0100 Subject: New Gateway property API --- src/main/java/com/c2kernel/gui/Console.java | 3 +-- src/main/java/com/c2kernel/gui/EntityFinder.java | 2 +- src/main/java/com/c2kernel/gui/ImageLoader.java | 1 - src/main/java/com/c2kernel/gui/LoginBox.java | 2 +- src/main/java/com/c2kernel/gui/MainFrame.java | 10 +++++----- src/main/java/com/c2kernel/gui/MenuBuilder.java | 5 ++--- .../com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java | 2 +- .../c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java | 2 +- src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java | 4 ++-- src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java | 2 +- src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java | 2 +- src/main/java/com/c2kernel/gui/tree/Node.java | 2 +- 12 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/c2kernel/gui/Console.java b/src/main/java/com/c2kernel/gui/Console.java index f8420c5..ae3a2cc 100644 --- a/src/main/java/com/c2kernel/gui/Console.java +++ b/src/main/java/com/c2kernel/gui/Console.java @@ -24,7 +24,6 @@ import javax.swing.JTextArea; import javax.swing.JTextField; import com.c2kernel.process.Gateway; -import com.c2kernel.process.resource.Resource; import com.c2kernel.utils.FileStringUtility; import com.c2kernel.utils.Logger; @@ -46,7 +45,7 @@ public class Console extends JFrame { FileWriter logFile; ConsoleConnection connection; JFileChooser scriptLoader = new JFileChooser(); - static int bufferSize = Integer.parseInt(Gateway.getProperty("Console.bufferSize", "200")); + static int bufferSize = Gateway.getProperties().getInt("Console.bufferSize", 200); public Console(String host, int port) { super("Cristal Console - "+host); diff --git a/src/main/java/com/c2kernel/gui/EntityFinder.java b/src/main/java/com/c2kernel/gui/EntityFinder.java index 5f841b1..1423055 100644 --- a/src/main/java/com/c2kernel/gui/EntityFinder.java +++ b/src/main/java/com/c2kernel/gui/EntityFinder.java @@ -119,7 +119,7 @@ public class EntityFinder extends Box implements Runnable { // create plugins Logger.msg(6, "ItemFinder() - creating plugins"); - String requiredListeners = Gateway.getProperty("DomainKeyListeners"); + String requiredListeners = Gateway.getProperties().getProperty("DomainKeyListeners"); if (requiredListeners != null) { StringTokenizer tok = new StringTokenizer(requiredListeners, ","); while (tok.hasMoreTokens()) { diff --git a/src/main/java/com/c2kernel/gui/ImageLoader.java b/src/main/java/com/c2kernel/gui/ImageLoader.java index 4037f61..121bcca 100644 --- a/src/main/java/com/c2kernel/gui/ImageLoader.java +++ b/src/main/java/com/c2kernel/gui/ImageLoader.java @@ -9,7 +9,6 @@ import javax.swing.ImageIcon; import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.process.Gateway; -import com.c2kernel.process.resource.Resource; import com.c2kernel.utils.Logger; public class ImageLoader { diff --git a/src/main/java/com/c2kernel/gui/LoginBox.java b/src/main/java/com/c2kernel/gui/LoginBox.java index fb52a7b..ce7a48d 100644 --- a/src/main/java/com/c2kernel/gui/LoginBox.java +++ b/src/main/java/com/c2kernel/gui/LoginBox.java @@ -67,7 +67,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.getProperty("AppIcon"); + String iconFile = Gateway.getProperties().getProperty("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 5edef4a..62418d1 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.getProperty("Logo"); + logoURL = Gateway.getProperties().getProperty("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.getProperty("Name"), + Gateway.getProperties().getProperty("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.getProperty("Name") + " - " + Language.translate("Cristal 2")); + userAgent.getName()+"@"+Gateway.getProperties().getProperty("Name") + " - " + Language.translate("Cristal 2")); - String iconFile = Gateway.getProperty("AppIcon"); + String iconFile = Gateway.getProperties().getProperty("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.getProperty("Executors"); + String pluginList = Gateway.getProperties().getProperty("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 c183cba..2200f4b 100644 --- a/src/main/java/com/c2kernel/gui/MenuBuilder.java +++ b/src/main/java/com/c2kernel/gui/MenuBuilder.java @@ -30,7 +30,6 @@ import com.c2kernel.lookup.DomainPath; import com.c2kernel.lookup.Path; import com.c2kernel.persistency.ClusterStorage; import com.c2kernel.process.Gateway; -import com.c2kernel.process.resource.Resource; import com.c2kernel.property.Property; import com.c2kernel.utils.FileStringUtility; import com.c2kernel.utils.Language; @@ -216,7 +215,7 @@ public class MenuBuilder extends JMenuBar implements ActionListener, ItemListene String aboutInfo; try { - aboutInfo = FileStringUtility.file2String(Gateway.getProperty("about")); + aboutInfo = FileStringUtility.file2String(Gateway.getProperties().getProperty("about")); } catch (Exception e) { @@ -258,7 +257,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.getProperty("banner")); + Icon icon = ImageLoader.findImage(Gateway.getProperties().getProperty("banner")); myPane.setIcon(icon); dialog.pack(); dialog.setVisible(true); diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java b/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java index 8a2c0cc..03dfebc 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/chooser/LDAPEntryChooser.java @@ -62,7 +62,7 @@ public class LDAPEntryChooser extends JComboBox @Override public synchronized Dimension getSize() { - if ("1".equals(Gateway.getProperty("ResizeCombo"))) + if (Gateway.getProperties().getInt("ResizeCombo") > 0) return new Dimension(super.getSize().width<400?400:super.getSize().width,super.getSize().height); return super.getSize(); } 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 75b3ff7..3cdefee 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java @@ -202,7 +202,7 @@ public class CompActDefOutcomeHandler public VertexPropertyPanel loadPropertyPanel() { - String wfPanelClass = Gateway.getProperty("WfPropertyPanel"); + String wfPanelClass = Gateway.getProperties().getProperty("WfPropertyPanel"); if (wfPanelClass != null) { try { Class panelClass = Class.forName(wfPanelClass); diff --git a/src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java b/src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java index 8847996..70f4930 100644 --- a/src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/EntityTabPane.java @@ -173,7 +173,7 @@ public class EntityTabPane extends JPanel implements Runnable { } static public OutcomeHandler getOutcomeHandler(String schema, int version) { - String ohClassName = Gateway.getProperty("OutcomeHandler."+schema+"."+version); + String ohClassName = Gateway.getProperties().getProperty("OutcomeHandler."+schema+"."+version); try { if (ohClassName != null && ohClassName.length() > 0) { Class ohClass = Class.forName(ohClassName); @@ -182,7 +182,7 @@ public class EntityTabPane extends JPanel implements Runnable { } catch (Exception ex) { Logger.error("Error creating handler "+ohClassName+". using default outcome editor"); } - ohClassName = Gateway.getProperty("OutcomeHandler.*"); + ohClassName = Gateway.getProperties().getProperty("OutcomeHandler.*"); try { if (ohClassName != null && ohClassName.length() > 0) { Class ohClass = Class.forName(ohClassName); diff --git a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java index 30bd77d..7cbd00e 100644 --- a/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/PropertiesPane.java @@ -80,7 +80,7 @@ public class PropertiesPane extends EntityTabPane implements EntityProxyObserver add(domAdmin); - if ("true".equals(Gateway.getProperty("EnableItemErase"))) { + if (Gateway.getProperties().getBoolean("EnableItemErase")) { c.gridy++; c.fill = GridBagConstraints.NONE; eraseButton = new JButton(Language.translate("Erase!")); diff --git a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java index 30e7887..754cf60 100644 --- a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java +++ b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java @@ -254,7 +254,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver 0) this.name = pathComponents[pathComponents.length-1]; else - this.name = Gateway.getProperty("Name"); + this.name = Gateway.getProperties().getProperty("Name"); } public EntityTabManager getDesktop() { -- cgit v1.2.3