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 2013/05/09 13:38:53 UTC
svn commit: r1480595 [1/2] - in /sis/trunk: ./
ide-project/NetBeans/nbproject/
sis-metadata/src/main/java/org/apache/sis/internal/metadata/
sis-metadata/src/main/java/org/apache/sis/metadata/
sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-...
Author: desruisseaux
Date: Thu May 9 11:38:52 2013
New Revision: 1480595
URL: http://svn.apache.org/r1480595
Log:
Merge from the JDK6 branch.
Added:
sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/LoggingWatcher.java
- copied, changed from r1480591, sis/branches/JDK6/sis-metadata/src/test/java/org/apache/sis/metadata/iso/LoggingWatcher.java
sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/
- copied from r1480591, sis/branches/JDK6/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/
sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/
- copied from r1480591, sis/branches/JDK6/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/
sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/
- copied from r1480591, sis/branches/JDK6/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
- copied unchanged from r1480591, sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
sis/trunk/storage/ (props changed)
- copied from r1480591, sis/branches/JDK6/storage/
Removed:
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/MarshalContext.java
Modified:
sis/trunk/ (props changed)
sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml
sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties
sis/trunk/ide-project/NetBeans/nbproject/project.properties
sis/trunk/ide-project/NetBeans/nbproject/project.xml
sis/trunk/pom.xml
sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java
sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
sis/trunk/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
sis/trunk/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocaleAdapter.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/Classes.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerFactory.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
sis/trunk/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java
sis/trunk/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java
sis/trunk/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
sis/trunk/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
sis/trunk/storage/pom.xml
sis/trunk/storage/sis-netcdf/ (props changed)
sis/trunk/storage/sis-netcdf/pom.xml
Propchange: sis/trunk/
------------------------------------------------------------------------------
Merged /sis/branches/JDK7:r1479499-1480590
Merged /sis/branches/JDK6:r1479502-1480591
Modified: sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml Thu May 9 11:38:52 2013
@@ -135,6 +135,7 @@ is divided into following sections:
</condition>
<condition property="have.tests">
<or>
+ <available file="${test.netcdf.dir}"/>
<available file="${test.referencing.dir}"/>
<available file="${test.metadata.dir}"/>
<available file="${test.utility.dir}"/>
@@ -145,6 +146,7 @@ is divided into following sections:
<available file="${src.local-src.dir}"/>
<available file="${src.webapp.dir}"/>
<available file="${src.app.dir}"/>
+ <available file="${src.netcdf.dir}"/>
<available file="${src.referencing.dir}"/>
<available file="${src.metadata.dir}"/>
<available file="${src.utility.dir}"/>
@@ -238,9 +240,11 @@ is divided into following sections:
<fail unless="src.local-src.dir">Must set src.local-src.dir</fail>
<fail unless="src.webapp.dir">Must set src.webapp.dir</fail>
<fail unless="src.app.dir">Must set src.app.dir</fail>
+ <fail unless="src.netcdf.dir">Must set src.netcdf.dir</fail>
<fail unless="src.referencing.dir">Must set src.referencing.dir</fail>
<fail unless="src.metadata.dir">Must set src.metadata.dir</fail>
<fail unless="src.utility.dir">Must set src.utility.dir</fail>
+ <fail unless="test.netcdf.dir">Must set test.netcdf.dir</fail>
<fail unless="test.referencing.dir">Must set test.referencing.dir</fail>
<fail unless="test.metadata.dir">Must set test.metadata.dir</fail>
<fail unless="test.utility.dir">Must set test.utility.dir</fail>
@@ -264,7 +268,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -304,7 +308,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -336,7 +340,7 @@ is divided into following sections:
</target>
<target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
<macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -423,6 +427,9 @@ is divided into following sections:
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
+ <fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -461,6 +468,9 @@ is divided into following sections:
<isset property="test.method"/>
</condition>
<union id="test.set">
+ <fileset dir="${test.netcdf.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.referencing.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -579,6 +589,9 @@ is divided into following sections:
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
+ <fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -952,7 +965,7 @@ is divided into following sections:
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${build.generated.subdirs}"/>
</target>
<target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
<j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
@@ -960,6 +973,7 @@ is divided into following sections:
<fileset dir="${src.local-src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.app.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+ <fileset dir="${src.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.utility.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -983,7 +997,7 @@ is divided into following sections:
<target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
<j2seproject3:force-recompile/>
- <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"/>
+ <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1253,6 +1267,9 @@ is divided into following sections:
<fileset dir="${src.app.dir}" excludes="*.java,${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
+ <fileset dir="${src.netcdf.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
<fileset dir="${src.referencing.dir}" excludes="*.java,${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
@@ -1278,6 +1295,9 @@ is divided into following sections:
<fileset dir="${src.app.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
+ <fileset dir="${src.netcdf.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/doc-files/**"/>
+ </fileset>
<fileset dir="${src.referencing.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
@@ -1309,11 +1329,12 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. -->
</target>
<target if="do.depend.true" name="-compile-test-depend">
- <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
+ <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
</target>
<target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
- <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
+ <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
<copy todir="${build.test.classes.dir}">
+ <fileset dir="${test.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.utility.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1331,8 +1352,9 @@ is divided into following sections:
<target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
<j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
- <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}" srcdir="${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
+ <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}" srcdir="${test.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
<copy todir="${build.test.classes.dir}">
+ <fileset dir="${test.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.utility.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
Modified: sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Thu May 9 11:38:52 2013
@@ -3,6 +3,6 @@
build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=af14ca0b
-nbproject/build-impl.xml.script.CRC32=d26a4b87
+nbproject/build-impl.xml.data.CRC32=08945aac
+nbproject/build-impl.xml.script.CRC32=3e302f66
nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
Modified: sis/trunk/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/project.properties?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Thu May 9 11:38:52 2013
@@ -7,7 +7,6 @@ application.vendor = Apache
application.homepage = http://sis.apache.org/
application.desc = Apache SIS is a toolkit for describing location information, including points, bounding boxes, polygons, and for computing distances on that information.
-file.reference.site-resources=../../../JDK6/sis-metadata/src/site/resources
#
# Some global configuration.
#
@@ -29,6 +28,8 @@ project.root = ../..
src.local-src.dir = ../local-src
src.webapp.dir = ${project.root}/sis-webapp/src/main/java
src.app.dir = ${project.root}/sis-app/src/main/java
+src.netcdf.dir = ${project.root}/storage/sis-netcdf/src/main/java
+test.netcdf.dir = ${project.root}/storage/sis-netcdf/src/test/java
src.referencing.dir = ${project.root}/sis-referencing/src/main/java
test.referencing.dir = ${project.root}/sis-referencing/src/test/java
src.metadata.dir = ${project.root}/sis-metadata/src/main/java
@@ -51,6 +52,7 @@ jdom.version = 1.0
jee.version = 6.0
jcip.version = 1.0
osgi.version = 5.0.0
+netcdf.version = 4.3.16
junit.version = 4.10
#
@@ -69,6 +71,7 @@ javac.classpath=\
${maven.repository}/jdom/jdom/${jdom.version}/jdom-${jdom.version}.jar:\
${maven.repository}/javax/javaee-api/${jee.version}/javaee-api-${jee.version}.jar:\
${maven.repository}/net/jcip/jcip-annotations/${jcip.version}/jcip-annotations-${jcip.version}.jar:\
+ ${maven.repository}/edu/ucar/netcdf/${netcdf.version}/netcdf-${netcdf.version}.jar:\
${maven.repository}/org/osgi/org.osgi.core/${osgi.version}/org.osgi.core-${osgi.version}.jar
javac.processorpath=\
${javac.classpath}
Modified: sis/trunk/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/project.xml?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/project.xml Thu May 9 11:38:52 2013
@@ -8,11 +8,13 @@
<root id="src.local-src.dir" name="Local sources (unversioned)"/>
<root id="src.webapp.dir" name="Web application"/>
<root id="src.app.dir" name="Application"/>
+ <root id="src.netcdf.dir" name="NetCDF"/>
<root id="src.referencing.dir" name="Referencing"/>
<root id="src.metadata.dir" name="Metadata"/>
<root id="src.utility.dir" name="Utility"/>
</source-roots>
<test-roots>
+ <root id="test.netcdf.dir" name="NetCDF tests"/>
<root id="test.referencing.dir" name="Referencing tests"/>
<root id="test.metadata.dir" name="Metadata tests"/>
<root id="test.utility.dir" name="Utility tests"/>
Modified: sis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/pom.xml (original)
+++ sis/trunk/pom.xml Thu May 9 11:38:52 2013
@@ -253,6 +253,16 @@ Apache SIS is a toolkit for describing l
</roles>
</contributor>
<contributor>
+ <name>Johann Sorel</name>
+ <email>johann.sorel@geomatys.com</email>
+ <organization>Geomatys</organization>
+ <organizationUrl>http://www.geomatys.com/</organizationUrl>
+ <timezone>+1</timezone>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </contributor>
+ <contributor>
<name>Kevan Miller</name>
<roles>
<role>mentor</role>
@@ -334,6 +344,12 @@ Apache SIS is a toolkit for describing l
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>netcdf</artifactId>
+ <version>${netcdf.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -358,6 +374,7 @@ Apache SIS is a toolkit for describing l
=================================================================== -->
<properties>
<geoapi.version>3.0.0</geoapi.version>
+ <netcdf.version>4.3.16</netcdf.version>
<findbugs.version>2.5.2</findbugs.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<website.encoding>UTF-8</website.encoding>
@@ -681,6 +698,7 @@ Apache SIS is a toolkit for describing l
<module>sis-utility</module>
<module>sis-metadata</module>
<module>sis-referencing</module>
+ <module>storage</module>
<module>sis-webapp</module>
<module>sis-app</module>
</modules>
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java [UTF-8] Thu May 9 11:38:52 2013
@@ -17,10 +17,15 @@
package org.apache.sis.internal.metadata;
import java.util.Date;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
import org.apache.sis.util.Static;
import org.apache.sis.util.resources.Errors;
+import org.apache.sis.util.resources.Messages;
import org.apache.sis.metadata.InvalidMetadataException;
+import static org.apache.sis.metadata.iso.ISOMetadata.LOGGER;
+
// Related to JDK7
import org.apache.sis.internal.jdk7.Objects;
@@ -117,4 +122,21 @@ public final class MetadataUtilities ext
}
return value;
}
+
+ /**
+ * Convenience method for logging a warning to the {@code ISOMetadata} logger.
+ * The message will be produced using the {@link Messages} resources bundle.
+ *
+ * @param caller The public class which is invoking this method.
+ * @param method The public method which is invoking this method.
+ * @param key The key from the message resource bundle to use for creating a message.
+ * @param arguments The arguments to be used together with the key for building the message.
+ */
+ public static void warning(final Class<?> caller, final String method, final int key, final Object... arguments) {
+ final LogRecord record = Messages.getResources(null).getLogRecord(Level.WARNING, key, arguments);
+ record.setSourceClassName(caller.getCanonicalName());
+ record.setSourceMethodName(method);
+ record.setLoggerName(LOGGER.getName());
+ LOGGER.log(record);
+ }
}
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] Thu May 9 11:38:52 2013
@@ -209,9 +209,9 @@ public abstract class AbstractMetadata i
* {@code "alternateTitle"} collection contains two elements, then there is a node with index 0
* for the first element and an other node with index 1 for the second element.</p>
*
- * <p>The {@code (IDENTIFIER, INDEX)} pair can be used as a primary key for uniquely identifying
- * a node in a list of children. Note that the uniqueness is guaranteed only for the children of
- * a given node; the same keys may appear in the children of any other nodes.</p></li>
+ * {@note The <code>(IDENTIFIER, INDEX)</code> pair can be used as a primary key for uniquely identifying
+ * a node in a list of children. That uniqueness is guaranteed only for the children of a given
+ * node; the same keys may appear in the children of any other nodes.}</li>
*
* <li><p>{@link org.apache.sis.util.collection.TableColumn#NAME}<br>
* A human-readable name for the node, derived from the identifier and the index.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Thu May 9 11:38:52 2013
@@ -641,9 +641,9 @@ public class MetadataStandard implements
* {@code "alternateTitle"} collection contains two elements, then there is a node with index 0
* for the first element and an other node with index 1 for the second element.</p>
*
- * <p>The {@code (IDENTIFIER, INDEX)} pair can be used as a primary key for uniquely identifying
- * a node in a list of children. Note that the uniqueness is guaranteed only for the children of
- * a given node; the same keys may appear in the children of any other nodes.</p></li>
+ * {@note The <code>(IDENTIFIER, INDEX)</code> pair can be used as a primary key for uniquely identifying
+ * a node in a list of children. That uniqueness is guaranteed only for the children of a given
+ * node; the same keys may appear in the children of any other nodes.}</li>
*
* <li><p>{@link org.apache.sis.util.collection.TableColumn#NAME}<br>
* A human-readable name for the node, derived from the identifier and the index.
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] Thu May 9 11:38:52 2013
@@ -29,7 +29,7 @@ import org.apache.sis.internal.util.Chec
import org.apache.sis.internal.util.CheckedArrayList;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-import static org.apache.sis.internal.jaxb.MarshalContext.isMarshalling;
+import static org.apache.sis.internal.jaxb.Context.isMarshalling;
/**
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] Thu May 9 11:38:52 2013
@@ -41,8 +41,8 @@ import org.opengis.metadata.maintenance.
import org.opengis.metadata.quality.DataQuality;
import org.opengis.metadata.spatial.SpatialRepresentation;
import org.opengis.referencing.ReferenceSystem;
-import org.apache.sis.internal.jaxb.MarshalContext;
//import org.apache.sis.internal.jaxb.gmd.PT_Locale; // TODO
+import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.xml.Namespaces;
import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
@@ -774,7 +774,7 @@ public class DefaultMetadata extends ISO
* This method sets the locale to be used for XML marshalling to the metadata language.
*/
private void beforeMarshal(final Marshaller marshaller) {
- MarshalContext.push(language);
+ Context.push(language);
}
/**
@@ -782,6 +782,6 @@ public class DefaultMetadata extends ISO
* XML. This method restores the locale to be used for XML marshalling to its previous value.
*/
private void afterMarshal(final Marshaller marshaller) {
- MarshalContext.pull();
+ Context.pull();
}
}
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] Thu May 9 11:38:52 2013
@@ -17,6 +17,7 @@
package org.apache.sis.metadata.iso;
import java.util.Collection;
+import java.util.logging.Logger;
import java.io.Serializable;
import net.jcip.annotations.ThreadSafe;
import org.opengis.metadata.Identifier;
@@ -25,6 +26,7 @@ import org.apache.sis.xml.IdentifiedObje
import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.metadata.ModifiableMetadata;
import org.apache.sis.internal.jaxb.IdentifierMapWithSpecialCases;
+import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.ArgumentChecks;
@@ -45,6 +47,14 @@ public class ISOMetadata extends Modifia
private static final long serialVersionUID = -4997239501383133209L;
/**
+ * The logger for warnings emitted by any class in the {@code org.apache.sis.metadata.iso.*} packages.
+ * Warnings are emitted when an action causes the lost of data. For example the {@code "distance"} and
+ * {@code "equivalentScale"} properties in {@link org.apache.sis.metadata.iso.identification.DefaultResolution}
+ * are mutually exclusive: setting one discards the other. In such case, a warning is logged.
+ */
+ public static final Logger LOGGER = Logging.getLogger(ISOMetadata.class);
+
+ /**
* All identifiers associated with this metadata, or {@code null} if none.
* This field is initialized to a non-null value when first needed.
*/
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java [UTF-8] Thu May 9 11:38:52 2013
@@ -25,6 +25,8 @@ import org.opengis.metadata.identificati
// import org.apache.sis.internal.jaxb.gco.GO_Distance; // TODO
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.measure.ValueRange;
+import org.apache.sis.util.resources.Messages;
+import org.apache.sis.internal.metadata.MetadataUtilities;
/**
@@ -122,6 +124,14 @@ public class DefaultResolution extends I
}
/**
+ * Invoked when setting a property discards the other one.
+ */
+ private static void warning(final String method, final String oldName, final String newName) {
+ MetadataUtilities.warning(DefaultResolution.class, method,
+ Messages.Keys.DiscardedExclusiveProperty_2, oldName, newName);
+ }
+
+ /**
* Returns the level of detail expressed as the scale of a comparable hardcopy map or chart.
* Only one of {@linkplain #getEquivalentScale() equivalent scale} and
* {@linkplain #getDistance() ground sample distance} may be provided.
@@ -143,9 +153,13 @@ public class DefaultResolution extends I
*/
public void setEquivalentScale(final RepresentativeFraction newValue) {
checkWritePermission();
- if (newValue != null || !isDistance()) {
- scaleOrDistance = newValue;
+ if (isDistance()) {
+ if (newValue == null) {
+ return; // Do not erase the other property.
+ }
+ warning("setEquivalentScale", "distance", "equivalentScale");
}
+ scaleOrDistance = newValue;
}
/**
@@ -168,8 +182,12 @@ public class DefaultResolution extends I
*/
public void setDistance(final Double newValue) {
checkWritePermission();
- if (newValue != null || isDistance()) {
- scaleOrDistance = newValue;
+ if (scaleOrDistance != null && !isDistance()) {
+ if (newValue == null) {
+ return; // Do not erase the other property.
+ }
+ warning("setDistance", "equivalentScale", "distance");
}
+ scaleOrDistance = newValue;
}
}
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] Thu May 9 11:38:52 2013
@@ -25,9 +25,11 @@ import org.opengis.feature.type.FeatureT
import org.opengis.metadata.maintenance.ScopeDescription;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.internal.metadata.ExcludedSet;
+import org.apache.sis.internal.metadata.MetadataUtilities;
import org.apache.sis.util.collection.CheckedContainer;
+import org.apache.sis.util.resources.Messages;
-import static org.apache.sis.internal.jaxb.MarshalContext.isMarshalling;
+import static org.apache.sis.internal.jaxb.Context.isMarshalling;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
@@ -38,8 +40,6 @@ import static org.apache.sis.util.collec
* ISO 19115 defines {@code ScopeDescription} as an <cite>union</cite> (in the C/C++ sense):
* only one of the properties in this class can be set to a non-empty value.
* Setting any property to a non-empty value discard all the other ones.
- * See the {@linkplain #DefaultScopeDescription(ScopeDescription) constructor javadoc}
- * for information about which property has precedence on copy operations.
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
@@ -78,6 +78,18 @@ public class DefaultScopeDescription ext
};
/**
+ * The names of the setter methods, for logging purpose only.
+ */
+ private static final String[] SETTERS = {
+ "setAttributes",
+ "setFeatures",
+ "setFeatureInstances",
+ "setAttributeInstances",
+ "setDataset",
+ "setOther"
+ };
+
+ /**
* Specifies which property is set, or 0 if none.
*/
private byte property;
@@ -211,6 +223,9 @@ public class DefaultScopeDescription ext
/**
* Sets the properties identified by the {@code code} argument, if non-null and non-empty.
* This discards any other properties.
+ *
+ * @param caller The caller method, for logging purpose.
+ * @param code The property which is going to be set.
*/
private <E> void setProperty(final Set<? extends E> newValue, final Class<E> type, final byte code) {
Set<E> c = null;
@@ -219,12 +234,25 @@ public class DefaultScopeDescription ext
} else if (isNullOrEmpty(newValue)) {
return;
} else {
+ warningOnOverwrite(code);
property = code;
}
value = writeSet(newValue, c, type);
}
/**
+ * Sends a warning if setting the value for the given property would overwrite an existing property.
+ *
+ * @param code The property which is going to be set.
+ */
+ private void warningOnOverwrite(final byte code) {
+ if (value != null && property != code) {
+ MetadataUtilities.warning(DefaultScopeDescription.class, SETTERS[code-1],
+ Messages.Keys.DiscardedExclusiveProperty_2, NAMES[property-1], NAMES[code-1]);
+ }
+ }
+
+ /**
* Returns the attributes to which the information applies.
*
* {@section Conditions}
@@ -345,6 +373,7 @@ public class DefaultScopeDescription ext
public void setDataset(final String newValue) {
checkWritePermission();
if (newValue != null || property == DATASET) {
+ warningOnOverwrite(DATASET);
property = DATASET;
value = newValue;
}
@@ -373,6 +402,7 @@ public class DefaultScopeDescription ext
public void setOther(final String newValue) {
checkWritePermission();
if (newValue != null || property == OTHER) {
+ warningOnOverwrite(OTHER);
property = OTHER;
value = newValue;
}
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] Thu May 9 11:38:52 2013
@@ -42,7 +42,7 @@ import org.apache.sis.util.collection.Ch
import org.apache.sis.util.resources.Errors;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-import static org.apache.sis.internal.jaxb.MarshalContext.isMarshalling;
+import static org.apache.sis.internal.jaxb.Context.isMarshalling;
/**
Modified: sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java [UTF-8] Thu May 9 11:38:52 2013
@@ -27,6 +27,8 @@ import org.opengis.metadata.spatial.Geor
import org.opengis.metadata.spatial.PixelOrientation;
import org.opengis.geometry.primitive.Point;
import org.opengis.util.InternationalString;
+import org.apache.sis.internal.metadata.MetadataUtilities;
+import org.apache.sis.util.resources.Messages;
import org.apache.sis.xml.Namespaces;
@@ -185,8 +187,9 @@ public class DefaultGeorectified extends
* accuracy of the georeferenced grid data.
*
* {@section Effect on other properties}
- * If and only if the given {@code newValue} is {@code false}, then this method automatically sets
- * the {@linkplain #setCheckPointDescription check point description} property to {@code null}.
+ * If and only if the given {@code newValue} is {@code false}, then this method automatically hides
+ * the {@linkplain #setCheckPointDescription check point description} property. The description can
+ * be shown again by reverting {@code checkPointAvailability} to {@code true}.
*
* @param newValue {@code true} if check points are available.
*/
@@ -195,8 +198,11 @@ public class DefaultGeorectified extends
if (newValue) {
booleans |= CHECK_POINT_MASK;
} else {
+ if (checkPointDescription != null && (booleans & CHECK_POINT_MASK) != 0) {
+ MetadataUtilities.warning(DefaultGeorectified.class, "setCheckPointAvailable",
+ Messages.Keys.PropertyHiddenBy_2, "checkPointDescription", "checkPointAvailability");
+ }
booleans &= ~CHECK_POINT_MASK;
- checkPointDescription = null;
}
}
@@ -208,7 +214,7 @@ public class DefaultGeorectified extends
@Override
@XmlElement(name = "checkPointDescription")
public InternationalString getCheckPointDescription() {
- return checkPointDescription;
+ return (booleans & CHECK_POINT_MASK) != 0 ? checkPointDescription : null;
}
/**
Modified: sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/InformationMapTest.java [UTF-8] Thu May 9 11:38:52 2013
@@ -24,6 +24,7 @@ import java.util.Locale;
import org.opengis.metadata.ExtendedElementInformation;
import org.opengis.metadata.acquisition.EnvironmentalRecord;
import org.opengis.metadata.citation.Citation;
+import org.opengis.metadata.content.CoverageDescription;
import org.opengis.metadata.content.ImageDescription;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
Modified: sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java [UTF-8] Thu May 9 11:38:52 2013
@@ -161,7 +161,7 @@ public abstract strictfp class MetadataT
/**
* Validates the given newly constructed metadata. The default implementation ensures that
- * {@link AbstractMetadata.isEmpty()} returns {@code true}.
+ * {@link AbstractMetadata#isEmpty()} returns {@code true}.
*
* @param metadata The metadata to validate.
*/
Modified: sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java [UTF-8] Thu May 9 11:38:52 2013
@@ -197,7 +197,7 @@ public final strictfp class PropertyAcce
}
/**
- * Tests the {@link PropertyAccessor#descriptor(int)} method.
+ * Tests the {@link PropertyAccessor#information(int)} method.
* This method delegates to some {@link PropertyInformationTest} methods.
*/
@Test
Modified: sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] Thu May 9 11:38:52 2013
@@ -25,6 +25,8 @@ import org.apache.sis.metadata.MetadataT
import org.apache.sis.metadata.iso.identification.DefaultRepresentativeFraction;
import org.apache.sis.test.DependsOn;
import org.apache.sis.xml.Namespaces;
+import org.junit.Rule;
+import org.junit.Test;
import static org.junit.Assert.*;
@@ -45,6 +47,14 @@ import static org.junit.Assert.*;
})
public final strictfp class AllMetadataTest extends MetadataTestCase {
/**
+ * A JUnit {@linkplain Rule rule} for listening to log events. This field is public
+ * because JUnit requires us to do so, but should be considered as an implementation
+ * details (it should have been a private field).
+ */
+ @Rule
+ public final LoggingWatcher listener = new LoggingWatcher();
+
+ /**
* Creates a new test case with all GeoAPI interfaces and code lists to test.
*/
public AllMetadataTest() {
@@ -196,6 +206,16 @@ public final strictfp class AllMetadataT
}
/**
+ * Performs the test documente in the {@link MetadataTestCase} javadoc.
+ */
+ @Test
+ @Override
+ public void testPropertyValues() {
+ listener.maximumLogCount = 3;
+ super.testPropertyValues();
+ }
+
+ /**
* Returns the expected namespace for an element defined by the given specification.
* For example the namespace of any type defined by {@link Specification#ISO_19115}
* is {@code "http://www.isotc211.org/2005/gmd"}.
Copied: sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/LoggingWatcher.java (from r1480591, sis/branches/JDK6/sis-metadata/src/test/java/org/apache/sis/metadata/iso/LoggingWatcher.java)
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/LoggingWatcher.java?p2=sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/LoggingWatcher.java&p1=sis/branches/JDK6/sis-metadata/src/test/java/org/apache/sis/metadata/iso/LoggingWatcher.java&r1=1480591&r2=1480595&rev=1480595&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/test/java/org/apache/sis/metadata/iso/LoggingWatcher.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/test/java/org/apache/sis/metadata/iso/LoggingWatcher.java [UTF-8] Thu May 9 11:38:52 2013
@@ -20,8 +20,8 @@ import java.util.logging.Filter;
import java.util.logging.LogRecord;
import java.util.logging.SimpleFormatter;
import org.apache.sis.test.TestCase;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
+import org.junit.rules.TestWatchman;
+import org.junit.runners.model.FrameworkMethod;
import static org.junit.Assert.*;
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
* @version 0.3
* @module
*/
-public strictfp class LoggingWatcher extends TestWatcher implements Filter {
+public strictfp class LoggingWatcher extends TestWatchman implements Filter {
/**
* The maximal number of logs expected by the test. If this value is positive, then it is
* decremented when {@link #isLoggable(LogRecord)} is invoked until the value reach zero.
@@ -66,7 +66,7 @@ public strictfp class LoggingWatcher ext
* @see #isLoggable(LogRecord)
*/
@Override
- protected final void starting(final Description description) {
+ public final void starting(final FrameworkMethod method) {
assertNull(ISOMetadata.LOGGER.getFilter());
ISOMetadata.LOGGER.setFilter(this);
maximumLogCount = 0;
@@ -77,7 +77,7 @@ public strictfp class LoggingWatcher ext
* This method removes the filter which had been set for testing purpose.
*/
@Override
- protected final void finished(final Description description) {
+ public final void finished(final FrameworkMethod method) {
ISOMetadata.LOGGER.setFilter(null);
}
Modified: sis/trunk/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] (original)
+++ sis/trunk/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] Thu May 9 11:38:52 2013
@@ -33,6 +33,9 @@ import org.junit.BeforeClass;
org.apache.sis.internal.metadata.MetadataUtilitiesTest.class,
org.apache.sis.metadata.iso.citation.DefaultCitationDateTest.class,
org.apache.sis.metadata.iso.citation.DefaultCitationTest.class,
+ org.apache.sis.metadata.iso.identification.DefaultResolutionTest.class,
+ org.apache.sis.metadata.iso.spatial.DefaultGeorectifiedTest.class,
+ org.apache.sis.metadata.iso.maintenance.DefaultScopeDescriptionTest.class,
org.apache.sis.metadata.iso.quality.AbstractElementTest.class,
// Classes using Java reflection.
Modified: sis/trunk/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java [UTF-8] (original)
+++ sis/trunk/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java [UTF-8] Thu May 9 11:38:52 2013
@@ -37,7 +37,7 @@ import static org.opengis.test.Validator
@DependsOn(GeneralEnvelopeTest.class)
public final strictfp class EnvelopesTest extends TestCase {
/**
- * Tests {@link Envelopes#fromWKT(String)}. This test is provided as a matter of principle,
+ * Tests {@link Envelopes#fromWKT(CharSequence)}. This test is provided as a matter of principle,
* but the real test is done by {@link GeneralEnvelopeTest#testWktParsing()}.
*
* @throws FactoryException Should never happen.
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java [UTF-8] Thu May 9 11:38:52 2013
@@ -183,7 +183,7 @@ public final class NonMarshalledAuthorit
* @return The identifiers to marshal, or {@code null} if none.
*/
public static Collection<Identifier> excludeOnMarshalling(Collection<Identifier> identifiers) {
- if (identifiers != null && MarshalContext.isMarshalling()) {
+ if (identifiers != null && Context.isMarshalling()) {
int count = identifiers.size();
if (count != 0) {
final Identifier[] copy = identifiers.toArray(new Identifier[count]);
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java [UTF-8] Thu May 9 11:38:52 2013
@@ -21,7 +21,7 @@ import org.opengis.util.InternationalStr
import org.apache.sis.util.CharSequences;
import org.apache.sis.xml.XLink;
import org.apache.sis.xml.ReferenceResolver;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.gmx.Anchor;
import org.apache.sis.internal.jaxb.gmd.PT_FreeText;
@@ -98,7 +98,7 @@ public final class CharSequenceAdapter e
* </gmd:someElement>
*/
if (value instanceof InternationalString) {
- final PT_FreeText ft = PT_FreeText.create(MarshalContext.current(), (InternationalString) value);
+ final PT_FreeText ft = PT_FreeText.create(Context.current(), (InternationalString) value);
if (ft != null) {
return ft;
}
@@ -118,8 +118,8 @@ public final class CharSequenceAdapter e
if (!(value instanceof Anchor)) {
final String key = CharSequences.trimWhitespaces(value.toString());
if (key != null && !key.isEmpty()) {
- final MarshalContext context = MarshalContext.current();
- final XLink linkage = MarshalContext.resolver(context).anchor(context, value, key);
+ final Context context = Context.current();
+ final XLink linkage = Context.resolver(context).anchor(context, value, key);
if (linkage != null) {
if (linkage instanceof Anchor) {
value = (Anchor) linkage;
@@ -157,8 +157,8 @@ public final class CharSequenceAdapter e
return null;
}
CharSequence value = string;
- final MarshalContext context = MarshalContext.current();
- final XLink linkage = MarshalContext.resolver(context).anchor(context, object, string);
+ final Context context = Context.current();
+ final XLink linkage = Context.resolver(context).anchor(context, object, string);
if (linkage != null) {
if (linkage instanceof Anchor) {
value = (Anchor) linkage;
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectReference.java [UTF-8] Thu May 9 11:38:52 2013
@@ -24,7 +24,7 @@ import org.apache.sis.xml.IdentifierSpac
import org.apache.sis.xml.IdentifiedObject;
import org.apache.sis.xml.ReferenceResolver;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.IdentifierMapAdapter;
import org.apache.sis.internal.jaxb.SpecializedIdentifier;
@@ -92,8 +92,8 @@ final class ObjectReference {
* @return The parsed UUID, or {@code null}.
* @throws IllegalArgumentException If {@code anyUUID} can not be parsed.
*/
- static UUID toUUID(final MarshalContext context, final String anyUUID) throws IllegalArgumentException {
- return (anyUUID != null) ? MarshalContext.converter(context).toUUID(context, anyUUID) : null;
+ static UUID toUUID(final Context context, final String anyUUID) throws IllegalArgumentException {
+ return (anyUUID != null) ? Context.converter(context).toUUID(context, anyUUID) : null;
}
/**
@@ -110,12 +110,12 @@ final class ObjectReference {
* @return A metadata object for the identifiers, or {@code null}
* @throws IllegalArgumentException If the {@link #anyUUID} field can not be parsed.
*/
- final <T> T resolve(final MarshalContext context, final Class<T> type, T metadata) throws IllegalArgumentException {
+ final <T> T resolve(final Context context, final Class<T> type, T metadata) throws IllegalArgumentException {
if (uuid == null) {
uuid = toUUID(context, anyUUID);
}
if (metadata == null) {
- final ReferenceResolver resolver = MarshalContext.resolver(context);
+ final ReferenceResolver resolver = Context.resolver(context);
if ((uuid == null || (metadata = resolver.resolve(context, type, uuid )) == null) &&
(xlink == null || (metadata = resolver.resolve(context, type, xlink)) == null))
{
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java [UTF-8] Thu May 9 11:38:52 2013
@@ -28,7 +28,7 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.IdentifierMap;
import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.IdentifiedObject;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.util.iso.SimpleInternationalString;
@@ -150,11 +150,11 @@ public abstract class PropertyType<Value
UUID uuid = map.getSpecialized(IdentifierSpace.UUID);
String anyUUID = (uuid != null) ? uuid.toString() : map.get(IdentifierSpace.UUID);
if (anyUUID != null || link != null) {
- final MarshalContext context = MarshalContext.current();
+ final Context context = Context.current();
if (uuid == null) {
uuid = ObjectReference.toUUID(context, anyUUID); // May still null.
}
- if (uuid == null || MarshalContext.resolver(context).canSubstituteByReference(context, getBoundType(), metadata, uuid)) {
+ if (uuid == null || Context.resolver(context).canSubstituteByReference(context, getBoundType(), metadata, uuid)) {
reference = new ObjectReference(uuid, anyUUID, link);
return;
}
@@ -285,8 +285,8 @@ public abstract class PropertyType<Value
* Parses the given URI, or returns {@code null} if the given argument is null or empty.
*/
private static URI toURI(final String uri) throws URISyntaxException {
- final MarshalContext context = MarshalContext.current();
- return MarshalContext.converter(context).toURI(context, uri);
+ final Context context = Context.current();
+ return Context.converter(context).toURI(context, uri);
}
/**
@@ -499,7 +499,7 @@ public abstract class PropertyType<Value
*/
@Override
public final BoundType unmarshal(final ValueType value) throws URISyntaxException {
- return (value != null) ? value.resolve(MarshalContext.current()) : null;
+ return (value != null) ? value.resolve(Context.current()) : null;
}
/**
@@ -509,7 +509,7 @@ public abstract class PropertyType<Value
* @throws URISyntaxException If a URI can not be parsed.
* @throws IllegalArgumentException If the UUID can not be parsed.
*/
- final BoundType resolve(final MarshalContext context) throws URISyntaxException, IllegalArgumentException {
+ final BoundType resolve(final Context context) throws URISyntaxException, IllegalArgumentException {
final ObjectReference ref = reference(false);
if (ref != null) {
metadata = ref.resolve(context, getBoundType(), metadata);
@@ -517,7 +517,7 @@ public abstract class PropertyType<Value
if (metadata == null) {
final String value = getNilReason();
if (value != null) {
- final NilReason nilReason = MarshalContext.converter(context).toNilReason(context, value);
+ final NilReason nilReason = Context.converter(context).toNilReason(context, value);
if (nilReason != null) {
metadata = nilReason.createNilObject(getBoundType());
}
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java [UTF-8] Thu May 9 11:38:52 2013
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.gco
import java.util.Locale;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.opengis.util.InternationalString;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.internal.jaxb.Context;
/**
@@ -56,7 +56,7 @@ public final class StringAdapter extends
final CharSequence text = value.toCharSequence();
if (text != null) {
if (text instanceof InternationalString) {
- final MarshalContext context = MarshalContext.current();
+ final Context context = Context.current();
if (context != null) {
final Locale locale = context.getLocale();
if (locale != null) {
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java [UTF-8] Thu May 9 11:38:52 2013
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.gco
import java.net.URI;
import java.net.URISyntaxException;
import javax.xml.bind.annotation.adapters.XmlAdapter;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.internal.jaxb.Context;
/**
@@ -51,8 +51,8 @@ public final class URIAdapter extends Xm
public URI unmarshal(final GO_CharacterString value) throws URISyntaxException {
final String text = StringAdapter.toString(value);
if (text != null) {
- final MarshalContext context = MarshalContext.current();
- return MarshalContext.converter(context).toURI(context, text);
+ final Context context = Context.current();
+ return Context.converter(context).toURI(context, text);
}
return null;
}
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java [UTF-8] Thu May 9 11:38:52 2013
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.gmd
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.opengis.util.CodeList;
import org.apache.sis.util.iso.Types;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.internal.jaxb.Context;
/**
@@ -133,7 +133,7 @@ public abstract class CodeListAdapter<Va
return null;
}
return wrap(isEnum() ? new CodeListProxy(Types.getCodeName(value))
- : new CodeListProxy(MarshalContext.current(), value));
+ : new CodeListProxy(Context.current(), value));
}
/**
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java [UTF-8] Thu May 9 11:38:52 2013
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlAttr
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import org.opengis.util.CodeList;
-import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.iso.Types;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.util.logging.Logging;
+import org.apache.sis.internal.jaxb.Context;
/**
@@ -53,8 +53,8 @@ public final class CodeListProxy {
* @param identifier The UML identifier of the code list.
* @return The URL to the given code list in the given schema.
*/
- private static String schema(final MarshalContext context, final String file, final String identifier) {
- return schema(MarshalContext.schema(context, "gmd", "http://schemas.opengis.net/iso/19139/20070417/"),
+ private static String schema(final Context context, final String file, final String identifier) {
+ return schema(Context.schema(context, "gmd", "http://schemas.opengis.net/iso/19139/20070417/"),
"resources/Codelist", file, identifier);
}
@@ -70,7 +70,7 @@ public final class CodeListProxy {
* </ul>
*
* @param schema The schema, typically as a result of a call to
- * {@link MarshalContext#schema(MarshalContext, String, String)}.
+ * {@link Context#schema(Context, String, String)}.
* @param directory The directory to concatenate, for example {@code "resources/uom"}
* or {@code "resources/Codelist"} (<strong>no trailing {@code '/'}</strong>).
* @param file The XML file, for example {@code "gmxUom.xml"}, {@code "gmxCodelists.xml"}
@@ -149,7 +149,7 @@ public final class CodeListProxy {
* @param codeSpace The 3-letters language code of the {@code value} attribute, or {@code null} if none.
* @param value The value in the language specified by the {@code codeSpace} attribute, or {@code null} if none.
*/
- CodeListProxy(final MarshalContext context, final String catalog,
+ CodeListProxy(final Context context, final String catalog,
final String codeList, final String codeListValue, final String codeSpace, final String value)
{
this.codeList = schema(context, catalog, codeList);
@@ -165,7 +165,7 @@ public final class CodeListProxy {
* @param context The current (un)marshalling context, or {@code null} if none.
* @param code The code list to wrap.
*/
- CodeListProxy(final MarshalContext context, final CodeList<?> code) {
+ CodeListProxy(final Context context, final CodeList<?> code) {
final String classID = Types.getListName(code);
final String fieldID = Types.getCodeName(code);
codeList = schema(context, "gmxCodelists.xml", classID);
@@ -187,7 +187,7 @@ public final class CodeListProxy {
}
}
if (value != null) {
- codeSpace = MarshalContext.converter(context).toLanguageCode(context, locale);
+ codeSpace = Context.converter(context).toLanguageCode(context, locale);
} else {
// Fallback when no value is defined for the code list. Build a value from the
// most descriptive name (excluding the field name), which is usually the UML
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java [UTF-8] Thu May 9 11:38:52 2013
@@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlElem
import org.apache.sis.util.Locales;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.gco.GO_CharacterString;
import org.apache.sis.internal.jaxb.gco.CharSequenceAdapter;
@@ -64,7 +64,7 @@ public final class Country extends GO_Ch
/**
* Builds a {@code <gco:CharacterString>} element.
- * For private use by {@link #create(MarshalContext, Locale)} only.
+ * For private use by {@link #create(Context, Locale)} only.
*/
private Country(final GO_CharacterString code) {
super(code);
@@ -72,14 +72,14 @@ public final class Country extends GO_Ch
/**
* Builds a {@code <Country>} element.
- * For private use by {@link #create(MarshalContext, Locale, CharSequenceAdapter)} only.
+ * For private use by {@link #create(Context, Locale, CharSequenceAdapter)} only.
*
* @param context The current (un)marshalling context, or {@code null} if none.
* @param codeListValue The {@code codeListValue} attribute in the XML element.
* @param codeSpace The 3-letters language code of the {@code value} attribute, or {@code null} if none.
* @param value The value in the language specified by the {@code codeSpace} attribute, or {@code null} if none.
*/
- private Country(final MarshalContext context, final String codeListValue, final String codeSpace, final String value) {
+ private Country(final Context context, final String codeListValue, final String codeSpace, final String value) {
proxy = new CodeListProxy(context, "ML_gmxCodelists.xml", "Country", codeListValue, codeSpace, value);
}
@@ -91,10 +91,10 @@ public final class Country extends GO_Ch
* @return The country to marshal, or {@code null} if the given locale was null
* or if its {@link Locale#getCountry()} attribute is the empty string.
*/
- static Country create(final MarshalContext context, final Locale locale) {
+ static Country create(final Context context, final Locale locale) {
if (locale != null) {
- final String codeListValue = MarshalContext.converter(context).toCountryCode(context, locale);
- if (!codeListValue.isEmpty() && MarshalContext.isFlagSet(context, MarshalContext.SUBSTITUTE_COUNTRY)) {
+ final String codeListValue = Context.converter(context).toCountryCode(context, locale);
+ if (!codeListValue.isEmpty() && Context.isFlagSet(context, Context.SUBSTITUTE_COUNTRY)) {
/*
* Marshal the locale as a <gco:CharacterString> instead than <Country>,
* using the user-supplied anchors if any.
@@ -109,7 +109,7 @@ public final class Country extends GO_Ch
if (context != null) {
final Locale marshalLocale = context.getLocale();
if (marshalLocale != null) {
- codeSpace = MarshalContext.converter(context).toLanguageCode(context, locale);
+ codeSpace = Context.converter(context).toLanguageCode(context, locale);
value = locale.getDisplayCountry(marshalLocale);
if (value.isEmpty()) {
value = null;
@@ -129,7 +129,7 @@ public final class Country extends GO_Ch
* @param value The wrapper for this metadata value.
* @return A locale which represents the metadata value.
*
- * @see LanguageCode#getLocale(MarshalContext, LanguageCode, boolean)
+ * @see LanguageCode#getLocale(Context, LanguageCode, boolean)
*/
static Locale getLocale(final Country value) {
if (value != null) {
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java [UTF-8] Thu May 9 11:38:52 2013
@@ -20,7 +20,7 @@ import java.util.Locale;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.gco.GO_CharacterString;
import org.apache.sis.internal.jaxb.gco.CharSequenceAdapter;
@@ -62,7 +62,7 @@ public final class LanguageCode extends
/**
* Builds a {@code <gco:CharacterString>} element.
- * For private use by {@link #create(MarshalContext, Locale)} only.
+ * For private use by {@link #create(Context, Locale)} only.
*/
private LanguageCode(final GO_CharacterString code) {
super(code);
@@ -70,14 +70,14 @@ public final class LanguageCode extends
/**
* Builds a {@code <LanguageCode>} element.
- * For private use by {@link #create(MarshalContext, Locale)} only.
+ * For private use by {@link #create(Context, Locale)} only.
*
* @param context The current (un)marshalling context, or {@code null} if none.
* @param codeListValue The {@code codeListValue} attribute in the XML element.
* @param codeSpace The 3-letters language code of the {@code value} attribute, or {@code null} if none.
* @param value The value in the language specified by the {@code codeSpace} attribute, or {@code null} if none.
*/
- private LanguageCode(final MarshalContext context, final String codeListValue, final String codeSpace, final String value) {
+ private LanguageCode(final Context context, final String codeListValue, final String codeSpace, final String value) {
proxy = new CodeListProxy(context, "ML_gmxCodelists.xml", "LanguageCode", codeListValue, codeSpace, value);
}
@@ -89,10 +89,10 @@ public final class LanguageCode extends
* @return The language to marshal, or {@code null} if the given locale was null
* or if its {@link Locale#getLanguage()} attribute is the empty string.
*/
- static LanguageCode create(final MarshalContext context, final Locale locale) {
+ static LanguageCode create(final Context context, final Locale locale) {
if (locale != null) {
- final String codeListValue = MarshalContext.converter(context).toLanguageCode(context, locale);
- if (!codeListValue.isEmpty() && MarshalContext.isFlagSet(context, MarshalContext.SUBSTITUTE_LANGUAGE)) {
+ final String codeListValue = Context.converter(context).toLanguageCode(context, locale);
+ if (!codeListValue.isEmpty() && Context.isFlagSet(context, Context.SUBSTITUTE_LANGUAGE)) {
/*
* Marshal the locale as a <gco:CharacterString> instead than <LanguageCode>,
* using the user-supplied anchors if any.
@@ -107,7 +107,7 @@ public final class LanguageCode extends
if (context != null) {
final Locale marshalLocale = context.getLocale();
if (marshalLocale != null) {
- codeSpace = MarshalContext.converter(context).toLanguageCode(context, locale);
+ codeSpace = Context.converter(context).toLanguageCode(context, locale);
value = locale.getDisplayLanguage(marshalLocale);
if (value.isEmpty()) {
value = null;
@@ -132,17 +132,17 @@ public final class LanguageCode extends
*
* @see Country#getLocale(Country)
*/
- static Locale getLocale(final MarshalContext context, final LanguageCode value, final boolean useCharSequence) {
+ static Locale getLocale(final Context context, final LanguageCode value, final boolean useCharSequence) {
if (value != null) {
final CodeListProxy proxy = value.proxy;
if (proxy != null) {
- final Locale locale = MarshalContext.converter(context).toLocale(context, proxy.codeListValue);
+ final Locale locale = Context.converter(context).toLocale(context, proxy.codeListValue);
if (locale != null) {
return locale;
}
}
if (useCharSequence) {
- return MarshalContext.converter(context).toLocale(context, value.toString());
+ return Context.converter(context).toLocale(context, value.toString());
}
}
return null;
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocaleAdapter.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocaleAdapter.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocaleAdapter.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocaleAdapter.java [UTF-8] Thu May 9 11:38:52 2013
@@ -18,8 +18,8 @@ package org.apache.sis.internal.jaxb.gmd
import java.util.Locale;
import javax.xml.bind.annotation.adapters.XmlAdapter;
-import org.apache.sis.internal.jaxb.MarshalContext;
import org.apache.sis.internal.jaxb.gco.StringAdapter;
+import org.apache.sis.internal.jaxb.Context;
/**
@@ -57,13 +57,13 @@ public final class LocaleAdapter extends
*/
@Override
public Locale unmarshal(final LanguageCode value) {
- final MarshalContext context = MarshalContext.current();
+ final Context context = Context.current();
final Locale candidate = LanguageCode.getLocale(context, value, false);
if (candidate != null) {
return candidate;
}
final String text = StringAdapter.toString(value);
- return (text != null) ? MarshalContext.converter(context).toLocale(context, text) : null;
+ return (text != null) ? Context.converter(context).toLocale(context, text) : null;
}
/**
@@ -75,6 +75,6 @@ public final class LocaleAdapter extends
*/
@Override
public LanguageCode marshal(final Locale value) {
- return LanguageCode.create(MarshalContext.current(), value);
+ return LanguageCode.create(Context.current(), value);
}
}
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java [UTF-8] Thu May 9 11:38:52 2013
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.gmd
import java.util.Locale;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.XmlAttribute;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.internal.jaxb.Context;
// Related to JDK7
import org.apache.sis.internal.jdk7.Objects;
@@ -59,7 +59,7 @@ final class LocalisedCharacterString {
/**
* Empty constructor only used by JAXB.
*/
- public LocalisedCharacterString() {
+ LocalisedCharacterString() {
}
/**
@@ -84,8 +84,8 @@ final class LocalisedCharacterString {
if (locale == null) {
return null;
}
- final MarshalContext context = MarshalContext.current();
- return LOCALE.concat(MarshalContext.converter(context).toLanguageCode(context, locale));
+ final Context context = Context.current();
+ return LOCALE.concat(Context.converter(context).toLanguageCode(context, locale));
}
/**
@@ -96,8 +96,8 @@ final class LocalisedCharacterString {
*/
public void setLocale(final String localeId) {
if (localeId != null) {
- final MarshalContext context = MarshalContext.current();
- locale = MarshalContext.converter(context).toLocale(context, localeId.substring(localeId.indexOf('-') + 1));
+ final Context context = Context.current();
+ locale = Context.converter(context).toLocale(context, localeId.substring(localeId.indexOf('-') + 1));
} else {
locale = null;
}
Modified: sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
URL: http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java?rev=1480595&r1=1480594&r2=1480595&view=diff
==============================================================================
--- sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java [UTF-8] (original)
+++ sis/trunk/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java [UTF-8] Thu May 9 11:38:52 2013
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlElem
import javax.xml.bind.annotation.XmlElementWrapper;
import org.opengis.util.InternationalString;
-import org.apache.sis.internal.jaxb.MarshalContext;
+import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.gco.GO_CharacterString;
import org.apache.sis.util.iso.DefaultInternationalString;
import org.apache.sis.util.iso.SimpleInternationalString;
@@ -113,7 +113,7 @@ public final class PT_FreeText extends G
* or {@code null} otherwise.
*/
@SuppressWarnings("fallthrough")
- public static PT_FreeText create(final MarshalContext context, final InternationalString text) {
+ public static PT_FreeText create(final Context context, final InternationalString text) {
if (text instanceof DefaultInternationalString) {
final DefaultInternationalString df = (DefaultInternationalString) text;
final Set<Locale> locales = df.getLocales();