From 5512db61882f19b751acb4efca6b27c31be64bab Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 8 Aug 2018 14:17:24 +0300
Subject: [PATCH] #130 CSV import. Exporters refactoring

---
 .../data/office/export/DataExporterXLSX.java       |  2 +-
 plugins/org.jkiss.dbeaver.data.transfer/plugin.xml | 14 +++++++-------
 .../stream/{impl => exporter}/DataExporterCSV.java |  2 +-
 .../{impl => exporter}/DataExporterDbUnit.java     |  2 +-
 .../{impl => exporter}/DataExporterHTML.java       |  2 +-
 .../{impl => exporter}/DataExporterJSON.java       |  2 +-
 .../DataExporterMarkdownTable.java                 |  2 +-
 .../stream/{impl => exporter}/DataExporterSQL.java |  2 +-
 .../stream/{impl => exporter}/DataExporterXML.java |  2 +-
 .../{impl => exporter}/StreamExporterAbstract.java |  2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)
 rename plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/{impl => exporter}/DataExporterCSV.java (99%)
 rename plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/{impl => exporter}/DataExporterDbUnit.java (99%)
 rename plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/{impl => exporter}/DataExporterHTML.java (99%)
 rename plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/{impl => exporter}/DataExporterJSON.java (99%)
 rename plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/{impl => exporter}/DataExporterMarkdownTable.java (99%)
 rename plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/{impl => exporter}/DataExporterSQL.java (99%)
 rename plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/{impl => exporter}/DataExporterXML.java (99%)
 rename plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/{impl => exporter}/StreamExporterAbstract.java (97%)

diff --git a/plugins/org.jkiss.dbeaver.data.office/src/org/jkiss/dbeaver/data/office/export/DataExporterXLSX.java b/plugins/org.jkiss.dbeaver.data.office/src/org/jkiss/dbeaver/data/office/export/DataExporterXLSX.java
index 34fd1c0fbb..d3b08232a0 100644
--- a/plugins/org.jkiss.dbeaver.data.office/src/org/jkiss/dbeaver/data/office/export/DataExporterXLSX.java
+++ b/plugins/org.jkiss.dbeaver.data.office/src/org/jkiss/dbeaver/data/office/export/DataExporterXLSX.java
@@ -36,7 +36,7 @@ import org.jkiss.dbeaver.model.exec.DBCSession;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSEntity;
 import org.jkiss.dbeaver.tools.transfer.stream.IStreamDataExporterSite;
-import org.jkiss.dbeaver.tools.transfer.stream.impl.StreamExporterAbstract;
+import org.jkiss.dbeaver.tools.transfer.stream.exporter.StreamExporterAbstract;
 import org.jkiss.dbeaver.ui.controls.resultset.ResultSetUtils;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.utils.CommonUtils;
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/plugin.xml b/plugins/org.jkiss.dbeaver.data.transfer/plugin.xml
index 8a6302b1dc..ba39941909 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.data.transfer/plugin.xml
@@ -104,7 +104,7 @@
 
             <processor
                     id="stream.xml"
-                    class="org.jkiss.dbeaver.tools.transfer.stream.impl.DataExporterXML"
+                    class="org.jkiss.dbeaver.tools.transfer.stream.exporter.DataExporterXML"
                     description="%dataTransfer.processor.xml.description"
                     icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/xml.png"
                     label="%dataTransfer.processor.xml.name">
@@ -114,7 +114,7 @@
             </processor>
             <processor
                     id="stream.dbunit"
-                    class="org.jkiss.dbeaver.tools.transfer.stream.impl.DataExporterDbUnit"
+                    class="org.jkiss.dbeaver.tools.transfer.stream.exporter.DataExporterDbUnit"
                     description="%dataTransfer.processor.dbunit.description"
                     icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/xml.png"
                     label="%dataTransfer.processor.dbunit.name">
@@ -128,7 +128,7 @@
             </processor>
             <processor
                     id="stream.json"
-                    class="org.jkiss.dbeaver.tools.transfer.stream.impl.DataExporterJSON"
+                    class="org.jkiss.dbeaver.tools.transfer.stream.exporter.DataExporterJSON"
                     description="%dataTransfer.processor.json.description"
                     icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/json.png"
                     label="%dataTransfer.processor.json.name">
