[Schmitzm-commits] r222 - trunk/src/skrueger/geotools

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-07-14 16:46:39 +0200 (Tue, 14 Jul 2009)
New Revision: 222

Added:
   trunk/src/skrueger/geotools/StyledFeaturesInterface.java
Removed:
   trunk/src/skrueger/geotools/StyledFeatureInterface.java
Modified:
   trunk/src/skrueger/geotools/StyledFS.java
   trunk/src/skrueger/geotools/StyledFeatureCollection.java
   trunk/src/skrueger/geotools/StyledFeatureCollectionInterface.java
   trunk/src/skrueger/geotools/StyledFeatureSourceInterface.java
Log:
* Renamed StyledFeatureInterface to StyledFeaturesInterface

Modified: trunk/src/skrueger/geotools/StyledFS.java
===================================================================
--- trunk/src/skrueger/geotools/StyledFS.java	2009-07-14 14:40:52 UTC (rev 221)
+++ trunk/src/skrueger/geotools/StyledFS.java	2009-07-14 14:46:39 UTC (rev 222)
@@ -232,7 +232,7 @@
 	/**
 	 * Returns the features of the {@link FeatureSource}.
 	 * 
-	 * @see {@link StyledFeatureInterface}
+	 * @see {@link StyledFeaturesInterface}
 	 */
 	@Override
 	public FeatureCollection getFeatureCollection() {
@@ -248,9 +248,9 @@
 
 	/**
 	 * Same as {@link #getGeoObject()} method, but complies to the
-	 * {@link StyledFeatureInterface}
+	 * {@link StyledFeaturesInterface}
 	 * 
-	 * @see {@link StyledFeatureInterface}
+	 * @see {@link StyledFeaturesInterface}
 	 */
 	@Override
 	public FeatureSource getFeatureSource() {

Modified: trunk/src/skrueger/geotools/StyledFeatureCollection.java
===================================================================
--- trunk/src/skrueger/geotools/StyledFeatureCollection.java	2009-07-14 14:40:52 UTC (rev 221)
+++ trunk/src/skrueger/geotools/StyledFeatureCollection.java	2009-07-14 14:46:39 UTC (rev 222)
@@ -328,8 +328,8 @@
 	}
 
 	/**
-	 * Same as {@link #getGeoObject()} method, but complies to the {@link StyledFeatureInterface} 
-	 * @see {@link StyledFeatureInterface}
+	 * Same as {@link #getGeoObject()} method, but complies to the {@link StyledFeaturesInterface} 
+	 * @see {@link StyledFeaturesInterface}
 	 */
 	@Override
 	public FeatureCollection getFeatureCollection() {
@@ -340,7 +340,7 @@
 	 * Returns a virtual {@link FeatureSource} to access the
 	 * {@link FeatureCollection}. Once created, it will be reused until
 	 * {@link #uncache()} is called.<br/>
-	 * @see {@link StyledFeatureInterface}
+	 * @see {@link StyledFeaturesInterface}
 	 */
 	@Override
 	public FeatureSource getFeatureSource() {

Modified: trunk/src/skrueger/geotools/StyledFeatureCollectionInterface.java
===================================================================
--- trunk/src/skrueger/geotools/StyledFeatureCollectionInterface.java	2009-07-14 14:40:52 UTC (rev 221)
+++ trunk/src/skrueger/geotools/StyledFeatureCollectionInterface.java	2009-07-14 14:46:39 UTC (rev 222)
@@ -9,7 +9,7 @@
 /**
  * {@link StyledMapInterface} which contains a {@link FeatureCollection} as geo object.<br>
  */
-public interface StyledFeatureCollectionInterface extends StyledFeatureInterface<FeatureCollection> {
+public interface StyledFeatureCollectionInterface extends StyledFeaturesInterface<FeatureCollection> {
 
 	public abstract Map<Integer,AttributeMetaData> getAttributeMetaDataMap();
 

Deleted: trunk/src/skrueger/geotools/StyledFeatureInterface.java
===================================================================
--- trunk/src/skrueger/geotools/StyledFeatureInterface.java	2009-07-14 14:40:52 UTC (rev 221)
+++ trunk/src/skrueger/geotools/StyledFeatureInterface.java	2009-07-14 14:46:39 UTC (rev 222)
@@ -1,24 +0,0 @@
-package skrueger.geotools;
-
-import org.geotools.data.FeatureSource;
-import org.opengis.feature.FeatureCollection;
-
-/**
- * This Interface combines all styled layers that are running on {@link FeatureCollection} or {@link FeatureSource} 
- *
- * @author Stefan A. Krüger
- *
- * @param <T> The base Type returned in the getObject() method.
- */
-public interface StyledFeatureInterface<T> extends StyledMapInterface<T>{
-	
-	/**
-	 * @return The features of this layer as a {@link FeatureSource}. 
-	 */
-	public FeatureSource getFeatureSource();
-
-	/**
-	 * @return The features of this layer as a {@link FeatureCollection}. 
-	 */
-	public abstract org.geotools.feature.FeatureCollection getFeatureCollection();
-}

Modified: trunk/src/skrueger/geotools/StyledFeatureSourceInterface.java
===================================================================
--- trunk/src/skrueger/geotools/StyledFeatureSourceInterface.java	2009-07-14 14:40:52 UTC (rev 221)
+++ trunk/src/skrueger/geotools/StyledFeatureSourceInterface.java	2009-07-14 14:46:39 UTC (rev 222)
@@ -9,7 +9,7 @@
 /**
  * {@link StyledMapInterface} which contains a {@link FeatureSource} as geo object.<br>
  */
-public interface StyledFeatureSourceInterface extends StyledFeatureInterface<FeatureSource> {
+public interface StyledFeatureSourceInterface extends StyledFeaturesInterface<FeatureSource> {
 
 	public abstract Map<Integer,AttributeMetaData> getAttributeMetaDataMap();
 

Copied: trunk/src/skrueger/geotools/StyledFeaturesInterface.java (from rev 221, trunk/src/skrueger/geotools/StyledFeatureInterface.java)
===================================================================
--- trunk/src/skrueger/geotools/StyledFeatureInterface.java	2009-07-14 14:40:52 UTC (rev 221)
+++ trunk/src/skrueger/geotools/StyledFeaturesInterface.java	2009-07-14 14:46:39 UTC (rev 222)
@@ -0,0 +1,24 @@
+package skrueger.geotools;
+
+import org.geotools.data.FeatureSource;
+import org.opengis.feature.FeatureCollection;
+
+/**
+ * This Interface combines all styled layers that are running on {@link FeatureCollection} or {@link FeatureSource} 
+ *
+ * @author Stefan A. Krüger
+ *
+ * @param <T> The base Type returned in the getObject() method.
+ */
+public interface StyledFeaturesInterface<T> extends StyledMapInterface<T>{
+	
+	/**
+	 * @return The features of this layer as a {@link FeatureSource}. 
+	 */
+	public FeatureSource getFeatureSource();
+
+	/**
+	 * @return The features of this layer as a {@link FeatureCollection}. 
+	 */
+	public abstract org.geotools.feature.FeatureCollection getFeatureCollection();
+}