From 5066d63bfe9907360ce14875a7b7639984e464cd Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Wed, 04 Jun 2008 19:47:24 +0800
Subject: [PATCH] update for EOFM-111

---
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java
index 3f6e681..1e9a236 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java
@@ -46,9 +46,9 @@
 import com.ximple.eofms.util.ByteArrayCompressor;
 import com.ximple.eofms.util.StringUtils;
 import com.ximple.eofms.jobs.context.AbstractOracleJobContext;
-import com.ximple.eofms.jobs.context.FeatureDgnConvertJobContext;
-import com.ximple.eofms.jobs.context.GeneralDgnConvertJobContext;
-import com.ximple.eofms.jobs.context.IndexDgnConvertJobContext;
+import com.ximple.eofms.jobs.context.FeatureDgnConvertShpJobContext;
+import com.ximple.eofms.jobs.context.GeneralDgnConvertShpJobContext;
+import com.ximple.eofms.jobs.context.IndexDgnConvertShpJobContext;
 import com.ximple.eofms.jobs.context.OracleConvertShapefilesJobContext;
 
 public class OracleConvertDgn2OraSDOJob extends AbstractOracleDatabaseJob
@@ -562,7 +562,7 @@
 
         for (File dgnFile : dgnFiles)
         {
-            IndexDgnConvertJobContext convertContext = new IndexDgnConvertJobContext(getDataPath());
+            IndexDgnConvertShpJobContext convertContext = new IndexDgnConvertShpJobContext(getDataPath());
             logger.debug("--- start dgnfile-" + dgnFile.toString() + " ---");
             try
             {
@@ -609,7 +609,7 @@
         }
     }
 
-    protected void scanIndexDgnElement(IndexDgnConvertJobContext convertContext)
+    protected void scanIndexDgnElement(IndexDgnConvertShpJobContext convertContext)
             throws Dgn7fileException, IOException, IllegalAttributeException, SchemaException
     {
         Dgn7fileReader reader = convertContext.getReader();
@@ -652,7 +652,7 @@
         logger.debug("ElementRecord Count=" + count);
     }
 
-    private void processIndexElement(Element element, IndexDgnConvertJobContext convertContext) throws IllegalAttributeException, SchemaException
+    private void processIndexElement(Element element, IndexDgnConvertShpJobContext convertContext) throws IllegalAttributeException, SchemaException
     {
         if (element instanceof TextElement)
         {
@@ -691,7 +691,7 @@
 
         for (File dgnFile : dgnFiles)
         {
-            GeneralDgnConvertJobContext convertContext = new GeneralDgnConvertJobContext(getDataPath());
+            GeneralDgnConvertShpJobContext convertContext = new GeneralDgnConvertShpJobContext(getDataPath());
             logger.info("--- start dgnfile-" + dgnFile.toString() + " ---");
             try
             {
@@ -738,7 +738,7 @@
         }
     }
 
-    public void scanOtherDgnElement(GeneralDgnConvertJobContext convertContext)
+    public void scanOtherDgnElement(GeneralDgnConvertShpJobContext convertContext)
             throws Dgn7fileException, IOException, IllegalAttributeException, SchemaException
     {
         Dgn7fileReader reader = convertContext.getReader();
@@ -781,7 +781,7 @@
         logger.debug("ElementRecord Count=" + count);
     }
 
-    private void processOtherElement(Element element, GeneralDgnConvertJobContext convertContext)
+    private void processOtherElement(Element element, GeneralDgnConvertShpJobContext convertContext)
             throws IllegalAttributeException, SchemaException
     {
         convertContext.putFeatureCollection(element);
@@ -794,12 +794,12 @@
         {
             deleteFilesInPath(outDataPath);
         }
-        outDataPath = new File(getDataPath(), IndexDgnConvertJobContext.SHPOUTPATH);
+        outDataPath = new File(getDataPath(), IndexDgnConvertShpJobContext.SHPOUTPATH);
         if (outDataPath.exists() && outDataPath.isDirectory())
         {
             deleteFilesInPath(outDataPath);
         }
-        outDataPath = new File(getDataPath(), GeneralDgnConvertJobContext.SHPOUTPATH);
+        outDataPath = new File(getDataPath(), GeneralDgnConvertShpJobContext.SHPOUTPATH);
         if (outDataPath.exists() && outDataPath.isDirectory())
         {
             deleteFilesInPath(outDataPath);
@@ -864,7 +864,7 @@
 
         for (File dgnFile : dgnFiles)
         {
-            FeatureDgnConvertJobContext convertContext = new FeatureDgnConvertJobContext(getDataPath(), _filterPath);
+            FeatureDgnConvertShpJobContext convertContext = new FeatureDgnConvertShpJobContext(getDataPath(), _filterPath);
             logger.info("--- start dgnfile-" + dgnFile.toString() + " ---");
             try
             {
@@ -911,7 +911,7 @@
         }
     }
 
-    public void scanFeatureDgnElement(FeatureDgnConvertJobContext convertContext)
+    public void scanFeatureDgnElement(FeatureDgnConvertShpJobContext convertContext)
             throws Dgn7fileException, IOException, IllegalAttributeException, SchemaException
     {
         Dgn7fileReader reader = convertContext.getReader();
@@ -954,7 +954,7 @@
         logger.debug("ElementRecord Count=" + count);
     }
 
-    private void processFeatureElement(Element element, FeatureDgnConvertJobContext convertContext)
+    private void processFeatureElement(Element element, FeatureDgnConvertShpJobContext convertContext)
             throws IllegalAttributeException, SchemaException
     {
         convertContext.putFeatureCollection(element);
@@ -963,7 +963,7 @@
     private void createDummyFeatureFile(JobExecutionContext context) throws JobExecutionException
     {
         /*
-        DummyFeatureConvertJobContext convertContext = new DummyFeatureConvertJobContext(getDataPath(), _filterPath);
+        DummyFeatureConvertShpJobContext convertContext = new DummyFeatureConvertShpJobContext(getDataPath(), _filterPath);
         try {
             convertContext.startTransaction();
             convertContext.commitTransaction();

--
Gitblit v0.0.0-SNAPSHOT