[Geotools-commits] svn - r38478 - in trunk: docs/src/main/java/org/geotools/api docs/user/library/a

Author: jive
Date: 2012-01-11 20:24:42 -0800 (Wed, 11 Jan 2012)
New Revision: 38478

Modified:
   trunk/docs/src/main/java/org/geotools/api/DataStoreExamples.java
   trunk/docs/user/library/api/datastore.rst
   trunk/modules/library/api/src/main/java/org/geotools/data/FeatureSource.java
Log:
Update docs to pull in a live code example

Modified: trunk/docs/src/main/java/org/geotools/api/DataStoreExamples.java
===================================================================
--- trunk/docs/src/main/java/org/geotools/api/DataStoreExamples.java	2012-01-12 04:06:03 UTC (rev 38477)
+++ trunk/docs/src/main/java/org/geotools/api/DataStoreExamples.java	2012-01-12 04:24:42 UTC (rev 38478)
@@ -5,12 +5,16 @@
 
 import org.geotools.data.DataStore;
 import org.geotools.data.DataUtilities;
+import org.geotools.data.Query;
 import org.geotools.data.ServiceInfo;
+import org.geotools.data.simple.SimpleFeatureSource;
+import org.geotools.filter.text.cql2.CQL;
 import org.opengis.feature.simple.SimpleFeatureType;
 
 public class DataStoreExamples {
 
 DataStore dataStore = null;
+SimpleFeatureSource featureSource = null;
 
 void exampleInfo() {
     // exampleInfo start
@@ -39,4 +43,24 @@
     // exampleCreateSchema end
     
 }
+
+void exampleAllCount() throws Exception {
+    // all start
+    int count = featureSource.getCount( Query.ALL );
+    if( count == -1 ){
+        count = featureSource.getFeatures().size();
+    }
+    // all end
 }
+
+void exampleQueryCount() throws Exception {
+    // count start
+    Query query = new Query( "typeName", CQL.toFilter("REGION = 3") );
+    int count = featureSource.getCount( query );
+    if( count == -1 ){
+        count = featureSource.getFeatures( query ).size();
+    }
+    // count end
+}
+
+}

Modified: trunk/docs/user/library/api/datastore.rst
===================================================================
--- trunk/docs/user/library/api/datastore.rst	2012-01-12 04:06:03 UTC (rev 38477)
+++ trunk/docs/user/library/api/datastore.rst	2012-01-12 04:24:42 UTC (rev 38478)
@@ -321,21 +321,20 @@
   to be very fast. Not all implementations have access to this information making it a bit tricky
   to count the number of avaialble features.
   
-  The following code shows how to quickly count all the feautres available::
-    
-    int count = featureSource.getCount( Query.ALL );
-    if( count == -1 ){
-        count = featureSource.getFeatures().size();
-    }
+  The following code shows how to quickly count all the feautres available:
   
-  You can modify this to use your own Query::
+  .. literalinclude:: /../src/main/java/org/geotools/api/DataStoreExamples.java
+     :language: java
+     :start-after: // all start
+     :end-before: // all end
   
-    Query query = new Query( CQL.toFilter("REGION = 3") );
-    int count = featureSource.getCount( query );
-    if( count == -1 ){
-        count = featureSource.getFeatures( query ).size();
-    }
+  You can modify this to use your own Query:
   
+  .. literalinclude:: /../src/main/java/org/geotools/api/DataStoreExamples.java
+     :language: java
+     :start-after: // count start
+     :end-before: // count end
+
 SimpleFeatureStore
 ''''''''''''''''''
 

Modified: trunk/modules/library/api/src/main/java/org/geotools/data/FeatureSource.java
===================================================================
--- trunk/modules/library/api/src/main/java/org/geotools/data/FeatureSource.java	2012-01-12 04:06:03 UTC (rev 38477)
+++ trunk/modules/library/api/src/main/java/org/geotools/data/FeatureSource.java	2012-01-12 04:24:42 UTC (rev 38478)
@@ -222,7 +222,7 @@
      * <p>
      * Example use:<pre><code> int count = featureSource.getCount();
      * if( count == -1 ){
-     *    count = featureSource.getFeatures( count ).size();
+     *    count = featureSource.getFeatures( "typeName", count ).size();
      * }
      *
      * @param query the query to select features