Move cdk-io core API

cdk · May 21, 2017 · 0c95334 · 0c95334
1 parent 2262ec1
commit 0c95334
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 10 deletions.
diff --git a/.../org/openscience/cdk/io/ChemObjectIO.java → .../org/openscience/cdk/io/ChemObjectIO.java b/.../org/openscience/cdk/io/ChemObjectIO.java → .../org/openscience/cdk/io/ChemObjectIO.java
diff --git a/...ience/cdk/io/DefaultChemObjectReader.java → ...ience/cdk/io/DefaultChemObjectReader.java b/...ience/cdk/io/DefaultChemObjectReader.java → ...ience/cdk/io/DefaultChemObjectReader.java
diff --git a/...ience/cdk/io/DefaultChemObjectWriter.java → ...ience/cdk/io/DefaultChemObjectWriter.java b/...ience/cdk/io/DefaultChemObjectWriter.java → ...ience/cdk/io/DefaultChemObjectWriter.java
diff --git a/...tor/DefaultIteratingChemObjectReader.java → ...tor/DefaultIteratingChemObjectReader.java b/...tor/DefaultIteratingChemObjectReader.java → ...tor/DefaultIteratingChemObjectReader.java
@@ -15,16 +15,14 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 package org.openscience.cdk.io.iterator;
 
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.interfaces.IChemObject;
 import org.openscience.cdk.io.ChemObjectIO;
-import org.openscience.cdk.io.IChemObjectReader;
 import org.openscience.cdk.io.IChemObjectReaderErrorHandler;
-import org.openscience.cdk.io.ISimpleChemObjectReader;
 
 /**
  * Abstract class that IteratingChemObjectReader's can implement to have it
@@ -36,7 +34,7 @@
 public abstract class DefaultIteratingChemObjectReader<T extends IChemObject> extends ChemObjectIO implements
         IIteratingChemObjectReader<T> {
 
-    protected IChemObjectReader.Mode        mode         = IChemObjectReader.Mode.RELAXED;
+    protected Mode        mode         = Mode.RELAXED;
     protected IChemObjectReaderErrorHandler errorHandler = null;
 
     @Override
@@ -55,7 +53,7 @@ public void remove() {
     }
 
     @Override
-    public void setReaderMode(ISimpleChemObjectReader.Mode mode) {
+    public void setReaderMode(Mode mode) {
         this.mode = mode;
     }
 

diff --git a/.../DefaultRandomAccessChemObjectReader.java → .../DefaultRandomAccessChemObjectReader.java b/.../DefaultRandomAccessChemObjectReader.java → .../DefaultRandomAccessChemObjectReader.java
diff --git a/...nce/cdk/io/random/RandomAccessReader.java → ...nce/cdk/io/random/RandomAccessReader.java b/...nce/cdk/io/random/RandomAccessReader.java → ...nce/cdk/io/random/RandomAccessReader.java
diff --git a/...ence/cdk/io/setting/BooleanIOSetting.java → ...ence/cdk/io/setting/BooleanIOSetting.java b/...ence/cdk/io/setting/BooleanIOSetting.java → ...ence/cdk/io/setting/BooleanIOSetting.java
diff --git a/...ence/cdk/io/setting/IntegerIOSetting.java → ...ence/cdk/io/setting/IntegerIOSetting.java b/...ence/cdk/io/setting/IntegerIOSetting.java → ...ence/cdk/io/setting/IntegerIOSetting.java
diff --git a/...ience/cdk/io/setting/OptionIOSetting.java → ...ience/cdk/io/setting/OptionIOSetting.java b/...ience/cdk/io/setting/OptionIOSetting.java → ...ience/cdk/io/setting/OptionIOSetting.java
diff --git a/...cience/cdk/io/setting/SettingManager.java → ...cience/cdk/io/setting/SettingManager.java b/...cience/cdk/io/setting/SettingManager.java → ...cience/cdk/io/setting/SettingManager.java
diff --git a/...ience/cdk/io/setting/StringIOSetting.java → ...ience/cdk/io/setting/StringIOSetting.java b/...ience/cdk/io/setting/StringIOSetting.java → ...ience/cdk/io/setting/StringIOSetting.java
diff --git a/...terator/event/IEventChemObjectReader.java → ...terator/event/IEventChemObjectReader.java b/...terator/event/IEventChemObjectReader.java → ...terator/event/IEventChemObjectReader.java
@@ -33,7 +33,7 @@
  * @cdk.module io
  * @cdk.githash
  *
- * @see org.openscience.cdk.io.IChemObjectIO
+ * @see IChemObjectIO
  *
  * @author Egon Willighagen &lt;egonw@sci.kun.nl&gt;
  * @cdk.created 2005-01-25

diff --git a/...e/cdk/io/listener/PropertiesListener.java → ...e/cdk/io/listener/PropertiesListener.java b/...e/cdk/io/listener/PropertiesListener.java → ...e/cdk/io/listener/PropertiesListener.java
@@ -18,15 +18,15 @@
  */
 package org.openscience.cdk.io.listener;
 
+import org.openscience.cdk.exception.CDKException;
+import org.openscience.cdk.io.ReaderEvent;
+import org.openscience.cdk.io.setting.IOSetting;
+
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.Writer;
 import java.util.Properties;
 
-import org.openscience.cdk.exception.CDKException;
-import org.openscience.cdk.io.ReaderEvent;
-import org.openscience.cdk.io.setting.IOSetting;
-
 /**
  * Answers the questions by looking up the values in a Properties
  * object. The question names match the property field names.

diff --git a/...random/IRandomAccessChemObjectReader.java → ...random/IRandomAccessChemObjectReader.java b/...random/IRandomAccessChemObjectReader.java → ...random/IRandomAccessChemObjectReader.java
diff --git a/...science/cdk/tools/LoggingToolFactory.java → ...science/cdk/tools/LoggingToolFactory.java b/...science/cdk/tools/LoggingToolFactory.java → ...science/cdk/tools/LoggingToolFactory.java