[Schmitzm-commits] r2000 - trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling

[scm-commit at wald.intevation.org]

Author: mojays
Date: 2012-05-17 16:16:44 +0200 (Thu, 17 May 2012)
New Revision: 2000

Modified:
   trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StyledFeatureCollection.java
Log:
StyledFeatureCollection: refined constructor parameter  from  StyledLayerStyle<AttributeMetadataMap> to StyledLayerStyle<AttributeMetadataMap<AttributeMetadataInterface>> to avoid casting problems (in SDSS)

Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StyledFeatureCollection.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StyledFeatureCollection.java	2012-05-17 14:02:50 UTC (rev 1999)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/styling/StyledFeatureCollection.java	2012-05-17 14:16:44 UTC (rev 2000)
@@ -49,6 +49,7 @@
 
 import de.schmitzm.geotools.data.amd.AttributeMetadataImpl;
 import de.schmitzm.geotools.data.amd.AttributeMetadataImplMap;
+import de.schmitzm.geotools.data.amd.AttributeMetadataInterface;
 import de.schmitzm.geotools.data.amd.AttributeMetadataMap;
 import de.schmitzm.geotools.feature.FeatureUtil;
 import de.schmitzm.geotools.feature.FeatureUtil.GeometryForm;
@@ -109,7 +110,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);
@@ -140,7 +141,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);
@@ -196,7 +197,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);
@@ -227,7 +228,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);
@@ -275,7 +276,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);