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 2014/05/30 22:42:20 UTC
svn commit: r1598745 - in
/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature:
AbstractAssociation.java DefaultAssociationRole.java DefaultFeatureType.java
Author: desruisseaux
Date: Fri May 30 20:42:20 2014
New Revision: 1598745
URL: http://svn.apache.org/r1598745
Log:
Remove warnings that do not apply anymore to this branch.
Those warnings will stay on trunk however.
Modified:
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java?rev=1598745&r1=1598744&r2=1598745&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java [UTF-8] Fri May 30 20:42:20 2014
@@ -126,9 +126,6 @@ public abstract class AbstractAssociatio
* the common case where the {@linkplain DefaultAssociationRole#getMaximumOccurs() maximum number} of
* features is restricted to 1 or 0.
*
- * <div class="warning"><b>Warning:</b> In a future SIS version, the return type may be changed
- * to {@code org.opengis.feature.Feature}. This change is pending GeoAPI revision.</div>
- *
* @return The associated feature (may be {@code null}).
* @throws IllegalStateException if this association contains more than one value.
*
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java?rev=1598745&r1=1598744&r2=1598745&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAssociationRole.java [UTF-8] Fri May 30 20:42:20 2014
@@ -127,9 +127,6 @@ public class DefaultAssociationRole exte
/**
* Returns the type of feature values.
*
- * <div class="warning"><b>Warning:</b> In a future SIS version, the return type may be changed
- * to {@code org.opengis.feature.FeatureType}. This change is pending GeoAPI revision.</div>
- *
* @return The type of feature values.
*/
@Override
Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1598745&r1=1598744&r2=1598745&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] Fri May 30 20:42:20 2014
@@ -532,10 +532,6 @@ public class DefaultFeatureType extends
* if we compare {@code FeatureType} to {@link Class} in the Java language, then this method is equivalent
* to {@link Class#getSuperclass()} except that feature types allow multi-inheritance.</div>
*
- * <div class="warning"><b>Warning:</b>
- * The type of list elements will be changed to {@code FeatureType} if and when such interface
- * will be defined in GeoAPI.</div>
- *
* @return The parents of this feature type, or an empty set if none.
*/
@Override