[Schmitzm-commits] r1004 - branches/2.2.x/src/skrueger/geotools

[scm-commit@wald.intevation.org]

Author: mojays
Date: 2010-09-14 21:58:11 +0200 (Tue, 14 Sep 2010)
New Revision: 1004

Modified:
   branches/2.2.x/src/skrueger/geotools/StyledFeatureCollection.java
Log:
Typisierung von AttributeMetadataMap mit <AttributeMetadataInterface> in Konstruktoren

Modified: branches/2.2.x/src/skrueger/geotools/StyledFeatureCollection.java
===================================================================
--- branches/2.2.x/src/skrueger/geotools/StyledFeatureCollection.java	2010-09-14 19:30:50 UTC (rev 1003)
+++ branches/2.2.x/src/skrueger/geotools/StyledFeatureCollection.java	2010-09-14 19:58:11 UTC (rev 1004)
@@ -48,6 +48,7 @@
 
 import schmitzm.geotools.feature.FeatureUtil;
 import skrueger.AttributeMetadataImpl;
+import skrueger.AttributeMetadataInterface;
 import skrueger.i8n.Translation;
 
 /**
@@ -105,7 +106,7 @@
 	public StyledFeatureCollection(
 			FeatureCollection<SimpleFeatureType, SimpleFeature> fc, String id,
 			Translation title, Translation desc, Translation keywords,
-			Style style, AttributeMetadataMap attrMetaData, ImageIcon icon) {
+			Style style, AttributeMetadataMap<AttributeMetadataInterface> attrMetaData, ImageIcon icon) {
 		super(fc, fc.getBounds(), fc.getSchema().getGeometryDescriptor()
 				.getCoordinateReferenceSystem(), id, title, desc, keywords,
 				style, icon);
@@ -136,7 +137,7 @@
 	public StyledFeatureCollection(
 			FeatureCollection<SimpleFeatureType, SimpleFeature> fc, String id,
 			Translation title, Translation desc, Translation keywords,
-			StyledLayerStyle<AttributeMetadataMap> style, ImageIcon icon) {
+			StyledLayerStyle<AttributeMetadataMap<AttributeMetadataInterface>> style, ImageIcon icon) {
 		super(fc, fc.getBounds(), fc.getSchema().getGeometryDescriptor()
 				.getCoordinateReferenceSystem(), id, title, desc, keywords,
 				style != null ? style.getGeoObjectStyle() : null, icon);
@@ -192,7 +193,7 @@
 	public StyledFeatureCollection(
 			FeatureCollection<SimpleFeatureType, SimpleFeature> fc, String id,
 			String title, String desc, String keywords, Style style,
-			AttributeMetadataMap attrMetaData, ImageIcon icon) {
+			AttributeMetadataMap<AttributeMetadataInterface> attrMetaData, ImageIcon icon) {
 		this(fc, id, (Translation) null, null, null, style, attrMetaData, icon);
 		setTitle(title);
 		setDesc(desc);
@@ -223,7 +224,7 @@
 	public StyledFeatureCollection(
 			FeatureCollection<SimpleFeatureType, SimpleFeature> fc, String id,
 			String title, String desc, String keywords,
-			StyledLayerStyle<AttributeMetadataMap> style, ImageIcon icon) {
+			StyledLayerStyle<AttributeMetadataMap<AttributeMetadataInterface>> style, ImageIcon icon) {
 		this(fc, id, title, desc, keywords, style != null ? style
 				.getGeoObjectStyle() : null, style != null ? style
 				.getMetaData() : null, icon);
@@ -271,7 +272,7 @@
 	 */
 	public StyledFeatureCollection(
 			FeatureCollection<SimpleFeatureType, SimpleFeature> fc, String id,
-			String title, StyledLayerStyle<AttributeMetadataMap> style) {
+			String title, StyledLayerStyle<AttributeMetadataMap<AttributeMetadataInterface>> style) {
 		this(fc, id, title, null, null, style != null ? style
 				.getGeoObjectStyle() : null, style != null ? style
 				.getMetaData() : null, null);
@@ -289,7 +290,7 @@
 	/**
 	 * Returns the meta data needed for displaying a legend.
 	 */
-	public AttributeMetadataMap getAttributeMetaDataMap() {
+	public AttributeMetadataMap<AttributeMetadataImpl> getAttributeMetaDataMap() {
 		return attrMetaData;
 	}
 
@@ -301,7 +302,7 @@
 	 * @param attrMetaData
 	 *            map of attribute meta data
 	 */
-	public void setAttributeMetaData(AttributeMetadataMap attrMetaData) {
+	public void setAttributeMetaData(AttributeMetadataMap<AttributeMetadataInterface> attrMetaData) {
 		this.attrMetaData = (attrMetaData != null) ? attrMetaData
 				: createDefaultAttributeMetaDataMap(geoObject);
 	}