@@ -140,7 +140,7 @@
             </processor>
             <processor
                     id="stream.html"
-                    class="org.jkiss.dbeaver.tools.transfer.stream.impl.DataExporterHTML"
+                    class="org.jkiss.dbeaver.tools.transfer.stream.exporter.DataExporterHTML"
                     description="%dataTransfer.processor.html.description"
                     icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/html.png"
                     label="%dataTransfer.processor.html.name">
@@ -151,7 +151,7 @@
             </processor>
             <processor
                     id="stream.csv"
-                    class="org.jkiss.dbeaver.tools.transfer.stream.impl.DataExporterCSV"
+                    class="org.jkiss.dbeaver.tools.transfer.stream.exporter.DataExporterCSV"
                     description="%dataTransfer.processor.csv.description"
                     icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/csv.png"
                     label="%dataTransfer.processor.csv.name">
@@ -169,7 +169,7 @@
             </processor>
             <processor
                     id="stream.markdown.table"
-                    class="org.jkiss.dbeaver.tools.transfer.stream.impl.DataExporterMarkdownTable"
+                    class="org.jkiss.dbeaver.tools.transfer.stream.exporter.DataExporterMarkdownTable"
                     description="%dataTransfer.processor.markdownTable.description"
                     icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/markdown.png"
                     label="%dataTransfer.processor.markdownTable.name">
@@ -183,7 +183,7 @@
             </processor>
             <processor
                     id="stream.sql"
-                    class="org.jkiss.dbeaver.tools.transfer.stream.impl.DataExporterSQL"
+                    class="org.jkiss.dbeaver.tools.transfer.stream.exporter.DataExporterSQL"
                     description="%dataTransfer.processor.sql.description"
                     icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/sql.png"
                     label="%dataTransfer.processor.sql.name">
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterCSV.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterCSV.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterCSV.java
rename to plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterCSV.java
index 9e26862661..4f346296bf 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterCSV.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterCSV.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.tools.transfer.stream.impl;
+package org.jkiss.dbeaver.tools.transfer.stream.exporter;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBConstants;
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterDbUnit.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterDbUnit.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterDbUnit.java
rename to plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterDbUnit.java
index 638fdea503..cedde90cbd 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterDbUnit.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterDbUnit.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.tools.transfer.stream.impl;
+package org.jkiss.dbeaver.tools.transfer.stream.exporter;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterHTML.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterHTML.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterHTML.java
rename to plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterHTML.java
index 5fae57d30e..e705db0049 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterHTML.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterHTML.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.tools.transfer.stream.impl;
+package org.jkiss.dbeaver.tools.transfer.stream.exporter;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBUtils;
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterJSON.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterJSON.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterJSON.java
rename to plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterJSON.java
index ae02e94d29..0d61b890e1 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterJSON.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterJSON.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.tools.transfer.stream.impl;
+package org.jkiss.dbeaver.tools.transfer.stream.exporter;
 
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterMarkdownTable.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterMarkdownTable.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterMarkdownTable.java
rename to plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterMarkdownTable.java
index ca9c77e3ac..d0b78c3e73 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterMarkdownTable.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterMarkdownTable.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.tools.transfer.stream.impl;
+package org.jkiss.dbeaver.tools.transfer.stream.exporter;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBConstants;
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterSQL.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterSQL.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterSQL.java
rename to plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterSQL.java
index 80c7162f73..9d31ab7e4d 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterSQL.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterSQL.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.tools.transfer.stream.impl;
+package org.jkiss.dbeaver.tools.transfer.stream.exporter;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.jkiss.dbeaver.DBException;
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterXML.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterXML.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterXML.java
rename to plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterXML.java
index 84792ae1fb..6a73a51148 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterXML.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/DataExporterXML.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.tools.transfer.stream.impl;
+package org.jkiss.dbeaver.tools.transfer.stream.exporter;
 
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/StreamExporterAbstract.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/StreamExporterAbstract.java
similarity index 97%
rename from plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/StreamExporterAbstract.java
rename to plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/StreamExporterAbstract.java
index d70bc3c06f..5c2fe70a7a 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/impl/StreamExporterAbstract.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/exporter/StreamExporterAbstract.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.tools.transfer.stream.impl;
+package org.jkiss.dbeaver.tools.transfer.stream.exporter;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
-- 
GitLab