[Schmitzm-commits] r324 - branches/1.0-gt2-2.6/src/skrueger/geotools

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-08-26 17:17:02 +0200 (Wed, 26 Aug 2009)
New Revision: 324

Modified:
   branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollection.java
   branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollectionInterface.java
   branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeaturesInterface.java
Log:
Migrating to GT2.6: Genericas!

Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollection.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollection.java	2009-08-26 14:49:32 UTC (rev 323)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollection.java	2009-08-26 15:17:02 UTC (rev 324)
@@ -40,6 +40,7 @@
 import org.geotools.data.collection.CollectionDataStore;
 import org.geotools.feature.AttributeType;
 import org.geotools.feature.FeatureCollection;
+import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.geotools.styling.Style;
 
@@ -58,7 +59,7 @@
  * @version 1.0
  */
 public class StyledFeatureCollection extends
-		AbstractStyledLayer<FeatureCollection> implements
+		AbstractStyledLayer<FeatureCollection<SimpleFeatureType, SimpleFeature> > implements
 		StyledFeatureCollectionInterface {
 
 	/** Holds the meta data for displaying a legend. */
@@ -67,7 +68,7 @@
 	/**
 	 * We be filled with a "virtual" {@link FeatureSource} on demand.
 	 */
-	private FeatureSource featureSource = null;
+	private FeatureSource<SimpleFeatureType, SimpleFeature> featureSource = null;
 
 	/**
 	 * Creates a styled {@link FeatureCollection} with language-specific

Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollectionInterface.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollectionInterface.java	2009-08-26 14:49:32 UTC (rev 323)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollectionInterface.java	2009-08-26 15:17:02 UTC (rev 324)
@@ -30,10 +30,12 @@
 package skrueger.geotools;
 
 import org.geotools.feature.FeatureCollection;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
 
 /**
  * {@link StyledLayerInterface} which contains a {@link FeatureCollection} as geo object.<br>
  */
-public interface StyledFeatureCollectionInterface extends StyledFeaturesInterface<FeatureCollection> {
+public interface StyledFeatureCollectionInterface extends StyledFeaturesInterface<FeatureCollection<SimpleFeatureType, SimpleFeature>> {
 
 }

Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeaturesInterface.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeaturesInterface.java	2009-08-26 14:49:32 UTC (rev 323)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeaturesInterface.java	2009-08-26 15:17:02 UTC (rev 324)
@@ -33,6 +33,8 @@
 
 import org.geotools.data.FeatureSource;
 import org.geotools.feature.FeatureCollection;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
 
 import skrueger.AttributeMetaData;
 
@@ -52,10 +54,10 @@
 	/**
 	 * @return The features of this layer as a {@link FeatureSource}.
 	 */
-	public FeatureSource getFeatureSource();
+	public FeatureSource<SimpleFeatureType, SimpleFeature> getFeatureSource();
 
 	/**
 	 * @return The features of this layer as a {@link FeatureCollection}.
 	 */
-	public abstract FeatureCollection getFeatureCollection();
+	public abstract FeatureCollection<SimpleFeatureType, SimpleFeature> getFeatureCollection();
 }