Author: desruisseaux
Date: Fri May 11 16:40:41 2018
New Revision: 1831433
URL: http://svn.apache.org/viewvc?rev=1831433&view=rev
Log:
Clarification about which packages are still work in progress:
- Move ...sql.postgresql to ...internal.sql.postgresql.
- Move org.apache.sql to org.apache.storage.sql for making clearer that it is
about DataStore.
- Add warnings in sis-sql and sis-shapefile modules, together with index
package.
- Trim extra spaces, fix a few formatting issues in XML class, fix package-info.
Added:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresDialect.java
- copied, changed from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresDialect.java
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStore.java
- copied, changed from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresStore.java
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStoreProvider.java
- copied, changed from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresStoreProvider.java
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLQuery.java
- copied, changed from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLQuery.java
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java
- copied, changed from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLStore.java
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java
- copied, changed from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLStoreProvider.java
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java
- copied, changed from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/package-info.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/package-info.java
(with props)
Removed:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/package-info.java
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataStoreQueryException.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataStoreQueryResultException.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidShapefileFormatException.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeTypeEnum.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapefileNotFoundException.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/package-info.java
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/DataBaseModel.java
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/QueryFeatureSet.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/xml/XML.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -55,18 +55,18 @@ import static org.apache.sis.util.Argume
/**
* Provides convenience methods for marshalling and unmarshalling SIS objects.
* Marshalling operations use the standard versions listed below
- * (for marshalling a document in a different version, see {@link
PooledMarshaller}).
+ * (for marshalling a document in a different version, see {@link
MarshallerPool}).
* Unmarshalling detects the version automatically.
*
* <table class="sis">
* <caption>Versions of standards applied at marshalling time</caption>
- * <tr><th>Topic</th> <th>SIS 0.3 to 0.8</th> <th>SIS 1.0</th>
<td>Remarks</td></tr>
+ * <tr><th>Topic</th> <th>SIS 0.3 to 0.8</th> <th>SIS 1.0</th>
<th>Remarks</th></tr>
* <tr><td>Metadata</td> <td>ISO 19139:2007</td> <td>ISO
19115-3:2016</td> <td></td></tr>
* <tr><td>Referencing</td> <td>ISO 19136:2007</td> <td>ISO 19136:2007</td>
<td>Same as GML 3.2</td></tr>
* </table>
*
* This class defines also some property keys that can be given to the {@link
Marshaller}
- * and {@link Unmarshaller} instances created by {@link PooledMarshaller}:
+ * and {@link Unmarshaller} instances created by {@link MarshallerPool}:
*
* <table class="sis">
* <caption>Supported (un)marshaller properties</caption>
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataStoreQueryException.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataStoreQueryException.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataStoreQueryException.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataStoreQueryException.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -22,6 +22,9 @@ import org.apache.sis.storage.DataStoreE
/**
* Thrown when a query is invalid.
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Marc Le Bihan
* @version 0.6
* @since 0.6
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataStoreQueryResultException.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataStoreQueryResultException.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataStoreQueryResultException.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DataStoreQueryResultException.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -22,6 +22,9 @@ import org.apache.sis.storage.DataStoreE
/**
* Thrown when a query result is invalid (for example : because the data found
has a wrong format).
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Marc Le Bihan
* @version 0.6
* @since 0.6
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/DbaseFileNotFoundException.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -22,6 +22,9 @@ import org.apache.sis.storage.DataStoreE
/**
* Thrown when a DBF file has not been found.
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Marc Le Bihan
* @version 0.6
* @since 0.6
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -43,6 +43,9 @@ import org.opengis.feature.Feature;
/**
* Input Stream of features.
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Marc Le Bihan
* @version 0.5
* @since 0.5
@@ -51,10 +54,10 @@ import org.opengis.feature.Feature;
public class InputFeatureStream extends InputStream {
/** Logger. */
private static Logger LOGGER =
Logging.getLogger(InputFeatureStream.class.getSimpleName());
-
+
/** Resource bundle. */
private ResourceBundle rsc =
ResourceBundle.getBundle(InputFeatureStream.class.getName());
-
+
/** Dedicated connection to DBF. */
private DBFConnection connection;
@@ -75,12 +78,12 @@ public class InputFeatureStream extends
/** Database file. */
private File databaseFile;
-
+
/** Shapefile index. */
private File shapefileIndex;
-
+
/** Indicates that the shape file has a valid index provided with it. */
- private boolean hasShapefileIndex;
+ private boolean hasShapefileIndex;
/** Type of the features contained in this shapefile. */
private DefaultFeatureType featuresType;
@@ -102,17 +105,17 @@ public class InputFeatureStream extends
public InputFeatureStream(File shpfile, File dbaseFile, File shpfileIndex,
String sqlStatement) throws InvalidDbaseFileFormatException,
InvalidShapefileFormatException, ShapefileNotFoundException,
DbaseFileNotFoundException {
try {
this.connection = (DBFConnection)new
DBFDriver().connect(dbaseFile.getAbsolutePath(), null);
-
+
if (sqlStatement == null) {
this.sql = MessageFormat.format("SELECT * FROM {0}",
dbaseFile.getName());
}
else {
this.sql = sqlStatement;
}
-
+
this.shapefile = shpfile;
this.databaseFile = dbaseFile;
-
+
if (shpfileIndex != null && (shpfileIndex.exists() &&
shpfileIndex.isFile())) {
this.shapefileIndex = shpfileIndex;
this.hasShapefileIndex = true;
@@ -120,10 +123,10 @@ public class InputFeatureStream extends
else {
this.hasShapefileIndex = false;
}
-
+
this.shapefileReader = new ShapefileByteReader(this.shapefile,
this.databaseFile, this.shapefileIndex);
this.featuresType = this.shapefileReader.getFeaturesType();
-
+
try {
executeQuery();
}
@@ -149,7 +152,7 @@ public class InputFeatureStream extends
throw new ShapefileNotFoundException(ex.getMessage(), ex);
}
}
-
+
/**
* Create an input stream of features over a connection, responding to a
SELECT * FROM DBF statement.
* @param shpfile Shapefile.
@@ -176,7 +179,7 @@ public class InputFeatureStream extends
public InputFeatureStream(File shpfile, File dbaseFile) throws
InvalidDbaseFileFormatException, InvalidShapefileFormatException,
ShapefileNotFoundException, DbaseFileNotFoundException {
this(shpfile, dbaseFile, null);
}
-
+
/**
* @see java.io.InputStream#read()
*/
@@ -228,7 +231,7 @@ public class InputFeatureStream extends
throw new DataStoreQueryException(e.getMessage(), e);
}
}
-
+
/**
* Return the features type.
* @return Features type.
@@ -236,7 +239,7 @@ public class InputFeatureStream extends
public DefaultFeatureType getFeaturesType() {
return this.featuresType;
}
-
+
/**
* Returns the shapefile descriptor.
* @return Shapefile descriptor.
@@ -244,15 +247,15 @@ public class InputFeatureStream extends
public ShapefileDescriptor getShapefileDescriptor() {
return this.shapefileReader.getShapefileDescriptor();
}
-
- /**
+
+ /**
* Returns the database fields descriptors.
- * @return List of fields descriptors.
+ * @return List of fields descriptors.
*/
public List<DBase3FieldDescriptor> getDatabaseFieldsDescriptors() {
return this.shapefileReader.getFieldsDescriptors();
}
-
+
/**
* Checks if the shapefile has an index provided with it.
* @return true if an index file (.shx) has been given with the shapefile.
@@ -260,7 +263,7 @@ public class InputFeatureStream extends
public boolean hasShapefileIndex() {
return this.hasShapefileIndex;
}
-
+
/**
* Read next feature responding to the SQL query.
* @return Feature, null if no more feature is available.
@@ -282,24 +285,24 @@ public class InputFeatureStream extends
}
int previousRecordNumber = this.rs.getRowNum();
-
+
if (this.rs.next() == false) {
this.endOfFile = true;
return null;
}
-
+
int currentRecordNumber = this.rs.getRowNum();
-
+
// On the shapefile, only jump in another place if a direct access
is needed.
boolean directAccesRequired = currentRecordNumber !=
(previousRecordNumber + 1);
-
+
if (directAccesRequired) {
try {
if (LOGGER.isLoggable(Level.FINER)) {
MessageFormat format = new
MessageFormat(this.rsc.getString("log.shapefile_reading_with_direct_access"));
LOGGER.finer(format.format(new Object[]
{previousRecordNumber, currentRecordNumber}));
}
-
+
this.shapefileReader.setRowNum(currentRecordNumber);
}
catch(SQLInvalidRecordNumberForDirectAccessException e) {
@@ -313,7 +316,7 @@ public class InputFeatureStream extends
LOGGER.finer(format.format(new Object[]
{previousRecordNumber, currentRecordNumber}));
}
}
-
+
Feature feature = this.featuresType.newInstance();
this.shapefileReader.completeFeature(feature);
DBFDatabaseMetaData metadata =
(DBFDatabaseMetaData)this.connection.getMetaData();
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -4,6 +4,10 @@ import org.apache.sis.storage.DataStoreE
/**
* Thrown when the DBF file format seems to be invalid.
+ *
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Marc LE BIHAN
* @version 0.6
* @since 0.6
@@ -12,7 +16,7 @@ import org.apache.sis.storage.DataStoreE
public class InvalidDbaseFileFormatException extends DataStoreException {
/** Serial ID. */
private static final long serialVersionUID = 7152705402305259568L;
-
+
/**
* Construct an exception.
* @param message Message of the exception.
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidShapefileFormatException.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidShapefileFormatException.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidShapefileFormatException.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidShapefileFormatException.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -21,6 +21,9 @@ import org.apache.sis.storage.DataStoreE
/**
* Thrown when the Shapefile format seems to be invalid.
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Marc Le Bihan
* @version 0.5
* @since 0.5
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -27,6 +27,9 @@ import org.apache.sis.internal.shapefile
/**
* Provides a ShapeFile Reader.
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Travis L. Pinney
* @version 0.5
*
@@ -42,7 +45,7 @@ public class ShapeFile {
/** Database file. */
private File databaseFile;
-
+
/** Shapefile index, if any. */
private File shapeFileIndex;
@@ -51,10 +54,10 @@ public class ShapeFile {
/** Shapefile descriptor. */
private ShapefileDescriptor shapefileDescriptor;
-
+
/** Database field descriptors. */
private List<DBase3FieldDescriptor> databaseFieldsDescriptors;
-
+
/**
* Construct a Shapefile from a file.
* @param shpfile file to read.
@@ -66,29 +69,29 @@ public class ShapeFile {
// Deduct database file name by suffixing it by dbf (trying to respect
the same case).
StringBuilder dbfFileName = new StringBuilder(shpfile);
-
+
String dbfSuffix = null;
dbfSuffix = shpfile.endsWith("shp") ? "dbf" : dbfSuffix;
dbfSuffix = shpfile.endsWith("SHP") ? "DBF" : dbfSuffix;
dbfSuffix = shpfile.endsWith("Shp") ? "Dbf" : dbfSuffix;
dbfSuffix = (dbfSuffix == null) ? "dbf" : dbfSuffix;
-
+
dbfFileName.replace(shpfile.length() - 3, shpfile.length(), dbfSuffix);
this.databaseFile = new File(dbfFileName.toString());
-
+
// Deduct shapefile index file name by suffixing it by shx (trying to
respect the same case).
StringBuilder shapeFileIndexName = new StringBuilder(shpfile);
-
+
String shapeFileIndexSuffix = null;
shapeFileIndexSuffix = shpfile.endsWith("shp") ? "shx" :
shapeFileIndexSuffix;
shapeFileIndexSuffix = shpfile.endsWith("SHP") ? "SHX" :
shapeFileIndexSuffix;
shapeFileIndexSuffix = shpfile.endsWith("Shp") ? "Shx" :
shapeFileIndexSuffix;
shapeFileIndexSuffix = (shapeFileIndexSuffix == null) ? "shx" :
shapeFileIndexSuffix;
-
+
shapeFileIndexName.replace(shpfile.length() - 3, shpfile.length(),
shapeFileIndexSuffix);
- this.shapeFileIndex = new File(shapeFileIndexName.toString());
+ this.shapeFileIndex = new File(shapeFileIndexName.toString());
}
-
+
/**
* Construct a Shapefile from a file.
* @param shpfile file to read.
@@ -97,11 +100,11 @@ public class ShapeFile {
public ShapeFile(String shpfile, String dbasefile) {
Objects.requireNonNull(shpfile, "The shapefile to load cannot be
null.");
Objects.requireNonNull(dbasefile, "The DBase III file to load cannot
be null.");
-
+
this.shapeFile = new File(shpfile);
this.databaseFile = new File(dbasefile);
}
-
+
/**
* Construct a Shapefile from a file.
* @param shpfile file to read.
@@ -120,7 +123,7 @@ public class ShapeFile {
public DefaultFeatureType getFeaturesType() {
return this.featuresType;
}
-
+
/**
* Returns the shapefile descriptor.
* @return Shapefile descriptor.
@@ -128,10 +131,10 @@ public class ShapeFile {
public ShapefileDescriptor getShapefileDescriptor() {
return this.shapefileDescriptor;
}
-
- /**
+
+ /**
* Returns the database fields descriptors.
- * @return List of fields descriptors.
+ * @return List of fields descriptors.
*/
public List<DBase3FieldDescriptor> getDatabaseFieldsDescriptors() {
return this.databaseFieldsDescriptors;
@@ -144,15 +147,15 @@ public class ShapeFile {
public File getFileDatabase() {
return this.databaseFile;
}
-
+
/**
- * Returns the shape file designed by this shapefile object.
+ * Returns the shape file designed by this shapefile object.
* @return Shape file.
*/
public File getFileShapefile() {
return this.shapeFile;
}
-
+
/**
* Return the shapefile Index provided with the shapefile, if any.
* @return Shapefile Index file or null if none given.
@@ -160,7 +163,7 @@ public class ShapeFile {
public File getFileShapefileIndex() {
return this.shapeFileIndex;
}
-
+
/**
* Find features corresponding to an SQL request SELECT * FROM database.
* @return Features
@@ -172,7 +175,7 @@ public class ShapeFile {
public InputFeatureStream findAll() throws
InvalidDbaseFileFormatException, ShapefileNotFoundException,
DbaseFileNotFoundException, InvalidShapefileFormatException {
return find(null);
}
-
+
/**
* Find features corresponding to an SQL request SELECT * FROM database.
* @param sqlStatement SQL Statement to run, if null, will default to
SELECT * FROM database.
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeTypeEnum.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeTypeEnum.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeTypeEnum.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeTypeEnum.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -24,6 +24,9 @@ import java.util.Map;
/**
* Provides a ShapefileType Enumeration
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Travis L. Pinney
* @version 0.5
*
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapefileNotFoundException.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapefileNotFoundException.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapefileNotFoundException.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapefileNotFoundException.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -22,6 +22,9 @@ import org.apache.sis.storage.DataStoreE
/**
* Thrown when a shapefile has not been found.
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Marc Le Bihan
* @version 0.6
* @since 0.6
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/package-info.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/package-info.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/package-info.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/package-info.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -18,6 +18,9 @@
/**
* Shapefile.
*
+ * <div class="warning">This is an experimental package,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Travis L. Pinney
* @author Marc Le Bihan
* @version 0.5
Copied:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresDialect.java
(from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresDialect.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresDialect.java?p2=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresDialect.java&p1=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresDialect.java&r1=1831432&r2=1831433&rev=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresDialect.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresDialect.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.sql.postgres;
+package org.apache.sis.internal.sql.postgres;
import java.sql.Connection;
import java.sql.ResultSet;
Copied:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStore.java
(from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresStore.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStore.java?p2=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStore.java&p1=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresStore.java&r1=1831432&r2=1831433&rev=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresStore.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStore.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.sql.postgres;
+package org.apache.sis.internal.sql.postgres;
import org.opengis.metadata.Metadata;
import org.opengis.parameter.ParameterValueGroup;
-import org.apache.sis.sql.SQLStore;
-import org.apache.sis.sql.SQLQuery;
+import org.apache.sis.storage.sql.SQLStore;
+import org.apache.sis.storage.sql.SQLQuery;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.event.ChangeEvent;
import org.apache.sis.storage.event.ChangeListener;
Copied:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStoreProvider.java
(from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresStoreProvider.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStoreProvider.java?p2=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStoreProvider.java&p1=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresStoreProvider.java&r1=1831432&r2=1831433&rev=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/postgres/PostgresStoreProvider.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStoreProvider.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.sql.postgres;
+package org.apache.sis.internal.sql.postgres;
-import org.apache.sis.sql.SQLStoreProvider;
+import org.apache.sis.storage.sql.SQLStoreProvider;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.ProbeResult;
Modified:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/DataBaseModel.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/DataBaseModel.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/DataBaseModel.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/DataBaseModel.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -48,7 +48,7 @@ import org.apache.sis.internal.feature.G
import org.apache.sis.internal.sql.Dialect;
import org.apache.sis.internal.sql.SingleAttributeTypeBuilder;
import org.apache.sis.internal.sql.reverse.MetaDataConstants.*;
-import org.apache.sis.sql.SQLStore;
+import org.apache.sis.storage.sql.SQLStore;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.FeatureNaming;
Modified:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/QueryFeatureSet.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/QueryFeatureSet.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/QueryFeatureSet.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/QueryFeatureSet.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -21,8 +21,8 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.stream.Stream;
-import org.apache.sis.sql.SQLQuery;
-import org.apache.sis.sql.SQLStore;
+import org.apache.sis.storage.sql.SQLQuery;
+import org.apache.sis.storage.sql.SQLStore;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.FeatureSet;
import org.apache.sis.storage.event.ChangeEvent;
Copied:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLQuery.java
(from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLQuery.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLQuery.java?p2=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLQuery.java&p1=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLQuery.java&r1=1831432&r2=1831433&rev=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLQuery.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLQuery.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.sql;
+package org.apache.sis.storage.sql;
import org.apache.sis.storage.Query;
import org.apache.sis.util.ArgumentChecks;
@@ -24,6 +24,9 @@ import org.apache.sis.util.ArgumentCheck
* An SQL query executed directly on the database.
* Such query should be transfered to the JDBC without or with minimum
modifications.
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Johann Sorel (Geomatys)
* @version 1.0
* @since 1.0
Copied:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java
(from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLStore.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java?p2=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java&p1=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLStore.java&r1=1831432&r2=1831433&rev=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLStore.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.sql;
+package org.apache.sis.storage.sql;
import javax.sql.DataSource;
import org.apache.sis.storage.DataStore;
@@ -26,6 +26,9 @@ import org.apache.sis.storage.StorageCon
/**
* Parent store class for {@code DataStore} implementations using JDBC backend.
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Johann Sorel (Geomatys)
* @version 1.0
* @since 1.0
Copied:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java
(from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLStoreProvider.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java?p2=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java&p1=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLStoreProvider.java&r1=1831432&r2=1831433&rev=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/SQLStoreProvider.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStoreProvider.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.sql;
+package org.apache.sis.storage.sql;
import org.apache.sis.storage.DataStoreProvider;
@@ -22,6 +22,9 @@ import org.apache.sis.storage.DataStoreP
/**
* Provider of {@code SQLStore} instances.
*
+ * <div class="warning">This is an experimental class,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Johann Sorel (Geomatys)
* @version 1.0
* @since 1.0
Copied:
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java
(from r1831432,
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/package-info.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java?p2=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java&p1=sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/package-info.java&r1=1831432&r2=1831433&rev=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/sql/package-info.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -19,9 +19,12 @@
/**
* Data stores that create features from a JDBC connection to a database.
*
+ * <div class="warning">This is an experimental package,
+ * not yet target for any Apache SIS release at this time.</div>
+ *
* @author Johann Sorel (Geomatys)
* @version 1.0
* @since 1.0
* @module
*/
-package org.apache.sis.sql;
+package org.apache.sis.storage.sql;
Modified:
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -20,6 +20,8 @@ package org.apache.sis.index.tree;
* Enum to represent node type of quad tree. Black means node contains data.
* White means node is empty. Gray means node is parent.
*
+ * <div class="warning"><b>Note on future work:</b> this enumeration may
change in incompatible way
+ * in a future Apache SIS release, or may be replaced by new API.</div>
*/
public enum NodeType {
BLACK, WHITE, GRAY
Modified:
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -32,6 +32,8 @@ import org.apache.sis.distance.LatLonPoi
* design of quad tree index in H. Samet, The Design and Analysis of Spatial
* Data Structures. Massachusetts: Addison Wesley Publishing Company, 1989.
*
+ * <div class="warning"><b>Note on future work:</b> this class may change in
incompatible way
+ * in a future Apache SIS release, or may be replaced by new API.</div>
*/
public class QuadTree {
Modified:
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -24,6 +24,8 @@ import org.apache.sis.geometry.DirectPos
* quad tree must implement this interface, so that quad tree can access
* location and store name of file in which data is saved.
*
+ * <div class="warning"><b>Note on future work:</b> this interface may change
in incompatible way
+ * in a future Apache SIS release, or may be replaced by new API.</div>
*/
public interface QuadTreeData {
/**
Modified:
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java?rev=1831433&r1=1831432&r2=1831433&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.index.tree;
-//JDK imports
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -25,6 +24,8 @@ import java.io.IOException;
/**
* Class to save the quad tree index from file.
*
+ * <div class="warning"><b>Note on future work:</b> this class may change in
incompatible way
+ * in a future Apache SIS release, or may be replaced by new API.</div>
*/
public final class QuadTreeWriter {
private QuadTreeWriter() {
Added:
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/package-info.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/package-info.java?rev=1831433&view=auto
==============================================================================
---
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/package-info.java
(added)
+++
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/package-info.java
[UTF-8] Fri May 11 16:40:41 2018
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A simple quadtree implementation.
+ *
+ * <div class="warning"><b>Note on future work:</b> this package may change in
incompatible way
+ * in a future Apache SIS release, or may be replaced by new API.</div>
+ */
+package org.apache.sis.index.tree;
Propchange:
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain;charset=UTF-8
