Revision: 5651
http://sourceforge.net/p/jump-pilot/code/5651
Author: edso
Date: 2017-12-25 19:53:18 +0000 (Mon, 25 Dec 2017)
Log Message:
-----------
pretty much commented completely
extend the proper GMLWriter/Reader now, which is much cleaner as wrapping makes
virtually no sense
classes report errors now as getExceptions() wasn't implemented properly before
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/io/JMLReader.java
core/trunk/src/com/vividsolutions/jump/io/JMLWriter.java
Modified: core/trunk/src/com/vividsolutions/jump/io/JMLReader.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/io/JMLReader.java 2017-12-25
14:56:54 UTC (rev 5650)
+++ core/trunk/src/com/vividsolutions/jump/io/JMLReader.java 2017-12-25
19:53:18 UTC (rev 5651)
@@ -82,36 +82,36 @@
* <br>
* <br>
*/
-public class JMLReader extends AbstractJUMPReader {
+public class JMLReader extends GMLReader {
- /** Creates new JMLReader */
- public JMLReader() {
- }
-
- /**
- * Read a JML file - passes the work off to {@link GMLReader}.
- *
- *@param dp 'InputFile' or 'DefaultValue' for the input JML file
- */
- public FeatureCollection read(DriverProperties dp)
- throws Exception {
- GMLReader gmlReader;
- String inputFname;
-
- inputFname = dp.getProperty(DataSource.FILE_KEY);
-
- if (inputFname == null) {
- inputFname = dp.getProperty(DriverProperties.DEFAULT_VALUE_KEY);
- }
-
- if (inputFname == null) {
- throw new IllegalParametersException(
- "call to JMLReader.read() has DataProperties w/o a InputFile
specified");
- }
-
- gmlReader = new GMLReader();
- gmlReader.setTaskMonitor(getTaskMonitor());
-
- return gmlReader.read(dp);
- }
+// /** Creates new JMLReader */
+// public JMLReader() {
+// }
+//
+// /**
+// * Read a JML file - passes the work off to {@link GMLReader}.
+// *
+// *@param dp 'InputFile' or 'DefaultValue' for the input JML file
+// */
+// public FeatureCollection read(DriverProperties dp)
+// throws Exception {
+// GMLReader gmlReader;
+// String inputFname;
+//
+// inputFname = dp.getProperty(DataSource.FILE_KEY);
+//
+// if (inputFname == null) {
+// inputFname = dp.getProperty(DriverProperties.DEFAULT_VALUE_KEY);
+// }
+//
+// if (inputFname == null) {
+// throw new IllegalParametersException(
+// "call to JMLReader.read() has DataProperties w/o a InputFile
specified");
+// }
+//
+// gmlReader = new GMLReader();
+// gmlReader.setTaskMonitor(getTaskMonitor());
+//
+// return gmlReader.read(dp);
+// }
}
Modified: core/trunk/src/com/vividsolutions/jump/io/JMLWriter.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/io/JMLWriter.java 2017-12-25
14:56:54 UTC (rev 5650)
+++ core/trunk/src/com/vividsolutions/jump/io/JMLWriter.java 2017-12-25
19:53:18 UTC (rev 5651)
@@ -67,35 +67,35 @@
* </table><br>
* </p>
*/
-public class JMLWriter implements JUMPWriter {
+public class JMLWriter extends GMLWriter /*implements JUMPWriter */ {
- /** Creates new JMLWriter */
- public JMLWriter() {
- }
-
- /**
- * Writes the feature collection to the specified file in JML format.
- * @param featureCollection features to write
- * @param dp 'OutputFile' or 'DefaultValue' to specify what file to write.
- */
- public void write(FeatureCollection featureCollection, DriverProperties dp)
- throws Exception {
- GMLWriter gmlWriter;
- String outputFname;
-
- outputFname = dp.getProperty(DataSource.FILE_KEY);
-
- if (outputFname == null) {
- outputFname = dp.getProperty(DriverProperties.DEFAULT_VALUE_KEY);
- }
-
- if (outputFname == null) {
- throw new IllegalParametersException(
- "call to JMLWriter.write() has DataProperties w/o a OutputFile
specified");
- }
-
- gmlWriter = new GMLWriter();
-
- gmlWriter.write(featureCollection, dp);
- }
+// /** Creates new JMLWriter */
+// public JMLWriter() {
+// }
+//
+// /**
+// * Writes the feature collection to the specified file in JML format.
+// * @param featureCollection features to write
+// * @param dp 'OutputFile' or 'DefaultValue' to specify what file to
write.
+// */
+// public void write(FeatureCollection featureCollection, DriverProperties
dp)
+// throws Exception {
+// GMLWriter gmlWriter;
+// String outputFname;
+//
+// outputFname = dp.getProperty(DataSource.FILE_KEY);
+//
+// if (outputFname == null) {
+// outputFname = dp.getProperty(DriverProperties.DEFAULT_VALUE_KEY);
+// }
+//
+// if (outputFname == null) {
+// throw new IllegalParametersException(
+// "call to JMLWriter.write() has DataProperties w/o a
OutputFile specified");
+// }
+//
+// gmlWriter = new GMLWriter();
+//
+// gmlWriter.write(featureCollection, dp);
+// }
}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
