diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-09-15 12:27:51 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-09-15 12:27:51 +0200 |
| commit | 8f64e9ebaf48e73e50473782f5696a053a76f114 (patch) | |
| tree | a73d278a23fabf6fd2643de0904b7ddfb02aae2e /src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java | |
| parent | 8e5d28aec9368c29acec858e9d748ed2ed5eb397 (diff) | |
Prefer using ObjectProperties getString and getInstance where possible.
Diffstat (limited to 'src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java')
| -rw-r--r-- | src/main/java/com/c2kernel/gui/tabs/ItemTabPane.java | 31 |
1 files changed, 14 insertions, 17 deletions
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();
}
+
}
|