Menu
▾
▴
[Geotools-commits] svn - r38417 - in branches/2.7.x/modules/ogc/net.opengis.wfs: . src/net/opengis/wfs src/net/opengis/wfs/impl
|
From: <svn...@os...> - 2011-12-13 09:40:22
|
Author: aaime
Date: 2011-12-13 01:40:15 -0800 (Tue, 13 Dec 2011)
New Revision: 38417
Modified:
branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/GetFeatureType.java
branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/WfsPackage.java
branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/GetFeatureTypeImpl.java
branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/WfsPackageImpl.java
branches/2.7.x/modules/ogc/net.opengis.wfs/wfs.ecore
branches/2.7.x/modules/ogc/net.opengis.wfs/wfs.genmodel
Log:
[GEOT-3978] Backport startIndex support for WFS GetFeature bindings from trunk
Modified: branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/GetFeatureType.java
===================================================================
--- branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/GetFeatureType.java 2011-12-13 09:39:58 UTC (rev 38416)
+++ branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/GetFeatureType.java 2011-12-13 09:40:15 UTC (rev 38417)
@@ -39,6 +39,7 @@
* <li>{@link net.opengis.wfs.GetFeatureType#getTraverseXlinkExpiry <em>Traverse Xlink Expiry</em>}</li>
* <li>{@link net.opengis.wfs.GetFeatureType#getFormatOptions <em>Format Options</em>}</li>
* <li>{@link net.opengis.wfs.GetFeatureType#getMetadata <em>Metadata</em>}</li>
+ * <li>{@link net.opengis.wfs.GetFeatureType#getStartIndex <em>Start Index</em>}</li>
* </ul>
* </p>
*
@@ -93,7 +94,28 @@
*/
void setMaxFeatures(BigInteger value);
+ /**
+ * The initial index of a feature result set in which to return features.
+ * <p>
+ * This property is coupled with {@link #getMaxFeatures()} to page through
+ * a feature result set.
+ * </p>
+ * @model
+ */
+ BigInteger getStartIndex();
+
+
/**
+ * Sets the value of the '{@link net.opengis.wfs.GetFeatureType#getStartIndex <em>Start Index</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Start Index</em>' attribute.
+ * @see #getStartIndex()
+ * @generated
+ */
+ void setStartIndex(BigInteger value);
+
+ /**
* Returns the value of the '<em><b>Output Format</b></em>' attribute.
* The default value is <code>"text/xml; subtype=gml/3.1.1"</code>.
* <!-- begin-user-doc -->
Modified: branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/WfsPackage.java
===================================================================
--- branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/WfsPackage.java 2011-12-13 09:39:58 UTC (rev 38416)
+++ branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/WfsPackage.java 2011-12-13 09:40:15 UTC (rev 38417)
@@ -1176,13 +1176,22 @@
int GET_FEATURE_TYPE__METADATA = BASE_REQUEST_TYPE_FEATURE_COUNT + 7;
/**
+ * The feature id for the '<em><b>Start Index</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int GET_FEATURE_TYPE__START_INDEX = BASE_REQUEST_TYPE_FEATURE_COUNT + 8;
+
+ /**
* The number of structural features of the '<em>Get Feature Type</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int GET_FEATURE_TYPE_FEATURE_COUNT = BASE_REQUEST_TYPE_FEATURE_COUNT + 8;
+ int GET_FEATURE_TYPE_FEATURE_COUNT = BASE_REQUEST_TYPE_FEATURE_COUNT + 9;
/**
* The meta object id for the '{@link net.opengis.wfs.impl.GetFeatureWithLockTypeImpl <em>Get Feature With Lock Type</em>}' class.
@@ -1321,6 +1330,15 @@
int GET_FEATURE_WITH_LOCK_TYPE__METADATA = GET_FEATURE_TYPE__METADATA;
/**
+ * The feature id for the '<em><b>Start Index</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int GET_FEATURE_WITH_LOCK_TYPE__START_INDEX = GET_FEATURE_TYPE__START_INDEX;
+
+ /**
* The feature id for the '<em><b>Expiry</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3743,6 +3761,17 @@
EAttribute getGetFeatureType_Metadata();
/**
+ * Returns the meta object for the attribute '{@link net.opengis.wfs.GetFeatureType#getStartIndex <em>Start Index</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Start Index</em>'.
+ * @see net.opengis.wfs.GetFeatureType#getStartIndex()
+ * @see #getGetFeatureType()
+ * @generated
+ */
+ EAttribute getGetFeatureType_StartIndex();
+
+ /**
* Returns the meta object for class '{@link net.opengis.wfs.GetFeatureWithLockType <em>Get Feature With Lock Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5719,6 +5748,14 @@
EAttribute GET_FEATURE_TYPE__METADATA = eINSTANCE.getGetFeatureType_Metadata();
/**
+ * The meta object literal for the '<em><b>Start Index</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute GET_FEATURE_TYPE__START_INDEX = eINSTANCE.getGetFeatureType_StartIndex();
+
+ /**
* The meta object literal for the '{@link net.opengis.wfs.impl.GetFeatureWithLockTypeImpl <em>Get Feature With Lock Type</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Modified: branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/GetFeatureTypeImpl.java
===================================================================
--- branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/GetFeatureTypeImpl.java 2011-12-13 09:39:58 UTC (rev 38416)
+++ branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/GetFeatureTypeImpl.java 2011-12-13 09:40:15 UTC (rev 38417)
@@ -45,6 +45,7 @@
* <li>{@link net.opengis.wfs.impl.GetFeatureTypeImpl#getTraverseXlinkExpiry <em>Traverse Xlink Expiry</em>}</li>
* <li>{@link net.opengis.wfs.impl.GetFeatureTypeImpl#getFormatOptions <em>Format Options</em>}</li>
* <li>{@link net.opengis.wfs.impl.GetFeatureTypeImpl#getMetadata <em>Metadata</em>}</li>
+ * <li>{@link net.opengis.wfs.impl.GetFeatureTypeImpl#getStartIndex <em>Start Index</em>}</li>
* </ul>
* </p>
*
@@ -220,7 +221,27 @@
protected Map metadata = METADATA_EDEFAULT;
/**
+ * The default value of the '{@link #getStartIndex() <em>Start Index</em>}' attribute.
* <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getStartIndex()
+ * @generated
+ * @ordered
+ */
+ protected static final BigInteger START_INDEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getStartIndex() <em>Start Index</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getStartIndex()
+ * @generated
+ * @ordered
+ */
+ protected BigInteger startIndex = START_INDEX_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@@ -451,6 +472,27 @@
/**
* <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public BigInteger getStartIndex() {
+ return startIndex;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setStartIndex(BigInteger newStartIndex) {
+ BigInteger oldStartIndex = startIndex;
+ startIndex = newStartIndex;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, WfsPackage.GET_FEATURE_TYPE__START_INDEX, oldStartIndex, startIndex));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@@ -485,6 +527,8 @@
return getFormatOptions();
case WfsPackage.GET_FEATURE_TYPE__METADATA:
return getMetadata();
+ case WfsPackage.GET_FEATURE_TYPE__START_INDEX:
+ return getStartIndex();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -521,6 +565,9 @@
case WfsPackage.GET_FEATURE_TYPE__METADATA:
setMetadata((Map)newValue);
return;
+ case WfsPackage.GET_FEATURE_TYPE__START_INDEX:
+ setStartIndex((BigInteger)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -556,6 +603,9 @@
case WfsPackage.GET_FEATURE_TYPE__METADATA:
setMetadata(METADATA_EDEFAULT);
return;
+ case WfsPackage.GET_FEATURE_TYPE__START_INDEX:
+ setStartIndex(START_INDEX_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -583,6 +633,8 @@
return FORMAT_OPTIONS_EDEFAULT == null ? formatOptions != null : !FORMAT_OPTIONS_EDEFAULT.equals(formatOptions);
case WfsPackage.GET_FEATURE_TYPE__METADATA:
return METADATA_EDEFAULT == null ? metadata != null : !METADATA_EDEFAULT.equals(metadata);
+ case WfsPackage.GET_FEATURE_TYPE__START_INDEX:
+ return START_INDEX_EDEFAULT == null ? startIndex != null : !START_INDEX_EDEFAULT.equals(startIndex);
}
return super.eIsSet(featureID);
}
@@ -610,6 +662,8 @@
result.append(formatOptions);
result.append(", metadata: ");
result.append(metadata);
+ result.append(", startIndex: ");
+ result.append(startIndex);
result.append(')');
return result.toString();
}
Modified: branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/WfsPackageImpl.java
===================================================================
--- branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/WfsPackageImpl.java 2011-12-13 09:39:58 UTC (rev 38416)
+++ branches/2.7.x/modules/ogc/net.opengis.wfs/src/net/opengis/wfs/impl/WfsPackageImpl.java 2011-12-13 09:40:15 UTC (rev 38417)
@@ -1348,6 +1348,15 @@
/**
* <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getGetFeatureType_StartIndex() {
+ return (EAttribute)getFeatureTypeEClass.getEStructuralFeatures().get(8);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@@ -2485,6 +2494,7 @@
createEAttribute(getFeatureTypeEClass, GET_FEATURE_TYPE__TRAVERSE_XLINK_EXPIRY);
createEAttribute(getFeatureTypeEClass, GET_FEATURE_TYPE__FORMAT_OPTIONS);
createEAttribute(getFeatureTypeEClass, GET_FEATURE_TYPE__METADATA);
+ createEAttribute(getFeatureTypeEClass, GET_FEATURE_TYPE__START_INDEX);
getFeatureWithLockTypeEClass = createEClass(GET_FEATURE_WITH_LOCK_TYPE);
createEAttribute(getFeatureWithLockTypeEClass, GET_FEATURE_WITH_LOCK_TYPE__EXPIRY);
@@ -2767,6 +2777,7 @@
initEAttribute(getGetFeatureType_TraverseXlinkExpiry(), theXMLTypePackage.getPositiveInteger(), "traverseXlinkExpiry", null, 0, 1, GetFeatureType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getGetFeatureType_FormatOptions(), this.getMap(), "formatOptions", null, 0, 1, GetFeatureType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getGetFeatureType_Metadata(), this.getMap(), "metadata", null, 0, 1, GetFeatureType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getGetFeatureType_StartIndex(), ecorePackage.getEBigInteger(), "startIndex", null, 0, 1, GetFeatureType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(getFeatureWithLockTypeEClass, GetFeatureWithLockType.class, "GetFeatureWithLockType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getGetFeatureWithLockType_Expiry(), theXMLTypePackage.getPositiveInteger(), "expiry", "5", 0, 1, GetFeatureWithLockType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
Modified: branches/2.7.x/modules/ogc/net.opengis.wfs/wfs.ecore
===================================================================
--- branches/2.7.x/modules/ogc/net.opengis.wfs/wfs.ecore 2011-12-13 09:39:58 UTC (rev 38416)
+++ branches/2.7.x/modules/ogc/net.opengis.wfs/wfs.ecore 2011-12-13 09:40:15 UTC (rev 38417)
@@ -762,6 +762,7 @@
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="formatOptions" eType="#//Map"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="metadata" eType="#//Map"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="startIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GetFeatureWithLockType" eSuperTypes="#//GetFeatureType">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
Modified: branches/2.7.x/modules/ogc/net.opengis.wfs/wfs.genmodel
===================================================================
--- branches/2.7.x/modules/ogc/net.opengis.wfs/wfs.genmodel 2011-12-13 09:39:58 UTC (rev 38416)
+++ branches/2.7.x/modules/ogc/net.opengis.wfs/wfs.genmodel 2011-12-13 09:40:15 UTC (rev 38417)
@@ -146,6 +146,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs.ecore#//GetFeatureType/traverseXlinkExpiry"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs.ecore#//GetFeatureType/formatOptions"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs.ecore#//GetFeatureType/metadata"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs.ecore#//GetFeatureType/startIndex"/>
</genClasses>
<genClasses ecoreClass="wfs.ecore#//GetFeatureWithLockType">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute wfs.ecore#//GetFeatureWithLockType/expiry"/>
|
