From 8f64e9ebaf48e73e50473782f5696a053a76f114 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Mon, 15 Sep 2014 12:27:51 +0200 Subject: Prefer using ObjectProperties getString and getInstance where possible. --- .../java/com/c2kernel/gui/tabs/ItemTabPane.java | 31 ++++++++++------------ 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java') 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(); } + } -- cgit v1.2.3