You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/09/30 13:06:28 UTC
svn commit: r1810200 - in /sis/branches/JDK8:
application/sis-console/src/main/java/org/apache/sis/console/
core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/
core/sis-metadata...
Author: desruisseaux
Date: Sat Sep 30 13:06:27 2017
New Revision: 1810200
URL: http://svn.apache.org/viewvc?rev=1810200&view=rev
Log:
Move some code out of sis-utility module. The intend is to have a smaller JAR file for those who want only units of measurement support.
In this commit the size change is very small, but we reduce XML dependency in order to move XML support to sis-metadata in a future commit.
Added:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Fallback.java
- copied, changed from r1810199, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Fallback.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/LazySet.java
- copied, changed from r1810199, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/LazySynchronizedIterator.java
- copied, changed from r1810199, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySynchronizedIterator.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java
- copied, changed from r1810199, sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/LazySetTest.java
Removed:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Fallback.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySynchronizedIterator.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/LazySetTest.java
Modified:
sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Providers.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AuthorityFactories.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java
sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
Modified: sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java [UTF-8] (original)
+++ sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -35,7 +35,7 @@ import java.sql.Connection;
import org.apache.sis.internal.system.DataDirectory;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.internal.util.X364;
-import org.apache.sis.internal.util.Fallback;
+import org.apache.sis.internal.referencing.Fallback;
import org.apache.sis.setup.InstallationResources;
import static org.apache.sis.internal.util.Constants.EPSG;
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -167,7 +167,7 @@ public final class NameMeaning extends S
* new name for that organization).
*/
final Citation c = Citations.fromName(key);
- codeSpace = org.apache.sis.internal.util.Citations.getCodeSpace(c);
+ codeSpace = Citations.getCodeSpace(c);
if (AUTHORITIES.get(codeSpace) == null) {
return null; // Not an authority that we recognize for the OGC namespace.
}
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -23,7 +23,7 @@ import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.opengis.util.InternationalString;
import org.apache.sis.metadata.TitleProperty;
-import org.apache.sis.internal.util.Citations;
+import org.apache.sis.metadata.iso.citation.Citations;
/**
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -314,7 +314,7 @@ public class ImmutableIdentifier extends
*/
value = properties.get(CODESPACE_KEY);
if (value == null) {
- codeSpace = org.apache.sis.internal.util.Citations.getCodeSpace(authority);
+ codeSpace = Citations.getCodeSpace(authority);
} else if (value instanceof String) {
codeSpace = trimWhitespaces((String) value);
} else {
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -692,4 +692,25 @@ public final class Citations extends Sta
public static String getUnicodeIdentifier(final Citation citation) {
return org.apache.sis.internal.util.Citations.getUnicodeIdentifier(citation);
}
+
+ /**
+ * Infers a code space from the given citation, or returns {@code null} if none.
+ * This method is very close to {@link #getUnicodeIdentifier(Citation)}, except that it looks for
+ * {@link IdentifierSpace#getName()} before to scan the identifiers and titles. The result should
+ * be the same in most cases, except some cases like the {@link org.apache.sis.metadata.iso.citation.Citations}
+ * constant for {@code "Proj.4"} in which case this method returns {@code "Proj4"} instead of {@code null}.
+ *
+ * @param citation the citation for which to infer the code space, or {@code null}.
+ * @return a non-empty code space for the given citation without leading or trailing whitespaces,
+ * or {@code null} if the given citation is null or does not have any Unicode identifier or title.
+ *
+ * @since 0.8
+ */
+ public static String getCodeSpace(final Citation citation) {
+ if (citation instanceof IdentifierSpace<?>) {
+ return ((IdentifierSpace<?>) citation).getName();
+ } else {
+ return getUnicodeIdentifier(citation);
+ }
+ }
}
Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -22,7 +22,9 @@ import java.lang.reflect.Field;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.apache.sis.internal.simple.CitationConstant;
+import org.apache.sis.internal.simple.SimpleCitation;
import org.apache.sis.internal.util.Constants;
+import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
@@ -131,27 +133,63 @@ public final strictfp class CitationsTes
}
/**
- * Tests {@link org.apache.sis.internal.util.Citations#getCodeSpace(Citation)} on the constants
- * declared in the {@link Citations} class.
+ * Tests {@link Citations#getCodeSpace(Citation)} with some ignorable characters.
+ * Ignorable character used in this test are:
+ *
+ * <ul>
+ * <li>200B: zero width space</li>
+ * <li>2060: word joiner</li>
+ * </ul>
*/
@Test
- @DependsOnMethod("testGetUnicodeIdentifier")
+ @DependsOnMethod("testGetIdentifier")
public void testGetCodeSpace() {
- assertEquals("SIS", org.apache.sis.internal.util.Citations.getCodeSpace(SIS));
- assertEquals("OGC", org.apache.sis.internal.util.Citations.getCodeSpace(WMS));
- assertEquals("OGC", org.apache.sis.internal.util.Citations.getCodeSpace(OGC));
- assertEquals("IOGP", org.apache.sis.internal.util.Citations.getCodeSpace(IOGP));
- assertEquals("EPSG", org.apache.sis.internal.util.Citations.getCodeSpace(EPSG));
- assertEquals("ESRI", org.apache.sis.internal.util.Citations.getCodeSpace(ESRI));
- assertEquals("NetCDF", org.apache.sis.internal.util.Citations.getCodeSpace(NETCDF));
- assertEquals("GeoTIFF", org.apache.sis.internal.util.Citations.getCodeSpace(GEOTIFF));
- assertEquals("MapInfo", org.apache.sis.internal.util.Citations.getCodeSpace(MAP_INFO));
- assertEquals("ISBN", org.apache.sis.internal.util.Citations.getCodeSpace(ISBN));
- assertEquals("ISSN", org.apache.sis.internal.util.Citations.getCodeSpace(ISSN));
- assertEquals("Proj4", org.apache.sis.internal.util.Citations.getCodeSpace(PROJ4));
- assertEquals("S57", org.apache.sis.internal.util.Citations.getCodeSpace(S57));
- assertNull ("ISO_19115-1", org.apache.sis.internal.util.Citations.getCodeSpace(ISO_19115.get(0)));
- assertNull ("ISO_19115-2", org.apache.sis.internal.util.Citations.getCodeSpace(ISO_19115.get(1)));
+ final SimpleCitation citation = new SimpleCitation(" Valid\u2060Id\u200Bentifier ");
+ assertEquals("ValidIdentifier", Citations.getCodeSpace(citation));
+
+ assertNull("Shall not be taken as a valid identifier.",
+ Citations.getCodeSpace(new SimpleCitation("Proj.4")));
+ assertEquals("Shall fallback on the the identifier space name.",
+ "TheProj4Space", Citations.getCodeSpace(new Proj4()));
+ }
+
+ /**
+ * A citation which is also an {@link IdentifierSpace}, for {@link #testGetCodeSpace()} purpose.
+ */
+ @SuppressWarnings("serial")
+ private static final class Proj4 extends SimpleCitation implements IdentifierSpace<Integer> {
+ Proj4() {
+ super("Proj.4");
+ }
+
+ @Override
+ public String getName() {
+ return "TheProj4Space"; // Intentionally a very different name than "Proj4".
+ }
+ }
+
+ /**
+ * Tests {@link Citations#getCodeSpace(Citation)} on the constants
+ * declared in the {@link Citations} class.
+ */
+ @Test
+ @DependsOnMethod({"testGetUnicodeIdentifier", "testGetIdentifier"})
+ public void testGetConstantCodeSpace() {
+ assertEquals("SIS", Citations.getCodeSpace(SIS));
+ assertEquals("OGC", Citations.getCodeSpace(WMS));
+ assertEquals("OGC", Citations.getCodeSpace(OGC));
+ assertEquals("IOGP", Citations.getCodeSpace(IOGP));
+ assertEquals("EPSG", Citations.getCodeSpace(EPSG));
+ assertEquals("ESRI", Citations.getCodeSpace(ESRI));
+ assertEquals("NetCDF", Citations.getCodeSpace(NETCDF));
+ assertEquals("GeoTIFF", Citations.getCodeSpace(GEOTIFF));
+ assertEquals("MapInfo", Citations.getCodeSpace(MAP_INFO));
+ assertEquals("ISBN", Citations.getCodeSpace(ISBN));
+ assertEquals("ISSN", Citations.getCodeSpace(ISSN));
+ assertEquals("Proj4", Citations.getCodeSpace(PROJ4));
+ assertEquals("S57", Citations.getCodeSpace(S57));
+ assertNull ("ISO_19115-1", Citations.getCodeSpace(ISO_19115.get(0)));
+ assertNull ("ISO_19115-2", Citations.getCodeSpace(ISO_19115.get(1)));
}
/**
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -27,7 +27,7 @@ import org.apache.sis.internal.metadata.
import org.apache.sis.referencing.NamedIdentifier;
import org.apache.sis.metadata.iso.citation.Citations;
-import static org.apache.sis.internal.util.Citations.getCodeSpace;
+import static org.apache.sis.metadata.iso.citation.Citations.getCodeSpace;
/**
Copied: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Fallback.java (from r1810199, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Fallback.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Fallback.java?p2=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Fallback.java&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Fallback.java&r1=1810199&r2=1810200&rev=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Fallback.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Fallback.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.util;
+package org.apache.sis.internal.referencing;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Copied: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/LazySet.java (from r1810199, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/LazySet.java?p2=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/LazySet.java&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java&r1=1810199&r2=1810200&rev=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/LazySet.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.util;
+package org.apache.sis.internal.referencing;
import java.util.List;
import java.util.Arrays;
@@ -23,6 +23,8 @@ import java.util.Iterator;
import java.util.ServiceLoader;
import java.util.NoSuchElementException;
import org.apache.sis.internal.system.DefaultFactories;
+import org.apache.sis.internal.util.SetOfUnknownSize;
+import org.apache.sis.internal.util.UnmodifiableArrayList;
/**
@@ -37,7 +39,7 @@ import org.apache.sis.internal.system.De
*
* <p>Some usages for this class are to prepend some values before the elements given by the source {@code Iterable},
* or to replace some values when they are loaded. It may also be used for creating filtered sets when used together
- * with {@link CollectionsExt#filter CollectionsExt.filter(…)}.</p>
+ * with {@link org.apache.sis.internal.util.CollectionsExt#filter CollectionsExt.filter(…)}.</p>
*
* <p>This class is not thread-safe. Synchronization, if desired, shall be done by the caller.</p>
*
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Providers.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Providers.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Providers.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Providers.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -18,7 +18,7 @@ package org.apache.sis.internal.referenc
import java.util.List;
import org.opengis.referencing.operation.OperationMethod;
-import org.apache.sis.internal.util.LazySet;
+import org.apache.sis.internal.referencing.LazySet;
/**
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AuthorityFactories.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AuthorityFactories.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AuthorityFactories.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AuthorityFactories.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -27,7 +27,7 @@ import org.opengis.referencing.cs.CSAuth
import org.opengis.referencing.crs.CRSAuthorityFactory;
import org.opengis.referencing.datum.DatumAuthorityFactory;
import org.opengis.referencing.operation.CoordinateOperationAuthorityFactory;
-import org.apache.sis.internal.util.LazySet;
+import org.apache.sis.internal.referencing.LazySet;
import org.apache.sis.internal.system.Loggers;
import org.apache.sis.internal.system.Modules;
import org.apache.sis.internal.system.SystemListener;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -32,7 +32,7 @@ import org.opengis.metadata.citation.Cit
import org.opengis.referencing.IdentifiedObject;
import org.apache.sis.metadata.iso.ImmutableIdentifier;
import org.apache.sis.internal.system.DefaultFactories;
-import org.apache.sis.internal.util.Citations;
+import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.internal.referencing.DeprecatedCode;
import org.apache.sis.internal.referencing.DeprecatedName;
import org.apache.sis.util.iso.Types;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -39,8 +39,8 @@ import org.apache.sis.metadata.iso.citat
import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
import org.apache.sis.internal.referencing.provider.TransverseMercator;
import org.apache.sis.internal.referencing.Resources;
+import org.apache.sis.internal.referencing.Fallback;
import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Fallback;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.iso.DefaultNameSpace;
import org.apache.sis.util.CharSequences;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -35,7 +35,7 @@ import org.opengis.metadata.Identifier;
import org.opengis.parameter.InvalidParameterValueException;
import org.apache.sis.internal.metadata.NameToIdentifier;
import org.apache.sis.internal.system.DefaultFactories;
-import org.apache.sis.internal.util.Citations;
+import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.metadata.iso.ImmutableIdentifier;
import org.apache.sis.util.ArgumentChecks;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -34,9 +34,9 @@ import org.apache.sis.referencing.Identi
import org.apache.sis.util.iso.Types;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.internal.util.Citations;
import org.apache.sis.internal.metadata.NameToIdentifier;
import org.apache.sis.internal.metadata.MetadataUtilities;
+import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.io.wkt.ElementKind;
import org.apache.sis.io.wkt.Formatter;
@@ -427,7 +427,7 @@ public class AbstractDatum extends Abstr
* and parameters. We extend this rule to datum as well.
*/
final Datum that = (Datum) object;
- final Boolean match = Citations.hasCommonIdentifier(getIdentifiers(), that.getIdentifiers());
+ final Boolean match = org.apache.sis.internal.util.Citations.hasCommonIdentifier(getIdentifiers(), that.getIdentifiers());
if (match != null) {
return match;
}
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -138,7 +138,7 @@ public abstract class GeodeticAuthorityF
* @return the namespaces recognized by this factory, or an empty set if none.
*/
public Set<String> getCodeSpaces() {
- final String authority = Citations.getCodeSpace(getAuthority());
+ final String authority = org.apache.sis.metadata.iso.citation.Citations.getCodeSpace(getAuthority());
return (authority != null) ? Collections.singleton(authority) : Collections.emptySet();
}
Copied: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/LazySynchronizedIterator.java (from r1810199, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySynchronizedIterator.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/LazySynchronizedIterator.java?p2=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/LazySynchronizedIterator.java&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySynchronizedIterator.java&r1=1810199&r2=1810200&rev=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySynchronizedIterator.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/LazySynchronizedIterator.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.util;
+package org.apache.sis.referencing.factory;
import java.util.Iterator;
+import org.apache.sis.internal.util.AbstractIterator;
/**
@@ -36,7 +37,7 @@ import java.util.Iterator;
* @since 0.7
* @module
*/
-public final class LazySynchronizedIterator<E> extends AbstractIterator<E> {
+final class LazySynchronizedIterator<E> extends AbstractIterator<E> {
/**
* The providers of iterators. This array shall not be modified by {@code LazySynchronizedSetIterator},
* since this is a direct reference to the array given to the constructor (not a copy).
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -46,13 +46,12 @@ import org.opengis.util.FactoryException
import org.opengis.util.InternationalString;
import org.apache.sis.internal.system.Loggers;
import org.apache.sis.internal.util.AbstractIterator;
-import org.apache.sis.internal.util.Citations;
import org.apache.sis.internal.util.DefinitionURI;
import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.LazySet;
-import org.apache.sis.internal.util.LazySynchronizedIterator;
import org.apache.sis.internal.util.SetOfUnknownSize;
+import org.apache.sis.internal.referencing.LazySet;
import org.apache.sis.internal.referencing.Resources;
+import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.ArgumentChecks;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -31,7 +31,7 @@ import org.apache.sis.internal.metadata.
import org.apache.sis.internal.metadata.sql.SQLUtilities;
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.util.Fallback;
+import org.apache.sis.internal.referencing.Fallback;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.resources.Messages;
import org.apache.sis.util.logging.PerformanceLevel;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -42,7 +42,7 @@ import org.apache.sis.internal.metadata.
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.internal.util.CollectionsExt;
import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.LazySet;
+import org.apache.sis.internal.referencing.LazySet;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
import org.apache.sis.referencing.operation.transform.AbstractMathTransform;
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -53,7 +53,7 @@ import org.opengis.util.FactoryException
import org.opengis.util.NoSuchIdentifierException;
import org.apache.sis.io.wkt.Parser;
-import org.apache.sis.internal.util.LazySet;
+import org.apache.sis.internal.referencing.LazySet;
import org.apache.sis.internal.util.Constants;
import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.internal.metadata.ReferencingServices;
Copied: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java (from r1810199, sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/LazySetTest.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java?p2=sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java&p1=sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/LazySetTest.java&r1=1810199&r2=1810200&rev=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/LazySetTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/LazySetTest.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.util;
+package org.apache.sis.internal.referencing;
import java.util.Arrays;
import java.util.Iterator;
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -125,7 +125,7 @@ public final strictfp class CommonAuthor
assertTrue (Citations.identifierMatches(authority, "WMS"));
assertFalse(Citations.identifierMatches(authority, "OGP"));
assertFalse(Citations.identifierMatches(authority, "EPSG"));
- assertEquals(Constants.OGC, org.apache.sis.internal.util.Citations.getCodeSpace(authority));
+ assertEquals(Constants.OGC, Citations.getCodeSpace(authority));
}
/**
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -31,6 +31,7 @@ import org.junit.BeforeClass;
*/
@Suite.SuiteClasses({
org.apache.sis.internal.metadata.AxisDirectionsTest.class,
+ org.apache.sis.internal.referencing.LazySetTest.class,
org.apache.sis.internal.referencing.FormulasTest.class,
org.apache.sis.internal.referencing.j2d.ShapeUtilitiesTest.class,
org.apache.sis.internal.referencing.PositionalAccuracyConstantTest.class,
Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/Citations.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -345,7 +345,8 @@ public final class Citations extends Sta
* <ul>
* <li>For information purpose (e.g. some {@code toString()} methods), use {@code getIdentifier(…, false)}.</li>
* <li>For WKT formatting, use {@code getIdentifier(…, true)} in order to preserve formatting characters.</li>
- * <li>For assigning a value to a {@code codeSpace} field, use {@link #getUnicodeIdentifier(Citation)}.</li>
+ * <li>For assigning a value to a {@code codeSpace} field, use
+ * {@link org.apache.sis.metadata.iso.citation.Citations#getUnicodeIdentifier(Citation)}.</li>
* </ul>
*
* @param citation the citation for which to get the identifier, or {@code null}.
@@ -467,6 +468,9 @@ public final class Citations extends Sta
* or {@code null} if the given citation is null or does not have any Unicode identifier or title.
*
* @since 0.6
+ *
+ * @deprecated Implementation will be moved to {@link org.apache.sis.metadata.iso.citation.Citations}
+ * after we moved the {@code sis-utility} code that use this method.
*/
public static String getUnicodeIdentifier(final Citation citation) {
final String identifier = getIdentifier(citation, true);
@@ -529,6 +533,9 @@ public final class Citations extends Sta
* or {@code null} if the given citation is null or does not have any Unicode identifier or title.
*
* @since 0.6
+ *
+ * @deprecated Implementation will be moved to {@link org.apache.sis.metadata.iso.citation.Citations}
+ * after we moved the {@code sis-utility} code that use this method.
*/
public static String getCodeSpace(final Citation citation) {
if (citation instanceof IdentifierSpace<?>) {
Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -128,4 +128,4 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import org.apache.sis.xml.Namespaces;
-import org.apache.sis.internal.jaxb.gco.*;
+import org.apache.sis.internal.jaxb.gco.GO_GenericName;
Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -23,8 +23,6 @@ import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.apache.sis.internal.simple.SimpleCitation;
import org.apache.sis.internal.simple.SimpleIdentifier;
-import org.apache.sis.xml.IdentifierSpace;
-import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
@@ -114,40 +112,4 @@ public final strictfp class CitationsTes
assertEquals("OGC:06-042", Citations.getIdentifier(citation, false));
assertEquals("ISO_19128", Citations.getIdentifier(citation, true));
}
-
- /**
- * Tests {@link Citations#getCodeSpace(Citation)} with some ignorable characters.
- * Ignorable character used in this test are:
- *
- * <ul>
- * <li>200B: zero width space</li>
- * <li>2060: word joiner</li>
- * </ul>
- */
- @Test
- @DependsOnMethod("testGetIdentifier")
- public void testGetCodeSpace() {
- final SimpleCitation citation = new SimpleCitation(" Valid\u2060Id\u200Bentifier ");
- assertEquals("ValidIdentifier", Citations.getCodeSpace(citation));
-
- assertNull("Shall not be taken as a valid identifier.",
- Citations.getCodeSpace(new SimpleCitation("Proj.4")));
- assertEquals("Shall fallback on the the identifier space name.",
- "TheProj4Space", Citations.getCodeSpace(new Proj4()));
- }
-
- /**
- * A citation which is also an {@link IdentifierSpace}, for {@link #testGetCodeSpace()} purpose.
- */
- @SuppressWarnings("serial")
- private static final class Proj4 extends SimpleCitation implements IdentifierSpace<Integer> {
- Proj4() {
- super("Proj.4");
- }
-
- @Override
- public String getName() {
- return "TheProj4Space"; // Intentionally a very different name than "Proj4".
- }
- }
}
Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -83,7 +83,6 @@ import org.junit.BeforeClass;
org.apache.sis.util.collection.CodeListSetTest.class,
org.apache.sis.internal.util.CollectionsExtTest.class,
org.apache.sis.internal.util.AbstractMapTest.class,
- org.apache.sis.internal.util.LazySetTest.class,
// GeoAPI most basic types.
org.apache.sis.internal.util.DefinitionURITest.class,
Modified: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -52,7 +52,7 @@ import org.apache.sis.internal.metadata.
import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.internal.system.Modules;
import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.LazySet;
+import org.apache.sis.internal.referencing.LazySet;
import org.apache.sis.util.iso.SimpleInternationalString;
import org.apache.sis.util.collection.WeakValueHashMap;
import org.apache.sis.util.resources.Vocabulary;
Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java?rev=1810200&r1=1810199&r2=1810200&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java [UTF-8] Sat Sep 30 13:06:27 2017
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.ServiceLoader;
import org.apache.sis.internal.storage.Resources;
import org.apache.sis.internal.system.DefaultFactories;
-import org.apache.sis.internal.util.LazySet;
+import org.apache.sis.internal.referencing.LazySet;
import org.apache.sis.util.ArgumentChecks;