Author: desruisseaux
Date: Tue Feb 12 09:01:50 2013
New Revision: 1445066
URL: http://svn.apache.org/r1445066
Log:
Minor Javadoc updates.
Modified:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/Range.java
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
Modified:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java?rev=1445066&r1=1445065&r2=1445066&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java
(original)
+++
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java
Tue Feb 12 09:01:50 2013
@@ -32,7 +32,7 @@ import org.apache.sis.util.resources.Err
* @param <T> The type of range elements as a subclass of {@link Number}.
*
* @author Martin Desruisseaux (IRD)
- * @author Jody Garnett (for parameterized type suggestion)
+ * @author Jody Garnett (for parameterized type inspiration)
* @since 0.3 (derived from geotk-2.4)
* @version 0.3
* @module
Modified:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/Range.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/Range.java?rev=1445066&r1=1445065&r2=1445066&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/Range.java
(original)
+++
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/Range.java
Tue Feb 12 09:01:50 2013
@@ -58,7 +58,7 @@ import java.util.Objects;
*
* @author Joe White
* @author Martin Desruisseaux (Geomatys)
- * @author Jody Garnett (for parameterized type suggestion)
+ * @author Jody Garnett (for parameterized type inspiration)
* @since 0.3
* @version 0.3
* @module
Modified:
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java?rev=1445066&r1=1445065&r2=1445066&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
(original)
+++
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
Tue Feb 12 09:01:50 2013
@@ -251,7 +251,7 @@ public final strictfp class RangeTest ex
}
/**
- * Tests the {@link Range#intersection(Range)} method.
+ * Tests the {@link Range#intersect(Range)} method.
*/
@Test
public void testIntersection() {
@@ -265,7 +265,7 @@ public final strictfp class RangeTest ex
}
/**
- * Tests the {@link Range#intersection(Range)} method with arguments
resulting in empty range.
+ * Tests the {@link Range#intersect(Range)} method with arguments
resulting in empty range.
*/
@Test
public void testIntersectionOfNonIntersectingRanges() {
Modified:
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java?rev=1445066&r1=1445065&r2=1445066&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
(original)
+++
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
Tue Feb 12 09:01:50 2013
@@ -94,7 +94,7 @@ public final strictfp class CharactersTe
}
/**
- * Tests the pre-defined {@link Characters.Filter} constants.
+ * Tests the pre-defined {@link org.apache.sis.util.Characters.Filter}
constants.
*/
@Test
public void testPredefinedFilters() {
@@ -118,7 +118,8 @@ public final strictfp class CharactersTe
}
/**
- * Scans the full {@code char}Â range in order to check for {@link
Character.Filter}Â consistency.
+ * Scans the full {@code char}Â range in order to check for
+ * {@link org.apache.sis.util.Characters.Filter}Â consistency.
*/
@Test
public void scanCharacterRange() {
Modified:
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java?rev=1445066&r1=1445065&r2=1445066&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
(original)
+++
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
Tue Feb 12 09:01:50 2013
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
/**
* Tests the {@link DerivedMap}. For the purpose of this test, this class
implements an
* {@link ObjectConverter} for which input values are multiplied by 100,
except value
- * {@code EXCLUDED} which is converted to {@code null} (meaning: excluded from
the
+ * {@value #EXCLUDED} which is converted to {@code null} (meaning: excluded
from the
* converted map).
*
* @author Martin Desruisseaux (Geomatys)
@@ -45,7 +45,7 @@ public final strictfp class DerivedMapTe
/**
* The value to replace by {@code null}.
*/
- private static final int EXCLUDED = 17;
+ protected static final int EXCLUDED = 17; // non-private for javadoc
purpose.
/**
* Fills test values in the given maps.
@@ -117,7 +117,7 @@ public final strictfp class DerivedMapTe
@Override public Class<Integer> getTargetClass() {return Integer.class;}
/**
- * Multiply the given value by 10, except value {@value #EXCLUDED}.
+ * Multiplies the given value by 10, except value {@value #EXCLUDED}.
*
* @param value The value to multiply.
* @return The multiplied value, or {@code null}.
Modified:
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java?rev=1445066&r1=1445065&r2=1445066&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
(original)
+++
sis/branches/JDK7/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
Tue Feb 12 09:01:50 2013
@@ -43,7 +43,7 @@ public final strictfp class DerivedSetTe
/**
* The value to replace by {@code null}.
*/
- private static final int EXCLUDED = 19;
+ protected static final int EXCLUDED = 19; // non-private for javadoc
purpose.
/**
* Tests {@link DerivedSet} without excluded value.
