svn commit: r395334 - in /incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl: ApplyChangesCommandImpl.java CommandFactoryImpl.java

[kwilliams]

Author: kwilliams
Date: Wed Apr 19 11:18:36 2006
New Revision: 395334

URL: http://svn.apache.org/viewcvs?rev=395334&view=rev
Log:
Small refactoring and cleanup of dead code

Modified:
    
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
    
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandFactoryImpl.java

Modified: 
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java?rev=395334&r1=395333&r2=395334&view=diff
==============================================================================
--- 
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
 (original)
+++ 
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
 Wed Apr 19 11:18:36 2006
@@ -16,24 +16,18 @@
  */
 package org.apache.tuscany.das.rdb.impl;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.DriverManager;
 
 import org.apache.tuscany.das.rdb.ApplyChangesCommand;
 import org.apache.tuscany.das.rdb.Command;
 import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.ConfigFactory;
 import org.apache.tuscany.das.rdb.config.ConnectionProperties;
 import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
 import org.apache.tuscany.das.rdb.util.DebugUtil;
-import org.apache.tuscany.sdo.util.SDOUtil;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.Type;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
 
 /**
  * 
@@ -45,25 +39,12 @@
     private ChangeSummarizer summarizer = new ChangeSummarizer();
 
     public ApplyChangesCommandImpl() {
-        // Empty Constructor
     }
 
-    // IOException is recoverable, needs to be thrown
-    public ApplyChangesCommandImpl(InputStream stream) throws IOException {
-       SDOUtil.registerStaticTypes(ConfigFactory.class);
-       XMLHelper helper = XMLHelper.INSTANCE;   
-       XMLDocument doc = helper.load(stream);
-       Config mapping = (Config) doc.getRootObject();
-
-       this.configWrapper = new MappingWrapper(mapping);
-     
-        if (mapping.getConnectionProperties() != null)
-            setConnection(mapping.getConnectionProperties());
-       
-    }
-
-    public ApplyChangesCommandImpl(Config mappingModel){
-       this.configWrapper = new MappingWrapper(mappingModel);      
+    public ApplyChangesCommandImpl(Config config){
+       this.configWrapper = new MappingWrapper(config); 
+        if (config.getConnectionProperties() != null)
+            setConnection(config.getConnectionProperties());
     }
 
        public void setConnection(ConnectionImpl connection) {

Modified: 
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandFactoryImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandFactoryImpl.java?rev=395334&r1=395333&r2=395334&view=diff
==============================================================================
--- 
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandFactoryImpl.java
 (original)
+++ 
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandFactoryImpl.java
 Wed Apr 19 11:18:36 2006
@@ -46,13 +46,12 @@
         return new ApplyChangesCommandImpl();
     }
 
-    public ApplyChangesCommand createApplyChangesCommand(InputStream 
mappingModel) throws IOException {
-        return new ApplyChangesCommandImpl(mappingModel);
+    public ApplyChangesCommand createApplyChangesCommand(InputStream 
configStream) throws IOException {
+        return new ApplyChangesCommandImpl(loadConfig(configStream));
     }
 
     public ApplyChangesCommand createApplyChangesCommand(Config config) {
-        // TODO Auto-generated method stub
-        return null;
+        return new ApplyChangesCommandImpl(config);
     }
 
     // Utilities