This commit propagates a method signature change which was done in GeoAPI. Reverting this commit cause a compilation error, which is resolved by modifying the method signature as in this commit. Those signatures can only be the same, however the method bodies are different in Geotk/SIS.
Action: all contributions forced by changes in GeoAPI interfaces
(mostly import
statements and method signatures) have been rewritten from scratch
by creating an empty Java class implementing the interface,
clicking on the "Implement all abstract methods" contextual menu in NetBeans,
removing the <? extends>
part in parameterized type of collections,
adding the synchronized
keyword (for now)
and finally adding the corresponding private fields.
This action has been committed in the Apache SIS JDK7 branch at revision 1458238.
Command line:
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24924:24925 https://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/quality/ElementImpl.java
Revision 24924 | Revision 24925 |
---|---|
package org.geotools.metadata.iso.quality; // J2SE direct dependencies import java.util.Collection; import java.util.Date; // OpenGIS dependencies |
package org.geotools.metadata.iso.quality; // J2SE direct dependencies import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; // OpenGIS dependencies |
* The array length is 1 for a single date, or 2 for a range. Returns * {@code null} if this information is not available. */ public synchronized Date[] getDate() { if (date1 == Long.MIN_VALUE) { return null; } if (date2 == Long.MIN_VALUE) { return new Date[] {new Date(date1)}; } return new Date[] {new Date(date1), new Date(date2)}; } /** |
* The array length is 1 for a single date, or 2 for a range. Returns * {@code null} if this information is not available. */ public synchronized Collection getDate() { if (date1 == Long.MIN_VALUE) { return null; } if (date2 == Long.MIN_VALUE) { return Collections.singleton( new Date(date1) ); } return Arrays.asList( new Date[] {new Date(date1), new Date(date2)} ); } /** |
* the out come of evaluating the obtained value (or set of values) against a specified * acceptable conformance quality level. */ public Result getResult() { return result; } /** |
* the out come of evaluating the obtained value (or set of values) against a specified * acceptable conformance quality level. */ public Collection getResult() { return Collections.singleton( result ); } /** |