Author: desruisseaux
Date: Thu Mar 28 16:01:41 2013
New Revision: 1462179
URL: http://svn.apache.org/r1462179
Log:
Convenience internal methods for storing dates in metadata objects.
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -16,6 +16,7 @@
*/
package org.apache.sis.internal.metadata;
+import java.util.Date;
import org.apache.sis.util.Static;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.metadata.InvalidMetadataException;
@@ -37,6 +38,28 @@ public final class MetadataUtilities ext
}
/**
+ * Returns the milliseconds value of the given date, or {@link
Long#MIN_VALUE}
+ * if the date us null.
+ *
+ * @param value The date, or {@code null}.
+ * @return The time in milliseconds, or {@code Long.MIN_VALUE} if none.
+ */
+ public static long toMilliseconds(final Date value) {
+ return (value != null) ? value.getTime() : Long.MIN_VALUE;
+ }
+
+ /**
+ * Returns the given milliseconds time to a date object, or returns null
+ * if the given time is {@link Long#MIN_VALUE}.
+ *
+ * @param value The time in milliseconds.
+ * @return The date for the given milliseconds value, or {@code null}.
+ */
+ public static Date toDate(final long value) {
+ return (value != Long.MIN_VALUE) ? new Date(value) : null;
+ }
+
+ /**
* Makes sure that the given inclusion is non-null, then returns its value.
*
* @param value The {@link
org.opengis.metadata.extent.GeographicBoundingBox#getInclusion()} value.
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -45,6 +45,9 @@ import org.apache.sis.internal.jaxb.Mars
//import org.apache.sis.internal.jaxb.gmd.PT_Locale; // TODO
import org.apache.sis.xml.Namespaces;
+import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
+import static
org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
+
/**
* Root entity which defines metadata about a resource or resources.
@@ -241,7 +244,7 @@ public class DefaultMetadata extends ISO
final Identification identificationInfo)
{
this.contacts = singleton(contact, ResponsibleParty.class);
- this.dateStamp = (dateStamp != null) ? dateStamp.getTime() :
Long.MIN_VALUE;
+ this.dateStamp = toMilliseconds(dateStamp);
this.identificationInfo = singleton(identificationInfo,
Identification.class);
}
@@ -263,7 +266,7 @@ public class DefaultMetadata extends ISO
hierarchyLevels =
copyCollection(object.getHierarchyLevels(), ScopeCode.class);
hierarchyLevelNames =
copyCollection(object.getHierarchyLevelNames(), String.class);
contacts = copyCollection(object.getContacts(),
ResponsibleParty.class);
-// TODO dateStamp = object.getDateStamp();
+ dateStamp = toMilliseconds(object.getDateStamp());
metadataStandardName = object.getMetadataStandardName();
metadataStandardVersion = object.getMetadataStandardVersion();
dataSetUri = object.getDataSetUri();
@@ -473,7 +476,7 @@ public class DefaultMetadata extends ISO
@Override
@XmlElement(name = "dateStamp", required = true)
public synchronized Date getDateStamp() {
- return (dateStamp != Long.MIN_VALUE) ? new Date(dateStamp) :
(Date)null;
+ return toDate(dateStamp);
}
/**
@@ -483,7 +486,7 @@ public class DefaultMetadata extends ISO
*/
public synchronized void setDateStamp(final Date newValue) {
checkWritePermission();
- dateStamp = (newValue != null) ? newValue.getTime() : Long.MIN_VALUE;
+ dateStamp = toMilliseconds(newValue);
}
/**
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -32,6 +32,9 @@ import org.opengis.metadata.acquisition.
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.internal.jaxb.NonMarshalledAuthority;
+import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
+import static
org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
+
/**
* Identification of a significant collection point within an operation.
@@ -116,7 +119,7 @@ public class DefaultEvent extends ISOMet
trigger = object.getTrigger();
context = object.getContext();
sequence = object.getSequence();
-// TODO time = object.getTime();
+ time = toMilliseconds(object.getTime());
expectedObjectives = copyCollection(object.getExpectedObjectives(),
Objective.class);
relatedPass = object.getRelatedPass();
relatedSensors = copyCollection(object.getRelatedSensors(),
Instrument.class);
@@ -230,8 +233,7 @@ public class DefaultEvent extends ISOMet
@Override
@XmlElement(name = "time", required = true)
public synchronized Date getTime() {
- final long date = this.time;
- return (date != Long.MIN_VALUE) ? new Date(date) : null;
+ return toDate(time);
}
/**
@@ -241,7 +243,7 @@ public class DefaultEvent extends ISOMet
*/
public synchronized void setTime(final Date newValue) {
checkWritePermission();
- time = (newValue != null) ? newValue.getTime() : Long.MIN_VALUE;
+ time = toMilliseconds(newValue);
}
/**
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -23,6 +23,9 @@ import javax.xml.bind.annotation.XmlRoot
import org.opengis.metadata.acquisition.RequestedDate;
import org.apache.sis.metadata.iso.ISOMetadata;
+import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
+import static
org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
+
/**
* Range of date validity.
@@ -75,8 +78,8 @@ public class DefaultRequestedDate extend
*/
public DefaultRequestedDate(final RequestedDate object) {
super(object);
-// TODO requestedDateOfCollection = object.getRequestedDateOfCollection();
-// TODO latestAcceptableDate = object.getLatestAcceptableDate();
+ requestedDateOfCollection =
toMilliseconds(object.getRequestedDateOfCollection());
+ latestAcceptableDate =
toMilliseconds(object.getLatestAcceptableDate());
}
/**
@@ -110,8 +113,7 @@ public class DefaultRequestedDate extend
@Override
@XmlElement(name = "requestedDateOfCollection", required = true)
public synchronized Date getRequestedDateOfCollection() {
- final long date = this.requestedDateOfCollection;
- return (date != Long.MIN_VALUE) ? new Date(date) : null;
+ return toDate(requestedDateOfCollection);
}
/**
@@ -121,7 +123,7 @@ public class DefaultRequestedDate extend
*/
public synchronized void setRequestedDateOfCollection(final Date newValue)
{
checkWritePermission();
- requestedDateOfCollection = (newValue != null) ? newValue.getTime() :
Long.MIN_VALUE;
+ requestedDateOfCollection = toMilliseconds(newValue);
}
/**
@@ -130,8 +132,7 @@ public class DefaultRequestedDate extend
@Override
@XmlElement(name = "latestAcceptableDate", required = true)
public synchronized Date getLatestAcceptableDate() {
- final long date = this.latestAcceptableDate;
- return (date != Long.MIN_VALUE) ? new Date(date) : null;
+ return toDate(latestAcceptableDate);
}
/**
@@ -141,6 +142,6 @@ public class DefaultRequestedDate extend
*/
public synchronized void setLatestAcceptableDate(final Date newValue) {
checkWritePermission();
- latestAcceptableDate = (newValue != null) ? newValue.getTime() :
Long.MIN_VALUE;
+ latestAcceptableDate = toMilliseconds(newValue);
}
}
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -31,6 +31,9 @@ import org.opengis.metadata.citation.Res
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.internal.jaxb.NonMarshalledAuthority;
+import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
+import static
org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
+
/**
* Requirement to be satisfied by the planned data acquisition.
@@ -118,7 +121,7 @@ public class DefaultRequirement extends
recipients = copyCollection(object.getRecipients(),
ResponsibleParty.class);
priority = object.getPriority();
requestedDate = object.getRequestedDate();
-// TODO expiryDate = object.getExpiryDate();
+ expiryDate = toMilliseconds(object.getExpiryDate());
satisfiedPlans = copyCollection(object.getSatisfiedPlans(),
Plan.class);
}
@@ -267,8 +270,7 @@ public class DefaultRequirement extends
@Override
@XmlElement(name = "expiryDate", required = true)
public synchronized Date getExpiryDate() {
- final long date = this.expiryDate;
- return (date != Long.MIN_VALUE) ? new Date(date) : null;
+ return toDate(expiryDate);
}
/**
@@ -278,7 +280,7 @@ public class DefaultRequirement extends
*/
public synchronized void setExpiryDate(final Date newValue) {
checkWritePermission();
- expiryDate = (newValue != null) ? newValue.getTime() : Long.MIN_VALUE;
+ expiryDate = toMilliseconds(newValue);
}
/**
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -36,6 +36,8 @@ import org.apache.sis.metadata.iso.ISOMe
import org.apache.sis.xml.IdentifierSpace;
import static org.apache.sis.internal.jaxb.MarshalContext.filterIdentifiers;
+import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
+import static
org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
/**
@@ -213,7 +215,7 @@ public class DefaultCitation extends ISO
alternateTitles = copyCollection(object.getAlternateTitles(),
InternationalString.class);
dates = copyCollection(object.getDates(),
CitationDate.class);
edition = object.getEdition();
-// TODO editionDate = object.getEditionDate();
+ editionDate = toMilliseconds(object.getEditionDate());
identifiers = copyCollection(object.getIdentifiers(),
Identifier.class);
citedResponsibleParties =
copyCollection(object.getCitedResponsibleParties(), ResponsibleParty.class);
presentationForms =
copyCollection(object.getPresentationForms(), PresentationForm.class);
@@ -330,7 +332,7 @@ public class DefaultCitation extends ISO
@Override
@XmlElement(name = "editionDate")
public synchronized Date getEditionDate() {
- return (editionDate != Long.MIN_VALUE) ? new Date(editionDate) : null;
+ return toDate(editionDate);
}
/**
@@ -340,7 +342,7 @@ public class DefaultCitation extends ISO
*/
public synchronized void setEditionDate(final Date newValue) {
checkWritePermission();
- editionDate = (newValue != null) ? newValue.getTime() : Long.MIN_VALUE;
+ editionDate = toMilliseconds(newValue);
}
/**
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -24,6 +24,9 @@ import org.opengis.metadata.citation.Cit
import org.opengis.metadata.citation.DateType;
import org.apache.sis.metadata.iso.ISOMetadata;
+import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
+import static
org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
+
/**
* Reference date and event used to describe it.
@@ -70,7 +73,7 @@ public class DefaultCitationDate extends
* @param dateType The event used for reference date.
*/
public DefaultCitationDate(final Date date, final DateType dateType) {
- this.date = (date != null) ? date.getTime() : Long.MIN_VALUE;
+ this.date = toMilliseconds(date);
this.dateType = dateType;
}
@@ -85,7 +88,7 @@ public class DefaultCitationDate extends
*/
public DefaultCitationDate(final CitationDate object) {
super(object);
-// TODO date = object.getDate();
+ date = toMilliseconds(object.getDate());
dateType = object.getDateType();
}
@@ -120,7 +123,7 @@ public class DefaultCitationDate extends
@Override
@XmlElement(name = "date", required = true)
public synchronized Date getDate() {
- return (date != Long.MIN_VALUE) ? new Date(date) : null;
+ return toDate(date);
}
/**
@@ -130,7 +133,7 @@ public class DefaultCitationDate extends
*/
public synchronized void setDate(final Date newValue) {
checkWritePermission();
- date = (newValue != null) ? newValue.getTime() : Long.MIN_VALUE;
+ date = toMilliseconds(newValue);
}
/**
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -24,6 +24,9 @@ import org.opengis.util.InternationalStr
import org.opengis.metadata.distribution.StandardOrderProcess;
import org.apache.sis.metadata.iso.ISOMetadata;
+import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
+import static
org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
+
/**
* Common ways in which the resource may be obtained or received, and related
instructions
@@ -90,7 +93,7 @@ public class DefaultStandardOrderProcess
public DefaultStandardOrderProcess(final StandardOrderProcess object) {
super(object);
fees = object.getFees();
-// TODO plannedAvailableDateTime = object.getPlannedAvailableDateTime();
+ plannedAvailableDateTime =
toMilliseconds(object.getPlannedAvailableDateTime());
orderingInstructions = object.getOrderingInstructions();
turnaround = object.getTurnaround();
}
@@ -147,8 +150,7 @@ public class DefaultStandardOrderProcess
@Override
@XmlElement(name = "plannedAvailableDateTime")
public synchronized Date getPlannedAvailableDateTime() {
- return (plannedAvailableDateTime != Long.MIN_VALUE) ?
- new Date(plannedAvailableDateTime) : null;
+ return toDate(plannedAvailableDateTime);
}
/**
@@ -158,7 +160,7 @@ public class DefaultStandardOrderProcess
*/
public synchronized void setPlannedAvailableDateTime(final Date newValue) {
checkWritePermission();
- plannedAvailableDateTime = (newValue != null) ? newValue.getTime() :
Long.MIN_VALUE;
+ plannedAvailableDateTime = toMilliseconds(newValue);
}
/**
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -27,6 +27,9 @@ import org.opengis.metadata.citation.Res
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.util.iso.Types;
+import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
+import static
org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
+
/**
* Brief description of ways in which the resource(s) is/are currently used.
@@ -108,7 +111,7 @@ public class DefaultUsage extends ISOMet
public DefaultUsage(final Usage object) {
super(object);
specificUsage = object.getSpecificUsage();
-// TODO usageDate = object.getUsageDate();
+ usageDate = toMilliseconds(object.getUsageDate());
userDeterminedLimitations = object.getUserDeterminedLimitations();
userContactInfo =
copyCollection(object.getUserContactInfo(), ResponsibleParty.class);
}
@@ -164,7 +167,7 @@ public class DefaultUsage extends ISOMet
@Override
@XmlElement(name = "usageDateTime")
public synchronized Date getUsageDate() {
- return (usageDate != Long.MIN_VALUE) ? new Date(usageDate) : null;
+ return toDate(usageDate);
}
/**
@@ -174,7 +177,7 @@ public class DefaultUsage extends ISOMet
*/
public synchronized void setUsageDate(final Date newValue) {
checkWritePermission();
- usageDate = (newValue != null) ? newValue.getTime() : Long.MIN_VALUE;
+ usageDate = toMilliseconds(newValue);
}
/**
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -32,6 +32,9 @@ import org.apache.sis.metadata.iso.ISOMe
import org.apache.sis.util.iso.Types;
import org.apache.sis.xml.Namespaces;
+import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
+import static
org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
+
/**
* Description of the event, including related parameters or tolerances.
@@ -136,7 +139,7 @@ public class DefaultProcessStep extends
super(object);
description = object.getDescription();
rationale = object.getRationale();
-// TODO date = object.getDate();
+ date = toMilliseconds(object.getDate());
processors = copyCollection(object.getProcessors(),
ResponsibleParty.class);
sources = copyCollection(object.getSources(),
Source.class);
outputs = copyCollection(object.getOutputs(),
Source.class);
@@ -214,7 +217,7 @@ public class DefaultProcessStep extends
@Override
@XmlElement(name = "dateTime")
public synchronized Date getDate() {
- return (date != Long.MIN_VALUE) ? new Date(date) : null;
+ return toDate(date);
}
/**
@@ -225,7 +228,7 @@ public class DefaultProcessStep extends
*/
public synchronized void setDate(final Date newValue) {
checkWritePermission();
- date = (newValue != null) ? newValue.getTime() : Long.MIN_VALUE;
+ date = toMilliseconds(newValue);
}
/**
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -30,6 +30,9 @@ import org.opengis.temporal.PeriodDurati
import org.opengis.util.InternationalString;
import org.apache.sis.metadata.iso.ISOMetadata;
+import static org.apache.sis.internal.metadata.MetadataUtilities.toDate;
+import static
org.apache.sis.internal.metadata.MetadataUtilities.toMilliseconds;
+
/**
* Information about the scope and frequency of updating.
@@ -127,7 +130,7 @@ public class DefaultMaintenanceInformati
public DefaultMaintenanceInformation(final MaintenanceInformation object) {
super(object);
maintenanceAndUpdateFrequency =
object.getMaintenanceAndUpdateFrequency();
-// TODO dateOfNextUpdate = object.getDateOfNextUpdate();
+ dateOfNextUpdate =
toMilliseconds(object.getDateOfNextUpdate());
userDefinedMaintenanceFrequency =
object.getUserDefinedMaintenanceFrequency();
updateScopes =
copyCollection(object.getUpdateScopes(), ScopeCode.class);
updateScopeDescriptions =
copyCollection(object.getUpdateScopeDescriptions(), ScopeDescription.class);
@@ -187,8 +190,7 @@ public class DefaultMaintenanceInformati
@Override
@XmlElement(name = "dateOfNextUpdate")
public synchronized Date getDateOfNextUpdate() {
- final long date = dateOfNextUpdate;
- return (date != Long.MIN_VALUE) ? new Date(date) : null;
+ return toDate(dateOfNextUpdate);
}
/**
@@ -198,7 +200,7 @@ public class DefaultMaintenanceInformati
*/
public synchronized void setDateOfNextUpdate(final Date newValue) {
checkWritePermission();
- dateOfNextUpdate = (newValue!=null) ? newValue.getTime() :
Long.MIN_VALUE;
+ dateOfNextUpdate = toMilliseconds(newValue);
}
/**
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java?rev=1462179&r1=1462178&r2=1462179&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
[UTF-8] Thu Mar 28 16:01:41 2013
@@ -155,8 +155,8 @@ public class AbstractElement extends ISO
evaluationMethodType = object.getEvaluationMethodType();
evaluationMethodDescription = object.getEvaluationMethodDescription();
evaluationProcedure = object.getEvaluationProcedure();
-// TODO dates = copyCollection(object.getDates(),
Date.class);
results = copyCollection(object.getResults(),
Result.class);
+ writeDates(object.getDates());
}
/**
@@ -348,11 +348,18 @@ public class AbstractElement extends ISO
*
* @param newValues The new dates, or {@code null}.
*/
- public synchronized void setDates(final Collection<Date> newValues) {
+ public synchronized void setDates(final Collection<? extends Date>
newValues) {
checkWritePermission();
+ writeDates(newValues);
+ }
+
+ /**
+ * Implementation of {@link #setDates(Collection)}.
+ */
+ private void writeDates(final Collection<? extends Date> newValues) {
date1 = date2 = Long.MIN_VALUE;
if (newValues != null) {
- final Iterator<Date> it = newValues.iterator();
+ final Iterator<? extends Date> it = newValues.iterator();
if (it.hasNext()) {
date1 = it.next().getTime();
if (it.hasNext()) {
