[Xulu-commits] r51 - in branches/1.8-gt2-2.6: lib lib/geotoolsArcGrid lib/gt2-2.6 src/edu/bonn/xulu/appl src/edu/bonn/xulu/plugin/io/misc src/edu/bonn/xulu/plugin/model/ca/fire src/edu/bonn/xulu/plugin/model/ca/reservoir
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Aug 31 20:26:25 CEST 2009
Author: mojays
Date: 2009-08-31 20:21:09 +0200 (Mon, 31 Aug 2009)
New Revision: 51
Added:
branches/1.8-gt2-2.6/lib/gt2-2.6/
branches/1.8-gt2-2.6/lib/gt2-2.6/commons-beanutils-1.7.0.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/commons-logging-1.1.1.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/geoapi-2.3-M1.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/geoapi-pending-2.3-M1.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-api-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-arcgrid-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-brewer-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-coverage-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-coverageio-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-epsg-hsql-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-geotiff-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-image-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-imagemosaic-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-imagepyramid-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-main-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-mapwidget-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-metadata-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-referencing-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-render-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-shapefile-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-shapefile-renderer-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/gt-swing-2.6-M2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/hsqldb-1.8.0.7.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdal-bindings-1.4.5.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdaldted-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalecw-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalecwjp2-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalehdr-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalerdasimg-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalframework-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalkakadujp2-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalmrsid-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalmrsidjp2-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalnitf-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-geocore-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-imagereadmt-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-tiff-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-utilities-1.0.3.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/jdom-1.0.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/jsr-275-1.0-beta-2.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/jts-1.10.jar
branches/1.8-gt2-2.6/lib/gt2-2.6/vecmath-1.3.2.jar
Removed:
branches/1.8-gt2-2.6/lib/geotoolsArcGrid/gt2-arcgrid-2.3.0-M0.jar
branches/1.8-gt2-2.6/lib/gt2-2.4.5/
Modified:
branches/1.8-gt2-2.6/src/edu/bonn/xulu/appl/XuluConstants.java
branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java
branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java
branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java
branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java
branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java
branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java
Log:
geotools 2.6 migration. NOT STABLE!
Deleted: branches/1.8-gt2-2.6/lib/geotoolsArcGrid/gt2-arcgrid-2.3.0-M0.jar
===================================================================
(Binary files differ)
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/commons-beanutils-1.7.0.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/commons-beanutils-1.7.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/commons-logging-1.1.1.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/commons-logging-1.1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/geoapi-2.3-M1.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/geoapi-2.3-M1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/geoapi-pending-2.3-M1.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/geoapi-pending-2.3-M1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-api-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-api-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-arcgrid-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-arcgrid-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-brewer-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-brewer-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-coverage-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-coverage-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-coverageio-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-coverageio-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-epsg-hsql-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-epsg-hsql-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-geotiff-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-geotiff-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-image-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-image-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-imagemosaic-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-imagemosaic-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-imagepyramid-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-imagepyramid-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-main-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-main-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-mapwidget-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-mapwidget-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-metadata-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-metadata-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-referencing-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-referencing-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-render-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-render-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-shapefile-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-shapefile-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-shapefile-renderer-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-shapefile-renderer-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-swing-2.6-M2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/gt-swing-2.6-M2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/hsqldb-1.8.0.7.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/hsqldb-1.8.0.7.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdal-bindings-1.4.5.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdal-bindings-1.4.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdaldted-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdaldted-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalecw-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalecw-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalecwjp2-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalecwjp2-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalehdr-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalehdr-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalerdasimg-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalerdasimg-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalframework-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalframework-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalkakadujp2-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalkakadujp2-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalmrsid-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalmrsid-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalmrsidjp2-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalmrsidjp2-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalnitf-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-gdalnitf-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-geocore-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-geocore-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-imagereadmt-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-imagereadmt-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-tiff-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-tiff-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-utilities-1.0.3.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/imageio-ext-utilities-1.0.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/jdom-1.0.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/jdom-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/jsr-275-1.0-beta-2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/jsr-275-1.0-beta-2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/jts-1.10.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/jts-1.10.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/1.8-gt2-2.6/lib/gt2-2.6/vecmath-1.3.2.jar
===================================================================
(Binary files differ)
Property changes on: branches/1.8-gt2-2.6/lib/gt2-2.6/vecmath-1.3.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/appl/XuluConstants.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/appl/XuluConstants.java 2009-08-31 14:40:13 UTC (rev 50)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/appl/XuluConstants.java 2009-08-31 18:21:09 UTC (rev 51)
@@ -28,7 +28,7 @@
*/
public interface XuluConstants {
/** Versionsnummer der Xulu-Modelling-Platform. **/
- public static final String VERSION = "1.8";
+ public static final String VERSION = "1.8-gt2-2.6";
/** Versionsdatum der Xulu-Modelling-Platform. **/
public static final String VERSION_DATE = "2009-08-31";
/** Verzeichnis, in dem Icons und Uebersetzungen hinterlegt sind. */
Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java 2009-08-31 14:40:13 UTC (rev 50)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java 2009-08-31 18:21:09 UTC (rev 51)
@@ -11,25 +11,24 @@
package edu.bonn.xulu.plugin.io.misc;
-import java.io.File;
import java.awt.geom.Point2D;
+import java.io.File;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureIterator;
-import com.vividsolutions.jts.geom.Point;
+import org.opengis.feature.simple.SimpleFeature;
-import schmitzm.geotools.io.GeoImportUtil;
-
import schmitzm.data.property.ListProperty;
import schmitzm.data.property.ListPropertyWriteAccess;
+import schmitzm.geotools.io.GeoImportUtil;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.plugin.data.misc.CAArea;
+import com.vividsolutions.jts.geom.Point;
+
import edu.bonn.xulu.appl.XuluRegistry;
-import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.data.DynamicXuluObject;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.plugin.data.misc.CAArea;
/**
* Diese Factory importiert Instanzen des Datentyps {@link CAArea} aus einem
@@ -97,12 +96,12 @@
ListProperty prop = new ListProperty("Areas",caAreaType);
xuluObject.addProperty( prop );
// Features einlesen
- FeatureIterator featIter = GeoImportUtil.readFeaturesFromShapeFile((File)input).features();
+ FeatureIterator<SimpleFeature> featIter = GeoImportUtil.readFeaturesFromShapeFile((File)input).features();
// CA-Areas erzeugen und der ListProperty hinzufuegen
ListPropertyWriteAccess wa = prop.getWriteAccess(this);
for (int i=1; featIter.hasNext(); i++ ) {
- Feature f = featIter.next();
+ SimpleFeature f = featIter.next();
try {
// Area der Liste hinzufuegen
wa.addValue( interpreteFeature(i,f) );
@@ -125,7 +124,7 @@
* @param featNo Nummer des Features (beginnend bei 0)
* @param f zu interpretierendes Feature
*/
- protected CAArea interpreteFeature(int featNo, Feature f) {
+ protected CAArea interpreteFeature(int featNo, SimpleFeature f) {
return interpreteFeature(featNo,f,null);
}
@@ -136,7 +135,7 @@
* @param area Area in die die Informationen hineingeschrieben werden (wenn
* {@code null}, wird eine neue {@link CAArea}-Instanz erzeugt)
*/
- protected CAArea interpreteFeature(int featNo, Feature f, CAArea area) {
+ protected CAArea interpreteFeature(int featNo, SimpleFeature f, CAArea area) {
Object attr = null;
String attrName = "";
Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java 2009-08-31 14:40:13 UTC (rev 50)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java 2009-08-31 18:21:09 UTC (rev 51)
@@ -14,8 +14,9 @@
import java.io.File;
import java.awt.geom.Point2D;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureIterator;
+import org.opengis.feature.simple.SimpleFeature;
+
import com.vividsolutions.jts.geom.Point;
import schmitzm.geotools.io.GeoImportUtil;
@@ -86,7 +87,7 @@
* @param featNo Nummer des Features (beginnend bei 0)
* @param f zu interpretierendes Feature
*/
- protected CASettlementArea interpreteFeature(int featNo, Feature f) {
+ protected CASettlementArea interpreteFeature(int featNo, SimpleFeature f) {
return interpreteFeature(featNo,f,null);
}
@@ -100,7 +101,7 @@
* @throws IllegalArgumentException wenn {@code settArea} keine Instanz von
* {@link CASettlementArea} ist
*/
- protected CASettlementArea interpreteFeature(int featNo, Feature f, CAArea settArea) {
+ protected CASettlementArea interpreteFeature(int featNo, SimpleFeature f, CAArea settArea) {
if ( settArea == null )
settArea = new CASettlementArea();
if ( !(settArea instanceof CASettlementArea) )
Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java 2009-08-31 14:40:13 UTC (rev 50)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java 2009-08-31 18:21:09 UTC (rev 51)
@@ -37,7 +37,8 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.Feature;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jts.geom.Geometry;
@@ -528,7 +529,7 @@
* Punkte einer {@link FeatureCollection}.
* @param burnSource FeatureCollection von {@link Point} und {@link MultiPoint}
*/
- protected void initBurningCells(FeatureCollection burnSource) {
+ protected void initBurningCells(FeatureCollection<SimpleFeatureType,SimpleFeature> burnSource) {
// brennende Zellen
if ( burningCells == null )
burningCells = new Vector<int[]>();
@@ -541,9 +542,9 @@
else
uselessBurningCells.clear();
- FeatureIterator fi = burnSource.features();
+ FeatureIterator<SimpleFeature> fi = burnSource.features();
for (; fi.hasNext();) {
- Geometry g = fi.next().getDefaultGeometry();
+ Geometry g = (Geometry)fi.next().getDefaultGeometry();
if ( g == null )
continue;
if ( g instanceof Point ) {
@@ -562,6 +563,7 @@
} );
}
}
+ fi.close();
for ( int[] p : burningCells )
LOGGER.debug("initial burning cell: "+p[0]+" / "+p[1]);
@@ -594,7 +596,7 @@
////////////////////////////////////////////////////////////////////////
/**
* Berechnet die Windmatrix fuer gegebene Windrichtung und -staerke.
- * @param direction Windrichtung in Grad (Nord = 0°, West = 90°)
+ * @param direction Windrichtung in Grad (Nord = 0�, West = 90�)
* @param power Windstaerke in m/s
* @param directionDev Max. Abweichung der Windrichtung in Grad
* @param powerDev Max. Abweichung der Windstaerke in m/s
Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java 2009-08-31 14:40:13 UTC (rev 50)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java 2009-08-31 18:21:09 UTC (rev 51)
@@ -23,6 +23,9 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
+
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.Point;
import com.vividsolutions.jts.geom.MultiPoint;
@@ -158,11 +161,11 @@
throwResourceException(0, ImpetusFireCA.RESOURCE.getString("Error.In.ModelParams.WindMatrix_PowerFact",ImpetusFireCA.PARAM_PROP_WINDMATRIX_PCONST));
// Pruefen, ob FeatureCollection "Punkte" enthaelt
- FeatureCollection fc = ((SingleFeatureCollection)getResource(1).getData()).getFeatureCollection();
- FeatureIterator fi = fc.features();
+ FeatureCollection<SimpleFeatureType,SimpleFeature> fc = ((SingleFeatureCollection)getResource(1).getData()).getFeatureCollection();
+ FeatureIterator<SimpleFeature> fi = fc.features();
Geometry g = null;
if ( !fi.hasNext() ||
- (g = fi.next().getDefaultGeometry()) == null ||
+ (g = (Geometry)fi.next().getDefaultGeometry()) == null ||
!( g instanceof Point || g instanceof MultiPoint ) )
throwResourceException(1,ImpetusFireCA.RESOURCE.getString("Error.In.BurnSource.Data"));
Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java 2009-08-31 14:40:13 UTC (rev 50)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java 2009-08-31 18:21:09 UTC (rev 51)
@@ -31,6 +31,8 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.coverage.grid.GridCoverage2D;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.LineString;
@@ -138,7 +140,7 @@
//**************** Variablen mit denen gearbeitet wird *******************
protected WritableGrid dhm = null; // Hoehenmodell
- protected FeatureCollection damWall = null; // Lage der Staumauer
+ protected FeatureCollection<SimpleFeatureType,SimpleFeature> damWall = null; // Lage der Staumauer
protected double[] damWallHeight = null; // Hoehe der Staumauer ueber NN
protected double[] damWallHeightMin = null; // min. Hoehe der Staumauer ueber NN
protected double[] damWallHeightMax = null; // max. Hoehe der Staumauer ueber NN
@@ -474,7 +476,7 @@
*/
protected void determineDamWallCells() {
// Erstes Feature aus der Collection holen
- Geometry g = damWall.features().next().getDefaultGeometry();
+ Geometry g = (Geometry)damWall.features().next().getDefaultGeometry();
// LineString(s) in Vector einfuegen
Vector<LineString> lineStrings = new Vector<LineString>();
if ( g instanceof LineString )
Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java 2009-08-31 14:40:13 UTC (rev 50)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java 2009-08-31 18:21:09 UTC (rev 51)
@@ -23,6 +23,9 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
+
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.LineString;
import com.vividsolutions.jts.geom.MultiLineString;
@@ -138,10 +141,10 @@
// Pruefen, ob FeatureCollection "eine Linie" enthaelt
SingleFeatureCollection sfc = (SingleFeatureCollection)getResource(1).getData();
if ( sfc != null && sfc.getFeatureCollection().size() > 0 ) {
- FeatureCollection fc = sfc.getFeatureCollection();
- FeatureIterator fi = fc.features();
+ FeatureCollection<SimpleFeatureType,SimpleFeature> fc = sfc.getFeatureCollection();
+ FeatureIterator<SimpleFeature> fi = fc.features();
Geometry g = null;
- if ( (g = fi.next().getDefaultGeometry()) == null ||
+ if ( (g = (Geometry)fi.next().getDefaultGeometry()) == null ||
!( g instanceof LineString || g instanceof MultiLineString ) )
throwResourceException(2, SmallReservoirModel.RESOURCE.getString("Error.In.Dam.Loc"));
} else
More information about the Xulu-commits
mailing list