Author: desruisseaux
Date: Thu Mar 7 10:36:25 2013
New Revision: 1453762
URL: http://svn.apache.org/r1453762
Log:
Minor cleaning (mostly about warnings).
Modified:
sis/branches/JDK7/pom.xml
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
sis/branches/JDK7/sis-webapp/pom.xml
Modified: sis/branches/JDK7/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1453762&r1=1453761&r2=1453762&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Thu Mar 7 10:36:25 2013
@@ -344,6 +344,7 @@ Apache SIS is a toolkit for describing l
<Specification-Vendor>Open Geospatial
Consortium</Specification-Vendor>
</manifestEntries>
</archive>
+ <skipIfEmpty>true</skipIfEmpty>
</configuration>
<executions>
<execution>
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java?rev=1453762&r1=1453761&r2=1453762&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
[UTF-8] Thu Mar 7 10:36:25 2013
@@ -116,7 +116,7 @@ public abstract class AbstractMetadata i
*
* <ul>
* <li>An empty {@linkplain CharSequence character sequences}.</li>
- * <li>An {@linkplain Collection#isEmpty() empty collection} or an empty
array.</li>
+ * <li>An {@linkplain java.util.Collection#isEmpty() empty collection}
or an empty array.</li>
* <li>A collection or array containing only {@code null} or empty
elements.</li>
* <li>An other metadata object containing only {@code null} or empty
attributes.</li>
* </ul>
Modified:
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java?rev=1453762&r1=1453761&r2=1453762&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
[UTF-8] Thu Mar 7 10:36:25 2013
@@ -57,8 +57,8 @@ import static org.apache.sis.test.TestUt
/**
* Tests the {@link PropertyAccessor} class. Every tests in this class
instantiates directly a
- * {@link PropertyAccessor} object by invoking the {@link
#createPropertyAccessor(Citation)}
- * method. This class shall not test accessors created indirectly (e.g. the
accessors created
+ * {@link PropertyAccessor} object by invoking the {@link
#createPropertyAccessor()} method.
+ * This class shall not test accessors created indirectly (e.g. the accessors
created
* by {@link MetadataStandard}).
*
* <p>This test case uses the {@link Citation} and {@link GeographicCRS}
types. If those types
Modified:
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java?rev=1453762&r1=1453761&r2=1453762&view=diff
==============================================================================
---
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
[UTF-8] Thu Mar 7 10:36:25 2013
@@ -939,7 +939,7 @@ public abstract class AbstractEnvelope i
* @param isSimplePrecision {@code true} if every lower and upper corner
values can be casted to {@code float}.
* @return The envelope as a {@code BOX2D} or {@code BOX3D} (most typical
dimensions) in WKT format.
*
- * @see GeneralEnvelope#GeneralEnvelope(String)
+ * @see GeneralEnvelope#GeneralEnvelope(CharSequence)
* @see org.apache.sis.measure.CoordinateFormat
* @see org.apache.sis.io.wkt
*/
Modified:
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java?rev=1453762&r1=1453761&r2=1453762&view=diff
==============================================================================
---
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ArrayEnvelope.java
[UTF-8] Thu Mar 7 10:36:25 2013
@@ -195,7 +195,7 @@ class ArrayEnvelope extends AbstractEnve
* }
*
* However this constructor is lenient to other geometry types like {@code
POLYGON}.
- * See the javadoc of the {@link GeneralEnvelope#GeneralEnvelope(String)
GeneralEnvelope}
+ * See the javadoc of the {@link
GeneralEnvelope#GeneralEnvelope(CharSequence) GeneralEnvelope}
* constructor for more information.
*
* @param wkt The {@code BOX}, {@code POLYGON} or other kind of element
to parse.
Modified:
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java?rev=1453762&r1=1453761&r2=1453762&view=diff
==============================================================================
---
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
[UTF-8] Thu Mar 7 10:36:25 2013
@@ -139,7 +139,7 @@ public final class ImmutableEnvelope ext
* }
*
* However this constructor is lenient to other geometry types like {@code
POLYGON}.
- * See the javadoc of the {@link GeneralEnvelope#GeneralEnvelope(String)
GeneralEnvelope}
+ * See the javadoc of the {@link
GeneralEnvelope#GeneralEnvelope(CharSequence) GeneralEnvelope}
* constructor for more information.
*
* @param wkt The {@code BOX}, {@code POLYGON} or other kind of element
to parse.
Modified:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java?rev=1453762&r1=1453761&r2=1453762&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
[UTF-8] Thu Mar 7 10:36:25 2013
@@ -25,11 +25,11 @@ package org.apache.sis.util;
*
* {@section Conditions for equality}
* <ul>
- * <li>{@link org.apache.sis.metadata.iso.MetadataEntity} subclasses
+ * <li>{@link org.apache.sis.metadata.iso.ISOMetadata} subclasses
* <ol>
* <li>{@link ComparisonMode#STRICT STRICT} – Objects must be of the
same class
* and all attributes must be equal, including {@code xlink} and
others
- * {@linkplain
org.apache.sis.metadata.iso.MetadataEntity#getIdentifiers() identifiers}.</li>
+ * {@linkplain
org.apache.sis.metadata.iso.ISOMetadata#getIdentifiers() identifiers}.</li>
* <li>{@link ComparisonMode#BY_CONTRACT BY_CONTRACT} – The same
attributes than the above
* {@code STRICT} mode must be equal, but the metadata object don't
need to be implemented
* by the same class provided that they implement the same GeoAPI
interface.</li>
Modified:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java?rev=1453762&r1=1453761&r2=1453762&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
[UTF-8] Thu Mar 7 10:36:25 2013
@@ -64,7 +64,7 @@ import org.opengis.metadata.citation.Cit
* @module
*
* @see IdentifierSpace
- * @see org.apache.sis.metadata.iso.MetadataEntity
+ * @see org.apache.sis.metadata.iso.ISOMetadata
* @see ReferenceResolver#newIdentifiedObject(MarshalContext, Class,
Identifier[])
*/
public interface IdentifiedObject {
Modified: sis/branches/JDK7/sis-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-webapp/pom.xml?rev=1453762&r1=1453761&r2=1453762&view=diff
==============================================================================
--- sis/branches/JDK7/sis-webapp/pom.xml (original)
+++ sis/branches/JDK7/sis-webapp/pom.xml Thu Mar 7 10:36:25 2013
@@ -54,11 +54,10 @@
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
-
<execution>
<id>reserve-ports</id>
<phase>initialize</phase>
