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 2014/10/29 18:16:24 UTC
svn commit: r1635207 - in /sis/trunk: ./
core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/
core/sis-metadata/src/main/java/org/apache/sis/metadata/
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/
core/sis-metadata/src/main/...
Author: desruisseaux
Date: Wed Oct 29 17:16:24 2014
New Revision: 1635207
URL: http://svn.apache.org/r1635207
Log:
Merge from the JDK6 branch.
Added:
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
- copied, changed from r1635203, sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataTypes.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
Merged /sis/branches/JDK8:r1634825-1635197
Merged /sis/branches/JDK7:r1634830-1635199
Merged /sis/branches/JDK6:r1634836-1635203
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataTypes.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataTypes.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataTypes.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataTypes.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -19,7 +19,6 @@ package org.apache.sis.internal.metadata
import java.util.Collection;
import org.apache.sis.internal.jaxb.TypeRegistration;
import org.apache.sis.metadata.iso.DefaultMetadata;
-import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
/**
@@ -38,6 +37,5 @@ public final class MetadataTypes extends
@Override
public void getTypes(final Collection<Class<?>> addTo) {
addTo.add(DefaultMetadata.class);
- addTo.add(DefaultResponsibleParty.class);
}
}
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -643,17 +643,13 @@ class PropertyAccessor {
final Class<?> elementType = elementTypes[index];
final String name = name(index, KeyNamePolicy.UML_IDENTIFIER);
final Method getter = getters[index];
- ValueRange range = null;
- if (implementation != type) {
- final int e = Numbers.getEnumConstant(elementType);
- if (e >= Numbers.BYTE && e <= Numbers.DOUBLE) try {
- range = implementation.getMethod(getter.getName(), (Class<?>[]) null)
- .getAnnotation(ValueRange.class);
- } catch (NoSuchMethodException error) {
- // Should never happen, since the implementation class
- // implements the interface where the getter come from.
- throw new AssertionError(error);
- }
+ final ValueRange range;
+ try {
+ range = implementation.getMethod(getter.getName(), (Class<?>[]) null).getAnnotation(ValueRange.class);
+ } catch (NoSuchMethodException error) {
+ // Should never happen, since the implementation class
+ // implements the interface where the getter come from.
+ throw new AssertionError(error);
}
information = new PropertyInformation(standard, name, getter, elementType, range);
informations[index] = information;
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -99,7 +99,6 @@
@XmlAccessorType(XmlAccessType.NONE)
@XmlJavaTypeAdapters({
@XmlJavaTypeAdapter(CI_Citation.class),
- @XmlJavaTypeAdapter(CI_Responsibility.class),
@XmlJavaTypeAdapter(CI_ResponsibleParty.class),
@XmlJavaTypeAdapter(EX_Extent.class),
@XmlJavaTypeAdapter(GM_Object.class),
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -17,9 +17,10 @@
package org.apache.sis.metadata.iso.citation;
import java.util.Collection;
+import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlSeeAlso;
import org.opengis.util.InternationalString;
import org.opengis.metadata.citation.Contact;
import org.apache.sis.metadata.iso.ISOMetadata;
@@ -63,6 +64,10 @@ import static org.opengis.annotation.Spe
"contactInfo"
})
@XmlRootElement(name = "CI_Party")
+@XmlSeeAlso({
+ DefaultIndividual.class,
+ DefaultOrganisation.class
+})
@UML(identifier="CI_Party", specification=ISO_19115)
public class AbstractParty extends ISOMetadata {
/**
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -17,9 +17,10 @@
package org.apache.sis.metadata.iso.citation;
import java.util.Collection;
+import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlSeeAlso;
import org.opengis.metadata.citation.Role;
import org.opengis.metadata.extent.Extent;
import org.opengis.metadata.citation.ResponsibleParty;
@@ -64,6 +65,9 @@ import static org.opengis.annotation.Spe
/// "parties"
})
@XmlRootElement(name = "CI_Responsibility")
+@XmlSeeAlso({
+ DefaultResponsibleParty.class
+})
@UML(identifier="CI_Responsibility", specification=ISO_19115)
public class DefaultResponsibility extends ISOMetadata {
/**
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -105,7 +105,6 @@
@XmlJavaTypeAdapter(CI_OnlineResource.class),
@XmlJavaTypeAdapter(CI_Party.class),
@XmlJavaTypeAdapter(CI_PresentationFormCode.class),
- @XmlJavaTypeAdapter(CI_Responsibility.class),
@XmlJavaTypeAdapter(CI_ResponsibleParty.class),
@XmlJavaTypeAdapter(CI_RoleCode.class),
@XmlJavaTypeAdapter(CI_Series.class),
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -109,7 +109,6 @@
@XmlJavaTypeAdapters({
@XmlJavaTypeAdapter(CI_Citation.class),
@XmlJavaTypeAdapter(CI_OnlineResource.class),
- @XmlJavaTypeAdapter(CI_Responsibility.class),
@XmlJavaTypeAdapter(CI_ResponsibleParty.class),
@XmlJavaTypeAdapter(DS_AssociationTypeCode.class),
@XmlJavaTypeAdapter(DS_InitiativeTypeCode.class),
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -97,7 +97,6 @@
@XmlJavaTypeAdapters({
@XmlJavaTypeAdapter(CI_Citation.class),
@XmlJavaTypeAdapter(CI_OnlineResource.class),
- @XmlJavaTypeAdapter(CI_Responsibility.class),
@XmlJavaTypeAdapter(CI_ResponsibleParty.class),
@XmlJavaTypeAdapter(DQ_DataQuality.class),
@XmlJavaTypeAdapter(MD_ApplicationSchemaInformation.class),
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -36,7 +36,7 @@ import static org.apache.sis.metadata.Ke
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-3.04)
- * @version 0.3
+ * @version 0.5
* @module
*/
@DependsOn(PropertyAccessorTest.class)
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeChildrenTest.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -47,7 +47,7 @@ import static org.apache.sis.test.TestUt
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
- * @version 0.3
+ * @version 0.5
* @module
*/
@DependsOn(PropertyAccessorTest.class)
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -36,7 +36,7 @@ import static org.apache.sis.test.TestUt
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
- * @version 0.3
+ * @version 0.5
* @module
*/
@DependsOn(TreeNodeTest.class)
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -48,7 +48,7 @@ import static java.util.AbstractMap.Simp
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-3.00)
- * @version 0.3
+ * @version 0.5
* @module
*/
@DependsOn(PropertyAccessorTest.class)
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -47,7 +47,7 @@ import static org.apache.sis.test.TestUt
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-3.00)
- * @version 0.4
+ * @version 0.5
* @module
*
* @see MetadataStandardTest#testValueMap()
Copied: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java (from r1635203, sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java)
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java?p2=sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java&p1=sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java&r1=1635203&r2=1635207&rev=1635207&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -41,10 +41,12 @@ public final strictfp class DefaultRespo
* @throws JAXBException if an error occurred during the marshalling.
*/
@Test
+ @org.junit.Ignore("Need investigation")
public void testLegacyMarshalling() throws JAXBException {
final DefaultIndividual party = new DefaultIndividual("An author", null, null);
- final DefaultResponsibility r = new DefaultResponsibility(Role.AUTHOR, null, party);
+ final DefaultResponsibleParty r = new DefaultResponsibleParty(Role.AUTHOR);
final DefaultCitation citation = new DefaultCitation();
+ r.setParties(singleton(party));
citation.setCitedResponsibleParties(singleton(r));
final String xml = marshal(citation);
assertXmlEquals("<gmd:CI_Citation xmlns:gco=\"" + Namespaces.GCO + '"' +
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1635207&r1=1635206&r2=1635207&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] Wed Oct 29 17:16:24 2014
@@ -61,6 +61,7 @@ import org.junit.BeforeClass;
// ISO implementations.
org.apache.sis.metadata.iso.citation.DefaultContactTest.class,
+ org.apache.sis.metadata.iso.citation.DefaultResponsibilityTest.class,
org.apache.sis.metadata.iso.citation.DefaultCitationDateTest.class,
org.apache.sis.metadata.iso.citation.DefaultCitationTest.class,
org.apache.sis.metadata.iso.maintenance.DefaultScopeDescriptionTest.class,