Update of Maxime's work since Hélène's last update for SDD export functions.

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / sdd / SDDExportConfigurator.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportConfigurator.java
index ef58288458057397ee86830d3d82f63de5e2f8b6..8db83506d107a3df7eb66aa4fd15c5a95382737a 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportConfigurator.java
@@ -14,16 +14,16 @@ import java.io.File;
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
-import eu.etaxonomy.cdm.io.common.ExportConfiguratorBase;\r
+import eu.etaxonomy.cdm.io.common.ExportStateBase;\r
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;\r
-import eu.etaxonomy.cdm.io.sdd.SDDCdmExporter;\r
+import eu.etaxonomy.cdm.io.common.XmlExportConfiguratorBase;\r
 \r
 /**\r
  * @author h.fradin (from a.babadshanjan JaxbExportConfigurator)\r
  * @created 09.12.2008\r
  * @version 1.0\r
  */\r
-public class SDDExportConfigurator extends ExportConfiguratorBase implements IExportConfigurator {\r
+public class SDDExportConfigurator extends XmlExportConfiguratorBase implements IExportConfigurator {\r
        \r
        @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(SDDExportConfigurator.class);\r
@@ -49,7 +49,7 @@ public class SDDExportConfigurator extends ExportConfiguratorBase implements IEx
        \r
        \r
        public static SDDExportConfigurator NewInstance(ICdmDataSource source, String url, String destinationFolder) {\r
-               return new SDDExportConfigurator(source, url);\r
+               return new SDDExportConfigurator(source, destinationFolder + File.separator + url);\r
        }\r
        \r
        \r
@@ -160,9 +160,9 @@ public class SDDExportConfigurator extends ExportConfiguratorBase implements IEx
         * @param destination\r
         */\r
        private SDDExportConfigurator(ICdmDataSource source, String url) {\r
-               super();\r
-               setDestination(url);\r
-               setSource(source);\r
+               super(new File(url), source);\r
+//             setDestination(url);\r
+//             setSource(source);\r
        }\r
        \r
 \r
@@ -170,14 +170,16 @@ public class SDDExportConfigurator extends ExportConfiguratorBase implements IEx
         * @see eu.etaxonomy.cdm.io.common.ImportConfiguratorBase#getSource()\r
         */\r
        public File getDestination() {\r
-               return (File)super.getDestination();\r
+               File file = super.getDestination();\r
+               return file;\r
+//             return super.getDestination();\r
        }\r
 \r
        \r
        /**\r
         * @param file\r
         */\r
-       public void setDestination(String fileName) {\r
+       public void setDestination(File fileName) {\r
                super.setDestination(fileName);\r
        }\r
        \r
@@ -192,6 +194,14 @@ public class SDDExportConfigurator extends ExportConfiguratorBase implements IEx
                        return this.getDestination().toString();\r
                }\r
        }\r
+\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.cdm.io.common.IExportConfigurator#getNewState()\r
+        */\r
+       public ExportStateBase getNewState() {\r
+               return new SDDExportState(this);\r
+       }\r
        \r
                \r
 }\r