don't need init method on import/export filters after all

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/branches/jackcess-2@688 f203690c-595d-4dc9-a70b-905162fa7fd2

diff --git a/TODO.txt b/TODO.txt
index 5d03856f514ce6cc7b80b5e84d8476e1dbedea3a..31ae396b5328e5f1a94373d19ac809f021d956ee 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -39,3 +39,6 @@ Refactor goals:
   * clean up columnimpl/tableimpl constructors
 - add updateCurrentRow(Map), add updateRow(Row)
 - sort out query types
+- clean up javadocs
+  - enhance public api classes
+  - add @usage tags to util classes

diff --git a/src/java/com/healthmarketscience/jackcess/util/ExportFilter.java b/src/java/com/healthmarketscience/jackcess/util/ExportFilter.java
index 9fece9d7c47fcfc8951a28826082103ccc206718..b9b8607f07c19ac50bfceffa8802ae734b040ef2 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/util/ExportFilter.java
+++ b/src/java/com/healthmarketscience/jackcess/util/ExportFilter.java
@@ -39,16 +39,6 @@ import com.healthmarketscience.jackcess.Column;
  */
 public interface ExportFilter {
 
-  /**
-   * Called before any calls {@link #filterColumns} and {@link #filterRow} for
-   * a single export operation.  Allows the given instance to return a
-   * per-call instance which can maintain state.
-   *
-   * @return the ExportFilter instance to use for the rest of the export
-   *         operation
-   */
-  public ExportFilter init();
-
   /**
    * The columns that should be used to create the exported file.
    * 

diff --git a/src/java/com/healthmarketscience/jackcess/util/ExportUtil.java b/src/java/com/healthmarketscience/jackcess/util/ExportUtil.java
index 81bf6da26195bbe68ae10efd94e85f72d35f62a6..059347d3c241bb955b75febb41337536e6fe0092 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/util/ExportUtil.java
+++ b/src/java/com/healthmarketscience/jackcess/util/ExportUtil.java
@@ -308,9 +308,6 @@ public class ExportUtil {
         "(?:" + Pattern.quote(delimiter) + ")|(?:" + 
         Pattern.quote("" + quote) + ")|(?:[\n\r])");
 
-    // allow filter to setup per-call state
-    filter = filter.init();
-
     List<? extends Column> origCols = cursor.getTable().getColumns();
     List<Column> columns = new ArrayList<Column>(origCols);
     columns = filter.filterColumns(columns);

diff --git a/src/java/com/healthmarketscience/jackcess/util/ImportFilter.java b/src/java/com/healthmarketscience/jackcess/util/ImportFilter.java
index 786dbac6408d0c597d6a305cc0f95bdc82c0a46b..a7131b7ac66ae62ccea10d7be25f32e793ec08ef 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/util/ImportFilter.java
+++ b/src/java/com/healthmarketscience/jackcess/util/ImportFilter.java
@@ -41,16 +41,6 @@ import com.healthmarketscience.jackcess.ColumnBuilder;
  */
 public interface ImportFilter {
 
-  /**
-   * Called before any calls {@link #filterColumns} and {@link #filterRow} for
-   * a single import operation.  Allows the given instance to return a
-   * per-call instance which can maintain state.
-   *
-   * @return the ImportFilter instance to use for the rest of the import
-   *         operation
-   */
-  public ImportFilter init();
-
   /**
    * The columns that should be used to create the imported table.
    * @param destColumns the columns as determined by the import code, may be

diff --git a/src/java/com/healthmarketscience/jackcess/util/ImportUtil.java b/src/java/com/healthmarketscience/jackcess/util/ImportUtil.java
index 56e30dcf602ef3d221746f1e0586323d00c2d3a5..58b04bbf2030a95e11026abb20ca9fbd19130295 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/util/ImportUtil.java
+++ b/src/java/com/healthmarketscience/jackcess/util/ImportUtil.java
@@ -168,9 +168,6 @@ public class ImportUtil
   {
     ResultSetMetaData md = source.getMetaData();
 
-    // allow filter to setup per-call state
-    filter = filter.init();
-
     name = DatabaseImpl.escapeIdentifier(name);
     Table table = null;
     if(!useExistingTable || ((table = db.getTable(name)) == null)) {
@@ -459,9 +456,6 @@ public class ImportUtil
 
     Pattern delimPat = Pattern.compile(delim);
 
-    // allow filter to setup per-call state
-    filter = filter.init();
-
     try {
       name = DatabaseImpl.escapeIdentifier(name);
       Table table = null;

diff --git a/src/java/com/healthmarketscience/jackcess/util/SimpleExportFilter.java b/src/java/com/healthmarketscience/jackcess/util/SimpleExportFilter.java
index 70f4118813468cd39b32245de4077520dffd6d4f..5e61d6d23f34c665440c5a154579ed470d5d4e54 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/util/SimpleExportFilter.java
+++ b/src/java/com/healthmarketscience/jackcess/util/SimpleExportFilter.java
@@ -44,10 +44,6 @@ public class SimpleExportFilter implements ExportFilter {
   public SimpleExportFilter() {
   }
 
-  public ExportFilter init() {
-    return this;
-  }
-
   public List<Column> filterColumns(List<Column> columns) throws IOException {
     return columns;
   }

diff --git a/src/java/com/healthmarketscience/jackcess/util/SimpleImportFilter.java b/src/java/com/healthmarketscience/jackcess/util/SimpleImportFilter.java
index fe475f3ef2833b33c75008d919e20815fb7eef30..40b27ef81dd61e061d73b8107086251fed902853 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/util/SimpleImportFilter.java
+++ b/src/java/com/healthmarketscience/jackcess/util/SimpleImportFilter.java
@@ -47,10 +47,6 @@ public class SimpleImportFilter implements ImportFilter {
   public SimpleImportFilter() {
   }
 
-  public ImportFilter init() {
-    return this;
-  }
-  
   public List<ColumnBuilder> filterColumns(List<ColumnBuilder> destColumns,
                                            ResultSetMetaData srcColumns)
      throws SQLException, IOException