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/06/21 22:49:43 UTC
svn commit: r1495595 - in
/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso:
acquisition/ citation/ identification/ lineage/ maintenance/
Author: desruisseaux
Date: Fri Jun 21 20:49:43 2013
New Revision: 1495595
URL: http://svn.apache.org/r1495595
Log:
Resolve a few "todo" flags.
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java?rev=1495595&r1=1495594&r2=1495595&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java [UTF-8] Fri Jun 21 20:49:43 2013
@@ -115,7 +115,7 @@ public class DefaultEvent extends ISOMet
*/
public DefaultEvent(final Event object) {
super(object);
- identifiers = singleton(object.getIdentifier(), Identifier.class); // TODO
+ identifiers = singleton(object.getIdentifier(), Identifier.class);
trigger = object.getTrigger();
context = object.getContext();
sequence = object.getSequence();
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java?rev=1495595&r1=1495594&r2=1495595&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java [UTF-8] Fri Jun 21 20:49:43 2013
@@ -133,7 +133,7 @@ public class DefaultOperation extends IS
super(object);
description = object.getDescription();
citation = object.getCitation();
- identifiers = singleton(object.getIdentifier(), Identifier.class); // TODO
+ identifiers = singleton(object.getIdentifier(), Identifier.class);
status = object.getStatus();
type = object.getType();
childOperations = copyCollection(object.getChildOperations(), Operation.class);
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java?rev=1495595&r1=1495594&r2=1495595&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java [UTF-8] Fri Jun 21 20:49:43 2013
@@ -91,7 +91,7 @@ public class DefaultPlatform extends ISO
public DefaultPlatform(final Platform object) {
super(object);
citation = object.getCitation();
- identifiers = singleton(object.getIdentifier(), Identifier.class); // TODO
+ identifiers = singleton(object.getIdentifier(), Identifier.class);
description = object.getDescription();
sponsors = copyCollection(object.getSponsors(), ResponsibleParty.class);
instruments = copyCollection(object.getInstruments(), Instrument.class);
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java?rev=1495595&r1=1495594&r2=1495595&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java [UTF-8] Fri Jun 21 20:49:43 2013
@@ -76,7 +76,7 @@ public class DefaultPlatformPass extends
*/
public DefaultPlatformPass(final PlatformPass object) {
super(object);
- identifiers = singleton(object.getIdentifier(), Identifier.class); // TODO
+ identifiers = singleton(object.getIdentifier(), Identifier.class);
extent = object.getExtent();
relatedEvents = copyCollection(object.getRelatedEvents(), Event.class);
}
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java?rev=1495595&r1=1495594&r2=1495595&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java [UTF-8] Fri Jun 21 20:49:43 2013
@@ -116,7 +116,7 @@ public class DefaultRequirement extends
public DefaultRequirement(final Requirement object) {
super(object);
citation = object.getCitation();
- identifiers = singleton(object.getIdentifier(), Identifier.class); // TODO
+ identifiers = singleton(object.getIdentifier(), Identifier.class);
requestors = copyCollection(object.getRequestors(), ResponsibleParty.class);
recipients = copyCollection(object.getRecipients(), ResponsibleParty.class);
priority = object.getPriority();
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java?rev=1495595&r1=1495594&r2=1495595&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] Fri Jun 21 20:49:43 2013
@@ -33,6 +33,7 @@ import org.apache.sis.util.iso.SimpleInt
import org.apache.sis.internal.jaxb.NonMarshalledAuthority;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.xml.IdentifierSpace;
+import org.apache.sis.xml.IdentifierMap;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
@@ -221,8 +222,13 @@ public class DefaultCitation extends ISO
series = object.getSeries();
otherCitationDetails = object.getOtherCitationDetails();
collectiveTitle = object.getCollectiveTitle();
-// TODO ISBN = object.getISBN();
-// TODO ISSN = object.getISSN();
+ final String id1 = object.getISBN();
+ final String id2 = object.getISSN();
+ if (id1 != null || id2 != null) {
+ final IdentifierMap map = super.getIdentifierMap();
+ if (id1 != null) map.putSpecialized(ISBN, id1);
+ if (id2 != null) map.putSpecialized(ISSN, id2);
+ }
}
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java?rev=1495595&r1=1495594&r2=1495595&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java [UTF-8] Fri Jun 21 20:49:43 2013
@@ -46,7 +46,7 @@ import org.apache.sis.util.resources.Mes
* @version 0.3
* @module
*/
-@XmlType(name = "MD_Resolution_Type") // No propOrder for union.
+@XmlType(name = "MD_Resolution_Type") // No need for propOrder since this structure is a union (see javadoc).
@XmlRootElement(name = "MD_Resolution")
public class DefaultResolution extends ISOMetadata implements Resolution {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java?rev=1495595&r1=1495594&r2=1495595&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java [UTF-8] Fri Jun 21 20:49:43 2013
@@ -99,7 +99,7 @@ public class DefaultProcessing extends I
*/
public DefaultProcessing(final Processing object) {
super(object);
- identifiers = singleton(object.getIdentifier(), Identifier.class); // TODO
+ identifiers = singleton(object.getIdentifier(), Identifier.class);
softwareReferences = copyCollection(object.getSoftwareReferences(), Citation.class);
procedureDescription = object.getProcedureDescription();
documentations = copyCollection(object.getDocumentations(), Citation.class);
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java?rev=1495595&r1=1495594&r2=1495595&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] Fri Jun 21 20:49:43 2013
@@ -48,7 +48,7 @@ import static org.apache.sis.util.collec
* @version 0.3
* @module
*/
-@XmlType(name = "MD_ScopeDescription_Type") // No propOrder for union.
+@XmlType(name = "MD_ScopeDescription_Type") // No need for propOrder since this structure is a union (see javadoc).
@XmlRootElement(name = "MD_ScopeDescription")
public class DefaultScopeDescription extends ISOMetadata implements ScopeDescription {
/**