diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2012-11-09 09:51:18 +0100 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2012-11-09 09:51:18 +0100 |
| commit | 1e67b454efd84a88877205917038da13a47a2f6b (patch) | |
| tree | 560efbf86df264d9ee730139587d27d9efa0911d /src/main/java/com/c2kernel/utils/LocalObjectLoader.java | |
| parent | d2454ce72c0563bc5ce8b63f7fb6d4c39b7295d1 (diff) | |
Create proper constructor for Schema.
Diffstat (limited to 'src/main/java/com/c2kernel/utils/LocalObjectLoader.java')
| -rw-r--r-- | src/main/java/com/c2kernel/utils/LocalObjectLoader.java | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java index 8a73e3c..6832eeb 100644 --- a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java +++ b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java @@ -37,29 +37,25 @@ public class LocalObjectLoader { static public Schema getSchema(String schemaName, int schemaVersion) throws ObjectNotFoundException {
Logger.msg(5, "Loading schema "+schemaName+" v"+schemaVersion);
- Schema thisSchema = new Schema();
- thisSchema.docType = schemaName;
- thisSchema.docVersion = schemaVersion;
+
+ String docType = schemaName;
+ int docVersion = schemaVersion;
+ String schemaData;
// don't bother if this is the Schema schema - for bootstrap esp.
- if (schemaName.equals("Schema") && schemaVersion == 0) {
- thisSchema.breakApart = false;
- thisSchema.schema="";
- return thisSchema;
- }
-
- ItemProxy schema = loadLocalObjectDef("/desc/OutcomeDesc/", schemaName);
- Viewpoint schemaView = (Viewpoint)schema.getObject(ClusterStorage.VIEWPOINT + "/Schema/" + schemaVersion);
- try {
- thisSchema.schema = schemaView.getOutcome().getData();
- } catch (ClusterStorageException ex) {
- Logger.error(ex);
- throw new ObjectNotFoundException("Problem loading schema "+schemaName+" v"+schemaVersion+": "+ex.getMessage(), "");
- }
- String breakApart = schema.getProperty("BreakApart");
- thisSchema.breakApart = breakApart.equals("1");
+ if (schemaName.equals("Schema") && schemaVersion == 0)
+ return new Schema(docType, docVersion, false, "");
- return thisSchema;
+ ItemProxy schema = loadLocalObjectDef("/desc/OutcomeDesc/", schemaName);
+ Viewpoint schemaView = (Viewpoint)schema.getObject(ClusterStorage.VIEWPOINT + "/Schema/" + schemaVersion);
+ try {
+ schemaData = schemaView.getOutcome().getData();
+ } catch (ClusterStorageException ex) {
+ Logger.error(ex);
+ throw new ObjectNotFoundException("Problem loading schema "+schemaName+" v"+schemaVersion+": "+ex.getMessage(), "");
+ }
+ String breakApart = schema.getProperty("BreakApart");
+ return new Schema(docType, docVersion, breakApart.equals("1"), schemaData);
}
/**
|