[Schmitzm-commits] r318 - in branches/1.0-gt2-2.6/src: org/geotools/data/shapefile org/geotools/data/wfs org/geotools/feature/collection org/geotools/gui/swing org/geotools/renderer/lite/gridcoverage2d org/geotools/renderer/shape schmitzm/geotools schmitzm/geotools/feature schmitzm/geotools/grid schmitzm/geotools/gui schmitzm/geotools/io schmitzm/geotools/map/event schmitzm/geotools/styling schmitzm/jfree/feature schmitzm/jfree/feature/style schmitzm/lang skrueger/geotools skrueger/geotools/labelsearch skrueger/geotools/selection
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 26 15:33:35 CEST 2009
Author: alfonx
Date: 2009-08-26 15:33:32 +0200 (Wed, 26 Aug 2009)
New Revision: 318
Modified:
branches/1.0-gt2-2.6/src/org/geotools/data/shapefile/ShapefileDataStoreFactory.java
branches/1.0-gt2-2.6/src/org/geotools/data/wfs/WFSFeatureSource.java
branches/1.0-gt2-2.6/src/org/geotools/feature/collection/SubFeatureCollection.java
branches/1.0-gt2-2.6/src/org/geotools/gui/swing/JMapPane.java
branches/1.0-gt2-2.6/src/org/geotools/gui/swing/MouseSelectionTracker_Public.java
branches/1.0-gt2-2.6/src/org/geotools/renderer/lite/gridcoverage2d/RasterSymbolizerSupport.java
branches/1.0-gt2-2.6/src/org/geotools/renderer/shape/TransitionShapefileRenderer.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/FilterUtil.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/AttributeFilter.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureCollectionReader.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTree.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeFilter.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeParser.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTableModel.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTypeBuilderTableModel.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTypeTableModel.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureUtil.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/PipedFeatureIterator.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/grid/GridUtil.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionFilterPanel.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionTableModel.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureFilterPanel.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureInputOption.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTablePane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTypeInputOption.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoPositionLabel.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorToolBar.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JMapPane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapFrame.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapPane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/MapActionControlPane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/MapContextControlPane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoExportUtil.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoImportUtil.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/map/event/FeatureModifiedEvent.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java
branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2CategoryDatasetMapping.java
branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2DatasetMapping.java
branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2SeriesDatasetMapping.java
branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureCategoryDatasetSelectionModel.java
branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureChartPanel.java
branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureSeriesDatasetSelectionModel.java
branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureChartUtil.java
branches/1.0-gt2-2.6/src/schmitzm/lang/LangUtil.java
branches/1.0-gt2-2.6/src/skrueger/geotools/LegendIconFeatureRenderer.java
branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollection.java
branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/LabelSearch.java
branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/SearchResult.java
branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/SearchResultFeature.java
branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java
branches/1.0-gt2-2.6/src/skrueger/geotools/selection/StyledFeatureLayerSelectionModel.java
branches/1.0-gt2-2.6/src/skrueger/geotools/selection/StyledLayerSelectionModel.java
branches/1.0-gt2-2.6/src/skrueger/geotools/selection/TableSelectionSynchronizer.java
Log:
http://geotools.codehaus.org/Upgrade+to+2.5: Transition to GeoAPI SimpleFeature
1. Search Replace
Search Replace
\bFeature\b SimpleFeature
\bFeatureType\b SimpleFeatureType
2. Fix the imports
* Control-Shift-O in Eclipse IDE
PENDING: 3. Add casts as required for getDefaultGeometry()
Modified: branches/1.0-gt2-2.6/src/org/geotools/data/shapefile/ShapefileDataStoreFactory.java
===================================================================
--- branches/1.0-gt2-2.6/src/org/geotools/data/shapefile/ShapefileDataStoreFactory.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/org/geotools/data/shapefile/ShapefileDataStoreFactory.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -76,7 +76,7 @@
"url to a .shp file");
/**
- * Optional - uri of the FeatureType's namespace
+ * Optional - uri of the SimpleFeatureType's namespace
*/
public static final Param NAMESPACEP = new Param("namespace", URI.class,
"uri to a the namespace", false); // not required
@@ -127,7 +127,7 @@
* <ul>
* <li>The ShapefileDataStoreFactory may be created more than once with
* different Hints, for example when used to read a shapefile into alternate
- * Feature or Geometry representations.
+ * SimpleFeature or Geometry representations.
* <li>It flys in the face of a DataStore lifecycle, the JDBC DataStore
* implementations have taken to support a dispose operation.
* </ul>
Modified: branches/1.0-gt2-2.6/src/org/geotools/data/wfs/WFSFeatureSource.java
===================================================================
--- branches/1.0-gt2-2.6/src/org/geotools/data/wfs/WFSFeatureSource.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/org/geotools/data/wfs/WFSFeatureSource.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -27,7 +27,7 @@
import org.geotools.data.Transaction;
import org.geotools.data.store.EmptyFeatureCollection;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.filter.Filter;
import org.geotools.geometry.jts.ReferencedEnvelope;
@@ -77,7 +77,7 @@
*
* @see org.geotools.data.FeatureSource#getSchema()
*/
- public FeatureType getSchema() {
+ public SimpleFeatureType getSchema() {
try {
return ds.getSchema(fname);
} catch (IOException e) {
@@ -123,7 +123,7 @@
* @see org.geotools.data.FeatureSource#getFeatures(org.geotools.data.Query)
*/
public FeatureCollection getFeatures(Query query) throws IOException {
- FeatureType schema = getSchema();
+ SimpleFeatureType schema = getSchema();
String typeName = schema.getTypeName();
if( query.getTypeName() == null ){ // typeName unspecified we will "any" use a default
@@ -173,7 +173,7 @@
*
* @see org.geotools.data.FeatureResults#getSchema()
*/
- public FeatureType getSchema(){
+ public SimpleFeatureType getSchema(){
return fs.getSchema();
}
Modified: branches/1.0-gt2-2.6/src/org/geotools/feature/collection/SubFeatureCollection.java
===================================================================
--- branches/1.0-gt2-2.6/src/org/geotools/feature/collection/SubFeatureCollection.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/org/geotools/feature/collection/SubFeatureCollection.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -18,16 +18,16 @@
import java.io.IOException;
import java.util.Iterator;
+import org.apache.batik.svggen.font.table.FeatureList;
import org.geotools.data.FeatureReader;
import org.geotools.data.collection.DelegateFeatureReader;
import org.geotools.factory.CommonFactoryFinder;
import org.geotools.feature.CollectionListener;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.FeatureList;
-import org.geotools.feature.FeatureType;
import org.geotools.feature.IllegalAttributeException;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.feature.visitor.FeatureVisitor;
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.geotools.util.ProgressListener;
@@ -102,7 +102,7 @@
return Filter.INCLUDE;
}
- public FeatureType getFeatureType() {
+ public SimpleFeatureType getFeatureType() {
return state.getFeatureType();
}
@@ -123,7 +123,7 @@
}
//
- // Feature methods
+ // SimpleFeature methods
//
public String getID() {
return state.getId();
@@ -227,7 +227,7 @@
}
- public FeatureType getSchema() {
+ public SimpleFeatureType getSchema() {
return collection.getSchema();
}
@@ -244,7 +244,7 @@
progress.started();
for( iterator = iterator(); !progress.isCanceled() && iterator.hasNext(); progress.progress( position++/size )){
try {
- Feature feature = (Feature) iterator.next();
+ SimpleFeature feature = (SimpleFeature) iterator.next();
visitor.visit(feature);
}
catch( Exception erp ){
Modified: branches/1.0-gt2-2.6/src/org/geotools/gui/swing/JMapPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/org/geotools/gui/swing/JMapPane.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/org/geotools/gui/swing/JMapPane.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -60,10 +60,6 @@
import org.apache.log4j.Logger;
import org.geotools.feature.FeatureCollection;
import org.geotools.filter.IllegalFilterException;
-import org.geotools.gui.swing.event.HighlightChangeListener;
-import org.geotools.gui.swing.event.HighlightChangedEvent;
-import org.geotools.gui.swing.event.SelectionChangeListener;
-import org.geotools.gui.swing.event.SelectionChangedEvent;
import org.geotools.map.DefaultMapContext;
import org.geotools.map.MapContext;
import org.geotools.map.MapLayer;
@@ -729,8 +725,8 @@
*/
/*
- * Iterator fi = fc.iterator(); while (fi.hasNext()) { Feature feat
- * = (Feature) fi.next(); System.out.println("selected " +
+ * Iterator fi = fc.iterator(); while (fi.hasNext()) { SimpleFeature feat
+ * = (SimpleFeature) fi.next(); System.out.println("selected " +
* feat.getAttribute("STATE_NAME")); }
*/
} catch (final IllegalFilterException e) {
Modified: branches/1.0-gt2-2.6/src/org/geotools/gui/swing/MouseSelectionTracker_Public.java
===================================================================
--- branches/1.0-gt2-2.6/src/org/geotools/gui/swing/MouseSelectionTracker_Public.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/org/geotools/gui/swing/MouseSelectionTracker_Public.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -1,6 +1,8 @@
package org.geotools.gui.swing;
+import schmitzm.geotools.gui.MouseSelectionTracker;
+
/**
* Diese Klasse stellt lediglich eine Dummy-Klasse dar, um die Geotools-Klasse
* {@link MouseSelectionTracker} auch von ausserhalb des Pakets
Modified: branches/1.0-gt2-2.6/src/org/geotools/renderer/lite/gridcoverage2d/RasterSymbolizerSupport.java
===================================================================
--- branches/1.0-gt2-2.6/src/org/geotools/renderer/lite/gridcoverage2d/RasterSymbolizerSupport.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/org/geotools/renderer/lite/gridcoverage2d/RasterSymbolizerSupport.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -25,7 +25,6 @@
import org.apache.log4j.Logger;
import org.geotools.coverage.Category;
-import org.geotools.coverage.FactoryFinder;
import org.geotools.coverage.GridSampleDimension;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.coverage.grid.GridGeometry2D;
Modified: branches/1.0-gt2-2.6/src/org/geotools/renderer/shape/TransitionShapefileRenderer.java
===================================================================
--- branches/1.0-gt2-2.6/src/org/geotools/renderer/shape/TransitionShapefileRenderer.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/org/geotools/renderer/shape/TransitionShapefileRenderer.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -54,13 +54,12 @@
import org.geotools.data.shapefile.shp.ShapeType;
import org.geotools.data.shapefile.shp.ShapefileReader;
import org.geotools.data.shapefile.shp.ShapefileReader.Record;
-import org.geotools.factory.FactoryConfigurationError;
import org.geotools.feature.AttributeType;
-import org.geotools.feature.Feature;
-import org.geotools.feature.FeatureType;
import org.geotools.feature.FeatureTypeBuilder;
import org.geotools.feature.GeometryAttributeType;
import org.geotools.feature.SchemaException;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.filter.FilterAttributeExtractor;
import org.geotools.geometry.jts.Decimator;
import org.geotools.geometry.jts.LiteCoordinateSequenceFactory;
@@ -206,7 +205,7 @@
IndexInfo[] layerIndexInfo;
/**
- * Maps between the AttributeType index of the new generated FeatureType and
+ * Maps between the AttributeType index of the new generated SimpleFeatureType and
* the real attributeType
*/
int[] attributeIndexing;
@@ -313,7 +312,7 @@
}
final FeatureTypeStyle[] featureStylers = style.getFeatureTypeStyles();
- FeatureType type;
+ SimpleFeatureType type;
try {
type = createFeatureType(query, style, datastore);
@@ -423,7 +422,7 @@
}
if (!diff.isEmpty()) {
- Feature feature;
+ SimpleFeature feature;
for (Iterator modifiedIter = modified.keySet().iterator(), addedIter = added
.values().iterator(); modifiedIter.hasNext()
@@ -435,10 +434,10 @@
boolean doElse = true;
if (modifiedIter.hasNext()) {
final String fid = (String) modifiedIter.next();
- feature = (Feature) modified.get(fid);
+ feature = (SimpleFeature) modified.get(fid);
fids.add(fid);
} else {
- feature = (Feature) addedIter.next();
+ feature = (SimpleFeature) addedIter.next();
}
if (!query.getFilter().evaluate(feature))
@@ -527,7 +526,7 @@
private void processShapefile(final Graphics2D graphics,
final ShapefileDataStore datastore, final Envelope bbox, final Rectangle screenSize,
- final MathTransform mt, final IndexInfo info, final FeatureType type, final Query query,
+ final MathTransform mt, final IndexInfo info, final SimpleFeatureType type, final Query query,
final List ruleList, final List elseRuleList, final Set modifiedFIDs,
final NumberRange scaleRange, final String layerId) throws IOException {
IndexedDbaseFileReader dbfreader = null;
@@ -610,7 +609,7 @@
continue;
}
- final Feature feature = createFeature(type, record, dbfreader,
+ final SimpleFeature feature = createFeature(type, record, dbfreader,
nextFid);
if (!query.getFilter().evaluate(feature))
continue;
@@ -720,7 +719,7 @@
return new Class[] { PointSymbolizer.class, LineSymbolizer.class };
}
- Feature createFeature(final FeatureType type, final Record record,
+ SimpleFeature createFeature(final SimpleFeatureType type, final Record record,
final DbaseFileReader dbfreader, final String id) throws Exception {
if (type.getAttributeCount() == 1) {
return type.create(new Object[] { getGeom(record.shape(), type
@@ -797,9 +796,9 @@
* @throws FactoryConfigurationError
* @throws SchemaException
*/
- FeatureType createFeatureType(final Query query, final Style style,
+ SimpleFeatureType createFeatureType(final Query query, final Style style,
final ShapefileDataStore ds) throws SchemaException, IOException {
- final FeatureType schema = ds.getSchema();
+ final SimpleFeatureType schema = ds.getSchema();
final String[] attributes = findStyleAttributes((query == null) ? Query.ALL
: query, style, schema);
final AttributeType[] types = new AttributeType[attributes.length];
@@ -824,7 +823,7 @@
}
}
- final FeatureType type = FeatureTypeBuilder.newFeatureType(types, schema
+ final SimpleFeatureType type = FeatureTypeBuilder.newFeatureType(types, schema
.getTypeName(), schema.getNamespace(), false, null, schema
.getDefaultGeometry());
@@ -845,7 +844,7 @@
* <code>layer</code>
*/
private String[] findStyleAttributes(final Query query, final Style style,
- final FeatureType schema) {
+ final SimpleFeatureType schema) {
final StyleAttributeExtractor sae = new StyleAttributeExtractor() {
public void visit(final Rule rule) {
@@ -881,7 +880,7 @@
* @param scaleRange
* @param layerId
*/
- private void processSymbolizers(final Graphics2D graphics, final Feature feature,
+ private void processSymbolizers(final Graphics2D graphics, final SimpleFeature feature,
final Object geom, final Symbolizer[] symbolizers, final NumberRange scaleRange,
final boolean isJTS, final String layerId) {
for (int m = 0; m < symbolizers.length; m++) {
@@ -957,7 +956,7 @@
* @throws FactoryException
*/
private void processSymbolizers(final Graphics2D graphics,
- final Feature feature, final Symbolizer[] symbolizers,
+ final SimpleFeature feature, final Symbolizer[] symbolizers,
final Range scaleRange, final MathTransform transform, final String layerId)
throws TransformException, FactoryException {
LiteShape2 shape;
@@ -1145,7 +1144,7 @@
renderListeners.remove(listener);
}
- private void fireFeatureRenderedEvent(final Feature feature) {
+ private void fireFeatureRenderedEvent(final SimpleFeature feature) {
final Object[] objects = renderListeners.getListeners();
for (int i = 0; i < objects.length; i++) {
@@ -1274,9 +1273,9 @@
*/
private static class DefaultRenderListener implements RenderListener {
/**
- * @see org.geotools.renderer.lite.RenderListener#featureRenderer(org.geotools.feature.Feature)
+ * @see org.geotools.renderer.lite.RenderListener#featureRenderer(org.geotools.feature.SimpleFeature)
*/
- public void featureRenderer(final Feature feature) {
+ public void featureRenderer(final SimpleFeature feature) {
// do nothing.
}
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/FilterUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/FilterUtil.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/FilterUtil.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -33,7 +33,6 @@
import org.geotools.filter.Filter;
import org.geotools.filter.FilterFactoryFinder;
import org.geotools.filter.FilterFactoryImpl;
-import org.geotools.filter.visitor.DuplicatorFilterVisitor;
import org.opengis.filter.FilterFactory2;
import com.vividsolutions.jts.geom.GeometryFactory;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/AttributeFilter.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/AttributeFilter.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/AttributeFilter.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -29,7 +29,7 @@
******************************************************************************/
package schmitzm.geotools.feature;
-import org.geotools.feature.Feature;
+import org.geotools.feature.SimpleFeature;
import org.geotools.filter.AbstractFilterImpl;
import org.geotools.filter.Filter;
import org.geotools.filter.FilterFactoryImpl;
@@ -66,12 +66,12 @@
LE,
}
- /** Art des Vergleichs in {@link #evaluate(Feature)}. */
+ /** Art des Vergleichs in {@link #evaluate(SimpleFeature)}. */
protected CompareType compType = null;
- /** Name des Feature-Attributs, das mit der {@linkplain #compValue Konstante}
+ /** Name des SimpleFeature-Attributs, das mit der {@linkplain #compValue Konstante}
* verglichen wird.*/
protected String attrName = "";
- /** Konstante, mit der das {@linkplain #attrName Feature-Attibut}
+ /** Konstante, mit der das {@linkplain #attrName SimpleFeature-Attibut}
* vergleichen wird. */
protected Object compValue = null;
@@ -154,9 +154,9 @@
/**
* Fuehrt den Vergleich durch. Liefert {@code false}, wenn der Attribut-Name
* oder die Konstante nicht gesetzt ist oder der Attribut-Wert {@code null} ist.
- * @param feature Feature dessen Attribut mit der Konstanten verglichen wird
+ * @param feature SimpleFeature dessen Attribut mit der Konstanten verglichen wird
*/
- public boolean evaluate(Feature feature) {
+ public boolean evaluate(SimpleFeature feature) {
if ( attrName == null || compValue == null )
return false;
Object attrValue = feature.getAttribute(attrName);
@@ -210,14 +210,14 @@
/**
* Fuehrt den Vergleich durch. Liefert {@code false}, wenn der Attribut-Name
* oder die Konstante nicht gesetzt ist oder der Attribut-Wert {@code null} ist.
- * @param feature Feature dessen Attribut mit der Konstanten verglichen wird
+ * @param feature SimpleFeature dessen Attribut mit der Konstanten verglichen wird
* @exception IllegalArgumentException wenn das uebergebene Objekt kein
- * {@link Feature} ist
+ * {@link SimpleFeature} ist
*/
public boolean evaluate(Object feature) {
- if ( feature != null && !(feature instanceof Feature) )
- throw new IllegalArgumentException("evaluate(Object) can only be appied ob Feature objects: "+feature.getClass().getSimpleName());
- return evaluate((Feature)feature);
+ if ( feature != null && !(feature instanceof SimpleFeature) )
+ throw new IllegalArgumentException("evaluate(Object) can only be appied ob SimpleFeature objects: "+feature.getClass().getSimpleName());
+ return evaluate((SimpleFeature)feature);
}
/**
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureCollectionReader.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureCollectionReader.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureCollectionReader.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -32,10 +32,10 @@
import java.io.IOException;
import org.geotools.data.FeatureReader;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.feature.collection.FeatureIteratorImpl;
/**
@@ -43,14 +43,14 @@
* {@link FeatureIterator} einer {@link FeatureCollection}.<br>
* <b>Beachte:</b><br>
* Die <code>FeatureCollection</code> muss mindestens ein Element enthalten! Ansonsten
- * kann der {@link FeatureType} nicht ermittelt werden!
+ * kann der {@link SimpleFeatureType} nicht ermittelt werden!
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
* @version 1.0
*/
public class FeatureCollectionReader implements FeatureReader {
private FeatureIterator iterator = null;
private boolean closed = false;
- private FeatureType featureType = null;
+ private SimpleFeatureType featureType = null;
private FeatureCollection fc = null;
/**
@@ -61,7 +61,7 @@
*/
public FeatureCollectionReader(FeatureCollection fc) {
if ( fc.isEmpty() )
- throw new UnsupportedOperationException("FeatureCollection must contain at least one Feature!");
+ throw new UnsupportedOperationException("FeatureCollection must contain at least one SimpleFeature!");
this.fc = fc;
this.featureType = new FeatureIteratorImpl(fc).next().getFeatureType();
reset();
@@ -70,22 +70,22 @@
/**
* Liefert die Art der Features.
*/
- public FeatureType getFeatureType() {
+ public SimpleFeatureType getFeatureType() {
return featureType;
}
/**
- * Prueft, ob ein weiteres Feature gelesen werden kann.
+ * Prueft, ob ein weiteres SimpleFeature gelesen werden kann.
*/
public boolean hasNext() {
return !closed && iterator.hasNext();
}
/**
- * Liefert das naechste Feature (aus der FeatureCollection).
+ * Liefert das naechste SimpleFeature (aus der FeatureCollection).
* @exception IOException falls der Reader bereits geschlossen ist.
*/
- public Feature next() throws IOException {
+ public SimpleFeature next() throws IOException {
if (closed)
throw new IOException("FeatureReader already closed!");
return iterator.next();
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTree.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTree.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTree.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -29,7 +29,7 @@
******************************************************************************/
package schmitzm.geotools.feature;
-import org.geotools.feature.Feature;
+import org.geotools.feature.SimpleFeature;
import schmitzm.lang.tree.BinaryTreeNode;
import schmitzm.lang.tree.OperationTree;
@@ -37,8 +37,8 @@
/**
* Diese Klasse stellt einen Operator-Baum dar, in dem neben den von der
- * Oberklasse definitierten Operationen, Referenzen auf {@link Feature}-Attribute
- * enthalten sein koennen. Der Operator-Baum wird auf einem einzelnen {@link Feature}
+ * Oberklasse definitierten Operationen, Referenzen auf {@link SimpleFeature}-Attribute
+ * enthalten sein koennen. Der Operator-Baum wird auf einem einzelnen {@link SimpleFeature}
* ausgewertet. <b>Zur Zeit koennen nur numerische Attribute referenziert werden
* und keine Strings!</b><br>
* <br>
@@ -56,7 +56,7 @@
* @version 1.0
*/
public class FeatureOperationTree extends OperationTree {
- private Feature feature = null;
+ private SimpleFeature feature = null;
/**
* Erzeugt einen neuen Raster-Operatorbaum
@@ -72,14 +72,14 @@
* @exception UnsupportedOperationException bei jedem Aufruf
*/
public Object evaluate() {
- throw new UnsupportedOperationException("FeatureOperationTree only supports evaluate(Feature)");
+ throw new UnsupportedOperationException("FeatureOperationTree only supports evaluate(SimpleFeature)");
}
/**
- * Wertet den Operatorbaum auf einem {@link Feature} aus.
- * @param feature ein Feature
+ * Wertet den Operatorbaum auf einem {@link SimpleFeature} aus.
+ * @param feature ein SimpleFeature
*/
- public Object evaluate(Feature feature) {
+ public Object evaluate(SimpleFeature feature) {
this.feature = feature;
return super.evaluate();
}
@@ -120,7 +120,7 @@
}
/**
- * Diese Knoten repraesentiert eine Namens-Referenz auf ein {@link Feature}-Attribut
+ * Diese Knoten repraesentiert eine Namens-Referenz auf ein {@link SimpleFeature}-Attribut
* im Operatorbaum. Da es sich dabei um eine Konstante handelt, hat der Knoten
* keine Kind-Knoten. Die Referenz wird durch den Attribut-Namen ({@code String})
* dargestellt.
@@ -156,7 +156,7 @@
}
/**
- * Diese Knoten repraesentiert eine Index-Referenz auf ein {@link Feature}-Attribut
+ * Diese Knoten repraesentiert eine Index-Referenz auf ein {@link SimpleFeature}-Attribut
* im Operatorbaum. Da es sich dabei um eine Konstante handelt, hat der Knoten
* keine Kind-Knoten. Die Referenz wird durch den Attribut-Namen ({@code String})
* dargestellt.
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeFilter.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeFilter.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeFilter.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -29,14 +29,14 @@
******************************************************************************/
package schmitzm.geotools.feature;
-import org.geotools.feature.Feature;
+import org.geotools.feature.SimpleFeature;
import org.geotools.filter.AbstractFilterImpl;
import org.geotools.filter.FilterFactoryImpl;
/**
* Dieser Filter nutzt einen {@link FeatureOperationTree}, um die
- * {@link #evaluate(Feature)}-Methode auszuwerten. Ein Feature erfuellt die
- * Filter-Bedingung, wenn das Ergebnis des auf dem Feature ausgewerteten
+ * {@link #evaluate(SimpleFeature)}-Methode auszuwerten. Ein SimpleFeature erfuellt die
+ * Filter-Bedingung, wenn das Ergebnis des auf dem SimpleFeature ausgewerteten
* Operator-Baums ungleich 0 ist.
* @see FeatureOperationTree
* @see FeatureOperationTreeParser
@@ -44,14 +44,14 @@
* @version 1.0
*/
public class FeatureOperationTreeFilter extends AbstractFilterImpl {
- /** Formel, die auf dem Feature ausgewertet wird. */
+ /** Formel, die auf dem SimpleFeature ausgewertet wird. */
protected String rule = null;
/** Operator-Baum zur Formel {@link #rule}. */
protected FeatureOperationTree opTree = null;
/**
* Erstellt einen neuen Filter.
- * @param rule Formel, die auf dem Feature ausgewertet wird.
+ * @param rule Formel, die auf dem SimpleFeature ausgewertet wird.
* @see FeatureOperationTreeParser
*/
public FeatureOperationTreeFilter(String rule) {
@@ -60,7 +60,7 @@
/**
* Erstellt einen neuen Filter.
- * @param rule Formel, die auf dem Feature ausgewertet wird.
+ * @param rule Formel, die auf dem SimpleFeature ausgewertet wird.
* @param parser Parser, der aus der Formel einen Operator-Baum erstellt
*/
public FeatureOperationTreeFilter(String rule, FeatureOperationTreeParser parser) {
@@ -70,16 +70,16 @@
}
/**
- * Prueft, ob ein {@link Feature} dem Filter entspricht. Dies ist der Fall,
- * wenn das Formel-Ergebnis fuer das Feature ungleich 0 ist.
+ * Prueft, ob ein {@link SimpleFeature} dem Filter entspricht. Dies ist der Fall,
+ * wenn das Formel-Ergebnis fuer das SimpleFeature ungleich 0 ist.
*
* @param feature
- * zu ueberpruefendes Feature
- * @return {@code true}, wenn das Feature dem Filter entspricht
+ * zu ueberpruefendes SimpleFeature
+ * @return {@code true}, wenn das SimpleFeature dem Filter entspricht
*/
- public boolean evaluate(Feature feature) {
+ public boolean evaluate(SimpleFeature feature) {
// Exception sollte hier nicht ausgegeben werden, da bei allgemeinen Fehlern
-// die Exception fuer JEDES Feature ausgegeben wuerde!
+// die Exception fuer JEDES SimpleFeature ausgegeben wuerde!
// try{
Object result = opTree.evaluate(feature);
return result instanceof Boolean && (Boolean) result
@@ -91,17 +91,17 @@
}
/**
- * Prueft, ob ein {@link Feature} dem Filter entspricht. Dies ist der Fall,
- * wenn das Formel-Ergebnis fuer das Feature ungleich 0 ist.
- * @param feature zu ueberpruefendes Feature
+ * Prueft, ob ein {@link SimpleFeature} dem Filter entspricht. Dies ist der Fall,
+ * wenn das Formel-Ergebnis fuer das SimpleFeature ungleich 0 ist.
+ * @param feature zu ueberpruefendes SimpleFeature
* @return {@code true}, wenn die Auswertung
* @exception IllegalArgumentException wenn das uebergebene Objekt kein
- * {@link Feature} ist
+ * {@link SimpleFeature} ist
*/
public boolean evaluate(Object feature) {
- if ( feature != null && !(feature instanceof Feature) )
- throw new IllegalArgumentException("evaluate(Object) can only be applied to Feature objects: "+feature.getClass().getSimpleName());
- return evaluate((Feature)feature);
+ if ( feature != null && !(feature instanceof SimpleFeature) )
+ throw new IllegalArgumentException("evaluate(Object) can only be applied to SimpleFeature objects: "+feature.getClass().getSimpleName());
+ return evaluate((SimpleFeature)feature);
}
/**
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeParser.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeParser.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeParser.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -33,8 +33,8 @@
import schmitzm.lang.tree.OperationTreeParser;
/**
- * Diese Klasse stellt einen Parser fuer einen {@linkplain FeatureOperationTree Feature-Operatorbaum}
- * dar. Dieser erstellt einen {@linkplain FeatureOperationTree Feature-Operatorbaum} aus einem
+ * Diese Klasse stellt einen Parser fuer einen {@linkplain FeatureOperationTree SimpleFeature-Operatorbaum}
+ * dar. Dieser erstellt einen {@linkplain FeatureOperationTree SimpleFeature-Operatorbaum} aus einem
* Formel-String, der neben den in {@link OperationTreeParser} beschriebenen
* Komponenten Attribut-Referenzen enthalten darf.<br>
* <br>
@@ -53,7 +53,7 @@
*/
public class FeatureOperationTreeParser extends OperationTreeParser {
/**
- * Erstellt einen Feature-Operator-Baum aus einem Formel-String.
+ * Erstellt einen SimpleFeature-Operator-Baum aus einem Formel-String.
* @param rule Formel
*/
public FeatureOperationTree parse(String rule) {
@@ -66,7 +66,7 @@
/**
* Parst das naechste Literal aus dem Tokenizer {@link #tok}.
* Erweitert die Funktionalitaet der Oberklasse, so dass neben Konstanten
- * auch Referenznummern und -namen auf ein Feature-Attribut (eingeleitet
+ * auch Referenznummern und -namen auf ein SimpleFeature-Attribut (eingeleitet
* durch {@code #} und {@code $}) angegeben werden koennen.
*/
protected BinaryTreeNode parseLiteral() {
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTableModel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTableModel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTableModel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -32,15 +32,15 @@
import javax.swing.table.TableModel;
import org.geotools.feature.AttributeType;
-import org.geotools.feature.Feature;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import schmitzm.geotools.gui.GeotoolsGUIUtil;
import schmitzm.swing.table.AbstractTableModel;
import schmitzm.temp.BaseTypeUtil;
/**
- * Diese Klasse stellt ein {@link TableModel} auf einem einzelnen {@link Feature}
+ * Diese Klasse stellt ein {@link TableModel} auf einem einzelnen {@link SimpleFeature}
* dar. Dieses definiert drei Spalten:
* <ol>
* <li>Attribut-Name</li>
@@ -51,59 +51,59 @@
* @version 1.0
*/
public class FeatureTableModel extends AbstractTableModel {
- /** {@link Feature} das in der Tabelle dargestellt wird. */
- protected Feature feature = null;
- /** {@link FeatureType} der in der Tabelle dargestellt wird. */
- protected FeatureType featureType = null;
+ /** {@link SimpleFeature} das in der Tabelle dargestellt wird. */
+ protected SimpleFeature feature = null;
+ /** {@link SimpleFeatureType} der in der Tabelle dargestellt wird. */
+ protected SimpleFeatureType featureType = null;
/**
* Erstellt ein leeres Tabellen-Modell.
*/
public FeatureTableModel() {
- this((Feature)null);
+ this((SimpleFeature)null);
}
/**
* Erstellt ein neues Tabellen-Modell.
- * @param feature dargestelltes Feature
+ * @param feature dargestelltes SimpleFeature
*/
- public FeatureTableModel(Feature feature) {
+ public FeatureTableModel(SimpleFeature feature) {
this( feature != null ? feature.getFeatureType() : null);
setFeature( feature );
}
/**
* Erstellt ein neues Tabellen-Modell.
- * @param type ein FeatureType
+ * @param type ein SimpleFeatureType
*/
- public FeatureTableModel(FeatureType type) {
+ public FeatureTableModel(SimpleFeatureType type) {
super();
setFeature( type );
}
/**
- * Setzt das {@link Feature}, das in der Tabelle dargestellt wird.
- * @param feature {@link Feature}
+ * Setzt das {@link SimpleFeature}, das in der Tabelle dargestellt wird.
+ * @param feature {@link SimpleFeature}
*/
- public void setFeature(Feature feature) {
+ public void setFeature(SimpleFeature feature) {
this.feature = feature;
this.featureType = feature != null ? feature.getFeatureType() : null;
this.fireTableDataChanged();
}
/**
- * Setzt das {@link Feature}, das in der Tabelle dargestellt wird.
- * @param fType {@link FeatureType} fuer den eine Standard-Feature
+ * Setzt das {@link SimpleFeature}, das in der Tabelle dargestellt wird.
+ * @param fType {@link SimpleFeatureType} fuer den eine Standard-SimpleFeature
* angezeigt wird
*/
- public void setFeature(FeatureType fType) {
+ public void setFeature(SimpleFeatureType fType) {
try {
if ( fType != null )
setFeature(
fType.create( FeatureUtil.getDefaultAttributeValues(fType) )
);
else
- setFeature( (Feature)null );
+ setFeature( (SimpleFeature)null );
} catch (Exception err) {
throw new RuntimeException(err);
@@ -111,16 +111,16 @@
}
/**
- * Liefert den {@link FeatureType}, der in der Tabelle dargestellt wird.
+ * Liefert den {@link SimpleFeatureType}, der in der Tabelle dargestellt wird.
*/
- public FeatureType getFeatureType() {
+ public SimpleFeatureType getFeatureType() {
return this.featureType;
}
/**
- * Liefert das {@link Feature}, das in der Tabelle dargestellt wird.
+ * Liefert das {@link SimpleFeature}, das in der Tabelle dargestellt wird.
*/
- public Feature getFeature() {
+ public SimpleFeature getFeature() {
return this.feature;
}
@@ -138,7 +138,7 @@
/**
* Liefert die Anzahl an Zeilen. Diese entspricht der Anzahl an Attributen
- * des {@link Feature}.
+ * des {@link SimpleFeature}.
*/
public int getRowCount() {
return featureType != null ? featureType.getAttributeCount() : 0;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTypeBuilderTableModel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTypeBuilderTableModel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTypeBuilderTableModel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -44,11 +44,10 @@
import org.geotools.feature.AttributeType;
import org.geotools.feature.AttributeTypeFactory;
import org.geotools.feature.DefaultAttributeType;
-import org.geotools.feature.FeatureType;
import org.geotools.feature.FeatureTypeBuilder;
import org.geotools.feature.SchemaException;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.feature.type.GeometricAttributeType;
-import org.geotools.gui.swing.referencing.CoordinateTableModel.CellRenderer;
import schmitzm.geotools.gui.GeotoolsGUIUtil;
import schmitzm.swing.BooleanInputOption;
@@ -63,7 +62,7 @@
import com.vividsolutions.jts.geom.Polygon;
/**
- * Diese Klasse stellt ein {@link TableModel} auf einem "unfertigen" {@link FeatureType}
+ * Diese Klasse stellt ein {@link TableModel} auf einem "unfertigen" {@link SimpleFeatureType}
* dar. Dieses definiert vier Spalten:
* <ol>
* <li>Attribut-Name als Text-Eingabe</li>
@@ -116,16 +115,16 @@
/**
* Erstellt ein neues Tabellen-Modell.
- * @param type ein FeatureType, der editiert wird
+ * @param type ein SimpleFeatureType, der editiert wird
*/
- public FeatureTypeBuilderTableModel(FeatureType type) {
+ public FeatureTypeBuilderTableModel(SimpleFeatureType type) {
super();
setFeatureType(type);
}
/**
* Erstellt ein neues Tabellen-Modell.
- * @param type ein FeatureType, der editiert wird
+ * @param type ein SimpleFeatureType, der editiert wird
*/
public FeatureTypeBuilderTableModel(FeatureTypeBuilder builder) {
super();
@@ -212,11 +211,11 @@
/**
* Setzt den {@link FeatureTypeBuilder}, der in der Tabelle dargestellt wird.
- * Dieser wird mit den Attributen des angegebenen {@link FeatureType}
+ * Dieser wird mit den Attributen des angegebenen {@link SimpleFeatureType}
* initialisiert
- * @param ftype {@link FeatureType}
+ * @param ftype {@link SimpleFeatureType}
*/
- public void setFeatureType(FeatureType ftype) {
+ public void setFeatureType(SimpleFeatureType ftype) {
if ( ftype != null ) {
FeatureTypeBuilder builder = FeatureTypeBuilder.newInstance(ftype.getTypeName());
builder.addTypes(ftype.getAttributeTypes());
@@ -226,10 +225,10 @@
}
/**
- * Erzeugt einen neuen {@link FeatureType}, aus den in der Tabelle dargestellen
+ * Erzeugt einen neuen {@link SimpleFeatureType}, aus den in der Tabelle dargestellen
* Attributen.
*/
- public FeatureType createFeatureType() {
+ public SimpleFeatureType createFeatureType() {
try {
// this.featureTypeBuilder.removeAll(); // does not work because of BUG in gt2-2.4.4
for (;featureTypeBuilder.getAttributeCount() >0;)
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTypeTableModel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTypeTableModel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTypeTableModel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -34,22 +34,22 @@
import javax.swing.table.TableModel;
import org.geotools.feature.AttributeType;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeatureType;
import schmitzm.geotools.gui.GeotoolsGUIUtil;
import schmitzm.swing.table.AbstractTableModel;
/**
- * Diese Klasse stellt ein {@link TableModel} auf einem {@link FeatureType}
+ * Diese Klasse stellt ein {@link TableModel} auf einem {@link SimpleFeatureType}
* dar. Dieses definiert zwei Spalten, in denen der Name (0) und der
* Typ (1) der Attribute dargestellt werden.
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
* @version 1.0
*/
public class FeatureTypeTableModel extends AbstractTableModel {
- /** {@link FeatureType} das in der Tabelle dargestellt wird. */
- protected FeatureType featureType = null;
+ /** {@link SimpleFeatureType} das in der Tabelle dargestellt wird. */
+ protected SimpleFeatureType featureType = null;
/** Bestimmt die angezeigten Features */
protected AttributeTypeFilter attrFilter = AttributeTypeFilter.ALL;
@@ -65,18 +65,18 @@
/**
* Erstellt ein neues Tabellen-Modell.
- * @param type ein FeatureType
+ * @param type ein SimpleFeatureType
*/
- public FeatureTypeTableModel(FeatureType type) {
+ public FeatureTypeTableModel(SimpleFeatureType type) {
super();
setFeatureType( type );
}
/**
- * Setzt den {@link FeatureType}, der in der Tabelle dargestellt wird.
- * @param ftype {@link FeatureType}
+ * Setzt den {@link SimpleFeatureType}, der in der Tabelle dargestellt wird.
+ * @param ftype {@link SimpleFeatureType}
*/
- public void setFeatureType(FeatureType ftype) {
+ public void setFeatureType(SimpleFeatureType ftype) {
this.featureType = ftype;
// Attribut-Typen in Array speichern
attrTypes.clear();
@@ -107,9 +107,9 @@
}
/**
- * Liefert den {@link FeatureType}, der in der Tabelle dargestellt wird.
+ * Liefert den {@link SimpleFeatureType}, der in der Tabelle dargestellt wird.
*/
- public FeatureType getFeatureType() {
+ public SimpleFeatureType getFeatureType() {
return this.featureType;
}
@@ -128,7 +128,7 @@
/**
* Liefert die Anzahl an Zeilen. Diese entspricht der Anzahl an Attributen
- * des {@link FeatureType}.
+ * des {@link SimpleFeatureType}.
*/
public int getRowCount() {
return /*featureType*/attrTypes != null ? attrTypes.size() : 0;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureUtil.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureUtil.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -56,14 +56,14 @@
import org.geotools.feature.AttributeTypeFactory;
import org.geotools.feature.DefaultFeatureCollection;
import org.geotools.feature.DefaultFeatureCollections;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.FeatureType;
import org.geotools.feature.FeatureTypeBuilder;
import org.geotools.feature.GeometryAttributeType;
import org.geotools.feature.IllegalAttributeException;
import org.geotools.feature.SchemaException;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.feature.type.GeometricAttributeType;
import org.geotools.filter.FilterFactory;
import org.geotools.map.MapLayer;
@@ -160,10 +160,10 @@
private static HashMap<AttributeType, AutoValueGenerator> autoAttrValueGenerators = new HashMap<AttributeType, AutoValueGenerator>();
/**
- * Determines the kind of geometry of a {@link FeatureType}.
+ * Determines the kind of geometry of a {@link SimpleFeatureType}.
* @param fType a feature type
*/
- public static GeometryForm getGeometryForm(FeatureType fType) {
+ public static GeometryForm getGeometryForm(SimpleFeatureType fType) {
if ( fType.getDefaultGeometry() == null )
return null;
@@ -220,11 +220,11 @@
}
/**
- * Extrahiert alle Geometrien aus einem Feature.
- * @param f Feature
- * @return Array aller Geometrien im Feature.
+ * Extrahiert alle Geometrien aus einem SimpleFeature.
+ * @param f SimpleFeature
+ * @return Array aller Geometrien im SimpleFeature.
*/
- public static Geometry[] extractGeometriesToGeometry(Feature f) {
+ public static Geometry[] extractGeometriesToGeometry(SimpleFeature f) {
Vector<Object> geomVec = new Vector<Object>();
for (int j=0; j<f.getFeatureType().getAttributeCount(); j++)
@@ -249,7 +249,7 @@
FeatureIterator fi = fc.features();
for (;fi.hasNext();) {
- Feature f = fi.next();
+ SimpleFeature f = fi.next();
result.add( f.getDefaultGeometry() );
}
return result;
@@ -359,23 +359,23 @@
/**
- * Erzeugt einen Array von {@link Feature Features} auf einer
+ * Erzeugt einen Array von {@link SimpleFeature Features} auf einer
* {@link FeatureCollection}.<br>
* Aufgrund von Problemen bei der Verwendung von Filtern ({@code .size()} liefert
* nicht die Anzahl der gefilterten Features; {@code .toArray} liefert
* manchmal {@code null}), wird der Array "naiv" ueber Durchlaufen
* eines {@link FeatureIterator} kopiert.
- * @param fc eine Feature Collection
+ * @param fc eine SimpleFeature Collection
* @return einen leeren Array, wenn die Collection leer oder {@code null} ist
*/
- public static Feature[] featuresToArray(FeatureCollection fc) {
+ public static SimpleFeature[] featuresToArray(FeatureCollection fc) {
// if ( fc == null || fc.size() == 0 ) // bei leerer FC klappt .toArray nicht!!
-// return new Feature[0];
-// Feature[] featureArray = (Feature[])fc.toArray(new Feature[0]);
+// return new SimpleFeature[0];
+// SimpleFeature[] featureArray = (SimpleFeature[])fc.toArray(new SimpleFeature[0]);
// if ( featureArray != null )
// return featureArray;
// // Sonst "naiv" kopieren
-// featureArray = new Feature[fc.size()];
+// featureArray = new SimpleFeature[fc.size()];
// FeatureIterator fi = fc.features();
// for (int i=0; fi.hasNext(); i++)
// featureArray[i] = fi.next();
@@ -384,42 +384,42 @@
}
/**
- * Erzeugt einen Array von {@link Feature Features} auf einer
+ * Erzeugt einen Array von {@link SimpleFeature Features} auf einer
* {@link FeatureCollection}.
* @param fc
- * eine Feature Collection
+ * eine SimpleFeature Collection
* @param
* includeNullFeatures
* wenn {@code false} werden NULL-Features in der Collection nicht in den
* Array kopiert
* @return einen leeren Array, wenn die Collection leer oder {@code null} ist
*/
- public static Feature[] featuresToArray(FeatureCollection fc, boolean includeNullFeatures) {
+ public static SimpleFeature[] featuresToArray(FeatureCollection fc, boolean includeNullFeatures) {
// if ( includeNullFeatures )
// return featuresToArray(fc);
if ( fc == null )
- return new Feature[0];
+ return new SimpleFeature[0];
// Naiv alle Features durchgehen.
- Vector<Feature> fv = new Vector<Feature>();
+ Vector<SimpleFeature> fv = new Vector<SimpleFeature>();
FeatureIterator fi = fc.features();
for (int i=0; fi.hasNext(); i++) {
- Feature f = fi.next();
+ SimpleFeature f = fi.next();
if ( includeNullFeatures || f != null )
fv.add(f);
}
- return fv.toArray(new Feature[0]);
+ return fv.toArray(new SimpleFeature[0]);
}
/**
- * Clones an {@link FeatureType}.
+ * Clones an {@link SimpleFeatureType}.
* @param fType type to clone
* @param fTypeName the name for the clone (if {@code null} the name is
* taken from {@code fType})
* @param nillable nillable property for <b>all</b> attributes (if {@code null} the
* nillable property is taken individually from the source attributes)
*/
- public static FeatureType cloneFeatureType(FeatureType fType, String fTypeName, Boolean nillable) throws SchemaException {
+ public static SimpleFeatureType cloneFeatureType(SimpleFeatureType fType, String fTypeName, Boolean nillable) throws SchemaException {
if ( fTypeName == null )
fTypeName = fType.getTypeName();
@@ -471,22 +471,22 @@
/**
* Erweitert das Schema einer {@link FeatureCollection} um eine Reihe von
* Attributen.
- * @param fType zu erweiterndes Feature-Schema
+ * @param fType zu erweiterndes SimpleFeature-Schema
* @param aTypes Typen der neuen Attribute
- * @return eine <b>neue</b> Instanz von {@link FeatureType}
- * @throws SchemaException falls das Erweitern des Feature-Schemas scheitert
+ * @return eine <b>neue</b> Instanz von {@link SimpleFeatureType}
+ * @throws SchemaException falls das Erweitern des SimpleFeature-Schemas scheitert
* @throws NullPointerException falls {@code fType = null}
*/
- public static FeatureType extendFeatureType(FeatureType fType, AttributeType... aTypes) throws SchemaException {
+ public static SimpleFeatureType extendFeatureType(SimpleFeatureType fType, AttributeType... aTypes) throws SchemaException {
//BEMERKUNG: Folgende Methode funktioniert, fuegt die abgeleiteten (alten)
// Attribute aber hinten an die neuen Attribute an. Dies ist
// nicht gewuenscht und erschwert auch den Aufbau des fValues-Array
-// FeatureType resultType = FeatureTypeBuilder.newFeatureType(
+// SimpleFeatureType resultType = FeatureTypeBuilder.newFeatureType(
// aTypes, // new Attributes
// fType.getTypeName(), // new type name
// null, // namespace
// false, // abstact?
-// new FeatureType[] { fType },
+// new SimpleFeatureType[] { fType },
// null
// );
FeatureTypeBuilder builder = FeatureTypeBuilder.newInstance(fType.getTypeName());
@@ -507,11 +507,11 @@
null
));
}
- FeatureType resultType = builder.getFeatureType();
+ SimpleFeatureType resultType = builder.getFeatureType();
// As long as DataUtilities.defaultValue(AttributeType) does
// not handle the default value correctly for not-nillable
- // attributes, create a new FeatureType with all attributes
+ // attributes, create a new SimpleFeatureType with all attributes
// nillable
// not necessary as long a correct default value can be created
// in createFeatureType(ResultSetMetaData, ...)
@@ -521,39 +521,39 @@
}
/**
- * Orderes {@link Feature Features} according to an attribute (ascending).
+ * Orderes {@link SimpleFeature Features} according to an attribute (ascending).
* @param fi the features to order
* @param attrName the attribute to order by
* @return a list of ordered features
*/
- public static Vector<Feature> sortFeatures(FeatureCollection fc, String attrName) {
+ public static Vector<SimpleFeature> sortFeatures(FeatureCollection fc, String attrName) {
return sortFeatures(fc.features(), attrName);
}
/**
- * Orderes {@link Feature Features} according to an attribute (ascending).
+ * Orderes {@link SimpleFeature Features} according to an attribute (ascending).
* @param fi an iterator for the features
* @param attrName the attribute to order by
* @return a list of ordered features
*/
- public static Vector<Feature> sortFeatures(FeatureIterator fi, String attrName) {
+ public static Vector<SimpleFeature> sortFeatures(FeatureIterator fi, String attrName) {
// First create a SortedMap with CollisionList
- SortedMap<Comparable<?>, Vector<Feature>> sortedFeatureLists = new TreeMap<Comparable<?>, Vector<Feature>>();
+ SortedMap<Comparable<?>, Vector<SimpleFeature>> sortedFeatureLists = new TreeMap<Comparable<?>, Vector<SimpleFeature>>();
for (;fi.hasNext();) {
- Feature f = fi.next();
+ SimpleFeature f = fi.next();
// Check whether attribute value is Comparable
Object attrValue = f.getAttribute(attrName);
if ( attrValue != null && !(attrValue instanceof Comparable) )
- throw new UnsupportedOperationException("Feature sort only supported for Comparable attributes: "+LangUtil.getSimpleClassName(attrValue));
+ throw new UnsupportedOperationException("SimpleFeature sort only supported for Comparable attributes: "+LangUtil.getSimpleClassName(attrValue));
// Determine X value as sort attribute (NULL not permitted for XYDateset!)
Comparable<?> xValue = (Comparable<?>)attrValue;
if ( xValue == null )
continue;
// Check whether collision list exists
- Vector<Feature> collList = sortedFeatureLists.get(xValue);
+ Vector<SimpleFeature> collList = sortedFeatureLists.get(xValue);
if ( collList == null ) {
- collList = new Vector<Feature>();
+ collList = new Vector<SimpleFeature>();
sortedFeatureLists.put(xValue, collList);
}
// Add feature to collision list
@@ -562,9 +562,9 @@
// Put the (now ordered) features from the collision lists
// into an temporary list to create a list of Features
- Vector<Feature> sortedFeatures = new Vector<Feature>();
- for (Vector<Feature> collList : sortedFeatureLists.values())
- for (Feature f : collList)
+ Vector<SimpleFeature> sortedFeatures = new Vector<SimpleFeature>();
+ for (Vector<SimpleFeature> collList : sortedFeatureLists.values())
+ for (SimpleFeature f : collList)
sortedFeatures.add(f);
return sortedFeatures;
@@ -576,14 +576,14 @@
* @param fc zu erweiternde FeatureCollection
* @param aTypes Typen der neuen Attribute
* @return eine <b>neue</b> Instanz von {@link FeatureCollection}
- * @throws SchemaException falls das Erweitern des Feature-Schemas scheitert
+ * @throws SchemaException falls das Erweitern des SimpleFeature-Schemas scheitert
* @throws IllegalAttributeException falls das Einfuegen der Features in die
* neue {@link FeatureCollection} scheitert
*/
public static FeatureCollection extendFeatureCollection(FeatureCollection fc, AttributeType... aTypes) throws SchemaException, IllegalAttributeException {
// Schema erstellen
- FeatureType fType = fc.getSchema();
- FeatureType resultType = extendFeatureType( fType, aTypes );
+ SimpleFeatureType fType = fc.getSchema();
+ SimpleFeatureType resultType = extendFeatureType( fType, aTypes );
// Neue Collection erstellen
FeatureCollection resultFc = DefaultFeatureCollections.newCollection();
@@ -596,7 +596,7 @@
// Default-Werte der neuen Attribute in Array schreiben
for ( int i=fType.getAttributeCount(); i<fValues.length; i++)
fValues[i] = resultType.getAttributeType(i).createDefaultValue();
- // Erweitertes Feature erzeugen und FeatureCollection fuellen
+ // Erweitertes SimpleFeature erzeugen und FeatureCollection fuellen
resultFc.add( resultType.create( fValues ) );
}
@@ -619,7 +619,7 @@
* @param projAttr Attribute (von {@code fc1} und {@code fc2}), die in das
* Ergebnis übernommen werden (Projektion)
* @return eine <b>neue</b> Instanz von {@link FeatureCollection}
- * @throws SchemaException falls das Erweitern des Feature-Schemas scheitert
+ * @throws SchemaException falls das Erweitern des SimpleFeature-Schemas scheitert
* @throws IllegalAttributeException falls das Einfuegen der Features in die
* neue {@link FeatureCollection} scheitert
*/
@@ -643,9 +643,9 @@
boolean projection = projAttr.length > 0;
// Schema erstellen
- FeatureType fType1 = fc1.getSchema();
- FeatureType fType2 = fc2.getSchema();
- FeatureType resultType = null;
+ SimpleFeatureType fType1 = fc1.getSchema();
+ SimpleFeatureType fType2 = fc2.getSchema();
+ SimpleFeatureType resultType = null;
if ( fType1 == null )
throw new UnsupportedOperationException("JOIN can not be performed. FeatureCollection 1 seems to be empty.");
if ( fType2 == null )
@@ -656,11 +656,11 @@
throw new UnsupportedOperationException("JOIN can not be performed. FeatureCollection 2 does not contain the JOIN-Attribute: "+joinAttr2);
// Wenn keine Projektion, dann alle Attribute von fc1 mit denen
- // von fc2 vereinen; sonst neuen FeatureType aufbauen
+ // von fc2 vereinen; sonst neuen SimpleFeatureType aufbauen
if ( !projection )
resultType = extendFeatureType(fType1, fType2.getAttributeTypes());
else {
- // Leeren Feature-Type erzeugen
+ // Leeren SimpleFeature-Type erzeugen
FeatureTypeBuilder builder = FeatureTypeBuilder.newInstance(fType1.getTypeName());
// Projektions-Attribute hinzufuegen
for (String attrName : projAttr) {
@@ -672,11 +672,11 @@
// zweite Wahl: Attribut von fc1 uebernehmen
if ( aType == null )
aType = fType1.getAttributeType(attrName);
- // Attribut in den FeatureType einfuegen
+ // Attribut in den SimpleFeatureType einfuegen
if ( aType != null )
builder.addType( aType );
}
- // FeatureType erzeugen
+ // SimpleFeatureType erzeugen
resultType = builder.getFeatureType();
}
@@ -689,7 +689,7 @@
// NestedLoopJoin: Alle Features der ersten Collection durchgehen
// und die passenden in der zweiten Collection suchen
AttributeFilter filter = compareOp.clone();
- for (Feature f1 = null; fi.hasNext(); ) {
+ for (SimpleFeature f1 = null; fi.hasNext(); ) {
f1 = fi.next();
// Werte der 1. Features in Array schreiben
if ( !projection )
@@ -705,25 +705,25 @@
FeatureIterator joinedFeatures = fc2.subCollection(filter).features();
// Wenn LEFT-OUTER-JOIN und JOIN nicht erfolgreich, ein Dummy
- // Feature mit Default-Werten in die Collection einfuegen
+ // SimpleFeature mit Default-Werten in die Collection einfuegen
// Sonst: JOIN-Paare "normal" bilden
if ( !joinedFeatures.hasNext() && joinType == JoinType.LEFT_OUTER ) {
if ( !projection )
getDefaultAttributeValues(fType2,fValues,fType1.getAttributeCount());
else
getDefaultAttributeValues(fType2,fValues,0,projAttr);
- // Erweitertes Feature erzeugen und FeatureCollection fuellen
+ // Erweitertes SimpleFeature erzeugen und FeatureCollection fuellen
resultFc.add( resultType.create( fValues ) );
} else {
- for (Feature f2 = null; joinedFeatures.hasNext(); ) {
+ for (SimpleFeature f2 = null; joinedFeatures.hasNext(); ) {
f2 = joinedFeatures.next();
// Werte der 2. Features in Array schreiben
if ( !projection )
getAttributeValues(f2,fValues,fType1.getAttributeCount());
else
getAttributeValues(f2,fValues,0,projAttr);
- // Erweitertes Feature erzeugen und FeatureCollection fuellen
- Feature feature = resultType.create( fValues );
+ // Erweitertes SimpleFeature erzeugen und FeatureCollection fuellen
+ SimpleFeature feature = resultType.create( fValues );
resultFc.add( feature );
}
}
@@ -749,7 +749,7 @@
* @param projAttr Attribute (von {@code fc1} und {@code fc2}), die in das
* Ergebnis übernommen werden (Projektion)
* @return eine <b>neue</b> Instanz von {@link FeatureCollection}
- * @throws SchemaException falls das Erweitern des Feature-Schemas scheitert
+ * @throws SchemaException falls das Erweitern des SimpleFeature-Schemas scheitert
* @throws IllegalAttributeException falls das Einfuegen der Features in die
* neue {@link FeatureCollection} scheitert
*/
@@ -767,7 +767,7 @@
* @param projAttr Attribute (von {@code fc1} und {@code fc2}), die in das
* Ergebnis übernommen werden (Projektion)
* @return eine <b>neue</b> Instanz von {@link FeatureCollection}
- * @throws SchemaException falls das Erweitern des Feature-Schemas scheitert
+ * @throws SchemaException falls das Erweitern des SimpleFeature-Schemas scheitert
* @throws IllegalAttributeException falls das Einfuegen der Features in die
* neue {@link FeatureCollection} scheitert
* @see #joinFeatureCollection(FeatureCollection, String, AttributeFilter, FeatureCollection, String)
@@ -778,17 +778,17 @@
}
/**
- * Liefert die Default-Werte fuer alle Attribute eines {@link FeatureType}.
- * @param ft ein Feature-Type
+ * Liefert die Default-Werte fuer alle Attribute eines {@link SimpleFeatureType}.
+ * @param ft ein SimpleFeature-Type
*/
- public static Object[] getDefaultAttributeValues(FeatureType ft) {
+ public static Object[] getDefaultAttributeValues(SimpleFeatureType ft) {
return getDefaultAttributeValues(ft,null,0);
}
/**
* Liefert die Default-Werte fuer eine Reihen von Attributwerten
* eines FeatureTypes.
- * @param ft ein Feature-Type
+ * @param ft ein SimpleFeature-Type
* @param destArray Array, in dem die Objekte abgelegt werden (wenn {@code null},
* wird ein neuer Array erzeugt)
* @param destStartIdx Start-Index in {@code destArray} ab dem die Attributwerte
@@ -796,7 +796,7 @@
* @param attrName Attribute aus {@link f}
* @return {@code destArray} oder einen neuen Array {@code Object[destStartIdx + attrName.length]}
*/
- public static Object[] getDefaultAttributeValues(FeatureType ft, Object[] destArray, int destStartIdx, String... attrName) {
+ public static Object[] getDefaultAttributeValues(SimpleFeatureType ft, Object[] destArray, int destStartIdx, String... attrName) {
// Wenn keine Attribute angegeben sind, alle verwenden
int attrCount = attrName.length > 0 ? attrName.length : ft.getAttributeCount();
@@ -808,7 +808,7 @@
// Wenn keine Attribute angegeben sind, alle verwenden
for (int i=0; i<attrCount; i++) {
AttributeType attrType = attrName.length > 0 ? ft.getAttributeType(attrName[i]) : ft.getAttributeType(i);
- // wenn attrType = null, dann gibt es das Attribut im FeatureType nicht
+ // wenn attrType = null, dann gibt es das Attribut im SimpleFeatureType nicht
// -> destArray nicht ueberschreiben
if ( attrType != null )
destArray[ destStartIdx+i ] = getDefaultAttributeValue(attrType);
@@ -868,7 +868,7 @@
/**
* Liefert eine Reihen von Attributwerten eines Features.
- * @param f ein Feature
+ * @param f ein SimpleFeature
* @param destArray Array, in dem die Objekte abgelegt werden (wenn {@code null},
* wird ein neuer Array erzeugt)
* @param destStartIdx Start-Index in {@code destArray} ab dem die Attributwerte
@@ -877,7 +877,7 @@
* {@code null} werden alle Attribute geliefert)
* @return {@code destArray} oder einen neuen Array {@code Object[destStartIdx + attrName.length]}
*/
- public static Object[] getAttributeValues(Feature f, Object[] destArray, int destStartIdx, String... attrName) {
+ public static Object[] getAttributeValues(SimpleFeature f, Object[] destArray, int destStartIdx, String... attrName) {
if ( destArray == null )
destArray = new Object[destStartIdx + attrName.length];
if ( destArray.length < destStartIdx + attrName.length )
@@ -887,7 +887,7 @@
int attrCount = attrName.length > 0 ? attrName.length : f.getNumberOfAttributes();
for (int i=0; i<attrCount; i++) {
Object attr = attrName.length > 0 ? f.getAttribute(attrName[i]) : f.getAttribute(i);
- // wenn attr = null, dann gibt es das Attribut im Feature nicht
+ // wenn attr = null, dann gibt es das Attribut im SimpleFeature nicht
// -> destArray nicht ueberschreiben
if ( attr != null )
destArray[ destStartIdx+i ] = attr;
@@ -897,25 +897,25 @@
/**
* Liefert eine Reihen von Attributwerten eines Features.
- * @param f ein Feature
+ * @param f ein SimpleFeature
* @param attrName Attribute des Features, deren Werte geliefert werden (wenn
* {@code null} werden alle Attribute geliefert)
* @return neuer Array {@code Object[attrName.length]}
*/
- public static Object[] getAttributeValues(Feature f, String... attrName) {
+ public static Object[] getAttributeValues(SimpleFeature f, String... attrName) {
return getAttributeValues(f,null,0,attrName);
}
/**
* Liefert eine Reihen von Attributwerten eines Features.
- * @param f ein Feature
+ * @param f ein SimpleFeature
* @param destMap Map, in dem die Objekte abgelegt werden (wenn {@code null},
* wird eine neue {@link HashMap} erzeugt)
* @param attrName Attribute des Features, deren Werte geliefert werden (wenn
* {@code null} werden alle Attribute geliefert)
* @return {@code destArray} oder einen neuen Array {@code Object[destStartIdx + attrName.length]}
*/
- public static Map<String,Object> getAttributeValues(Feature f, Map<String,Object> destMap, String... attrName) {
+ public static Map<String,Object> getAttributeValues(SimpleFeature f, Map<String,Object> destMap, String... attrName) {
if ( destMap == null )
destMap = new HashMap<String,Object>();
@@ -940,7 +940,7 @@
* @param rs ResultSet mit Zusatz-Informationen
* @param rsJoinAttr JOIN-Attribut im ResultSet
* @return eine <b>neue</b> Instanz von {@link FeatureCollection}
- * @throws SchemaException falls das Erweitern des Feature-Schemas scheitert
+ * @throws SchemaException falls das Erweitern des SimpleFeature-Schemas scheitert
* @throws IllegalAttributeException falls das Einfuegen der Features in die
* neue {@link FeatureCollection} scheitert
*/
@@ -960,7 +960,7 @@
* @param rs ResultSet mit Zusatz-Informationen
* @param rsJoinAttr JOIN-Attribut im ResultSet
* @return eine <b>neue</b> Instanz von {@link FeatureCollection}
- * @throws SchemaException falls das Erweitern des Feature-Schemas scheitert
+ * @throws SchemaException falls das Erweitern des SimpleFeature-Schemas scheitert
* @throws IllegalAttributeException falls das Einfuegen der Features in die
* neue {@link FeatureCollection} scheitert
*/
@@ -982,7 +982,7 @@
* @param rs ResultSet mit Zusatz-Informationen
* @param rsJoinAttr JOIN-Attribut im ResultSet
* @return eine <b>neue</b> Instanz von {@link FeatureCollection}
- * @throws SchemaException falls das Erweitern des Feature-Schemas scheitert
+ * @throws SchemaException falls das Erweitern des SimpleFeature-Schemas scheitert
* @throws IllegalAttributeException falls das Einfuegen der Features in die
* neue {@link FeatureCollection} scheitert
*/
@@ -1029,12 +1029,12 @@
* uebernommen (wenn nicht angegeben, werden ALLE Attribute
* uebernommen)
* @throws SQLException falls der Zugriff auf die SQL-Metadaten scheitert
- * @throws SchemaException falls das Erzeugen des FeatureType scheitert
+ * @throws SchemaException falls das Erzeugen des SimpleFeatureType scheitert
* @throws IllegalAttributeException falls das Erzeugen eines Features scheitert
*/
public static FeatureCollection createFeatureCollection(ResultSet rs, String... projAttr) throws SchemaException, IllegalAttributeException, SQLException {
// Schema der FeatureCollection erzeugen
- FeatureType rsFeatureType = createFeatureType(rs.getMetaData(),projAttr);
+ SimpleFeatureType rsFeatureType = createFeatureType(rs.getMetaData(),projAttr);
// Array fuer die Attribut-Werte eines Features
Object[] rsFeatureValues = new Object[rsFeatureType.getAttributeCount()];
@@ -1051,15 +1051,15 @@
}
/**
- * Erzeugt einen {@link FeatureType} aus einem {@linkplain ResultSetMetaData SQL-Result}.
+ * Erzeugt einen {@link SimpleFeatureType} aus einem {@linkplain ResultSetMetaData SQL-Result}.
* @param metaData SQL-Metadaten des {@link ResultSet}
- * @param projAttr nur diese Attribute des ResultSet werden in den FeatureType
+ * @param projAttr nur diese Attribute des ResultSet werden in den SimpleFeatureType
* uebernommen (wenn nicht angegeben, werden ALLE
* Attribute uebernommen)
* @throws SQLException falls der Zugriff auf die SQL-Metadaten scheitert
- * @throws SchemaException falls das Erzeugen des FeatureType scheitert
+ * @throws SchemaException falls das Erzeugen des SimpleFeatureType scheitert
*/
- public static FeatureType createFeatureType(ResultSetMetaData metaData, String... projAttr) throws SQLException, SchemaException {
+ public static SimpleFeatureType createFeatureType(ResultSetMetaData metaData, String... projAttr) throws SQLException, SchemaException {
try {
return createFeatureType(metaData, null, Object.class, projAttr);
} catch (ClassNotFoundException err) {
@@ -1071,22 +1071,22 @@
}
/**
- * Erzeugt einen {@link FeatureType} aus einem {@linkplain ResultSet SQL-Result}.
+ * Erzeugt einen {@link SimpleFeatureType} aus einem {@linkplain ResultSet SQL-Result}.
* @param metaData SQL-Metadaten des {@link ResultSet}
- * @param featureTypeName Name fuer den FeatureType (kann {@code null} sein)
+ * @param featureTypeName Name fuer den SimpleFeatureType (kann {@code null} sein)
* @param defaultAttrClass Klasse, die verwendet als Attribut-Typ wird, wenn
* die entsprechende Klasse des ResultSet nicht zur
* Verfuegung steht (wenn {@code null}, wird eine
* Exception geworfen)
- * @param projAttr nur diese Attribute des ResultSet werden in den FeatureType
+ * @param projAttr nur diese Attribute des ResultSet werden in den SimpleFeatureType
* uebernommen (wenn nicht angegeben, werden ALLE
* Attribute uebernommen)
* @throws SQLException falls der Zugriff auf die SQL-Metadaten scheitert
- * @throws SchemaException falls das Erzeugen des FeatureType scheitert
+ * @throws SchemaException falls das Erzeugen des SimpleFeatureType scheitert
* @throws ClassNotFoundException falls eine Attribut-Klasse aus dem ResultSet
* nicht erzeugt werden kann und keine Default-Klasse angegeben ist
*/
- public static FeatureType createFeatureType(ResultSetMetaData metaData, String featureTypeName, Class defaultAttrClass, String... projAttr) throws SQLException, SchemaException, ClassNotFoundException {
+ public static SimpleFeatureType createFeatureType(ResultSetMetaData metaData, String featureTypeName, Class defaultAttrClass, String... projAttr) throws SQLException, SchemaException, ClassNotFoundException {
if ( featureTypeName == null )
featureTypeName = "ResultSetFeatureType";
@@ -1096,7 +1096,7 @@
projAttrList.add(attrName);
// Fuer alle Attribute aus Metadaten einen AttributeType erzeugen
- // und diesen in FeatureType uebernehmen
+ // und diesen in SimpleFeatureType uebernehmen
FeatureTypeBuilder featureTypeFac = FeatureTypeBuilder.newInstance(featureTypeName);
for (int i=1; i<=metaData.getColumnCount(); i++) {
String columnName = metaData.getColumnName(i);
@@ -1118,7 +1118,7 @@
if ( defaultValue == null && !nillable)
LOGGER.warn("Could not create default value for not-null attribute '"+columnName+"': "+columnClass.getSimpleName());
- // Add an attribute for the column to the FeatureType
+ // Add an attribute for the column to the SimpleFeatureType
featureTypeFac.addType( AttributeTypeFactory.newAttributeType(
columnName,
columnClass,
@@ -1132,16 +1132,16 @@
}
/**
- * Erzeugt einen {@link FeatureType} aus Beispiel-Attribut-Werten.
- * @param featureTypeName Name fuer den FeatureType (kann {@code null} sein)
+ * Erzeugt einen {@link SimpleFeatureType} aus Beispiel-Attribut-Werten.
+ * @param featureTypeName Name fuer den SimpleFeatureType (kann {@code null} sein)
* @param attrValues Attribut-Werte
* @param defaultAttrClass Standard-Typ, der fuer ein Attribut verwendet wird,
* wenn der angegebene Attribut-Wert {@code null} ist.
- * @throws SchemaException falls das Erzeugen des FeatureType scheitert
+ * @throws SchemaException falls das Erzeugen des SimpleFeatureType scheitert
*/
- public static FeatureType createFeatureType(String featureTypeName, Map<String,Object> attrValues, Class defaultAttrClass) throws SchemaException {
+ public static SimpleFeatureType createFeatureType(String featureTypeName, Map<String,Object> attrValues, Class defaultAttrClass) throws SchemaException {
if ( featureTypeName == null )
- featureTypeName = "FeatureType";
+ featureTypeName = "SimpleFeatureType";
FeatureTypeBuilder featureTypeFac = FeatureTypeBuilder.newInstance(featureTypeName);
for (String attrName : attrValues.keySet()) {
@@ -1217,25 +1217,25 @@
/**
- * Creates a sample Feature instance of the given {@link FeatureType}
+ * Creates a sample SimpleFeature instance of the given {@link SimpleFeatureType}
*
* @param schema
- * the schema for which to create a sample Feature instance
+ * the schema for which to create a sample SimpleFeature instance
*
* @author SK
*
* @throws IllegalAttributeException
*
*/
- public static Feature createSampleFeature(FeatureType schema) {
- Feature sampleFeature;
+ public static SimpleFeature createSampleFeature(SimpleFeatureType schema) {
+ SimpleFeature sampleFeature;
Object[] attributes = getDefaultAttributeValues(schema);
try {
sampleFeature = schema.create(attributes);
} catch (IllegalAttributeException e) {
- // Thrown if the FeatureType does not validate the attributes
+ // Thrown if the SimpleFeatureType does not validate the attributes
// Not very likely if we just create a sample feature, so we make it
// a runtime exception.
throw new RuntimeException(e);
@@ -1268,7 +1268,7 @@
// * (<code>JTSGeometries</code>) angelegt, in der die Geometrien des jeweiligen
// * Attributs zusammengefasst werden.
// * @param fc FeatureCollection
-// * @return Array aller Geometrien im Feature.
+// * @return Array aller Geometrien im SimpleFeature.
// * @see org.geotools.feature.FeatureCollection
// * @see org.geotools.renderer.geom.JTSGeometries
// */
@@ -1281,11 +1281,11 @@
//
// // alle Features nach Geometrien durchsuchen
// for (int i=0; it.hasNext(); i++) {
-// Feature f = it.next();
+// SimpleFeature f = it.next();
//
// // Das erste Geometry-Attribut des Features wird in GeometryCollection
// // eins gespeichert, das zweite in der zweiten, usw.
-// // Bei jedem Feature wird also wieder von vorne begonnen.
+// // Bei jedem SimpleFeature wird also wieder von vorne begonnen.
// nextGCIdx = 0;
//
// // Alle Attribute auf Geometrien checken
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/PipedFeatureIterator.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/PipedFeatureIterator.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/PipedFeatureIterator.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -32,8 +32,8 @@
import java.util.Iterator;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureIterator;
+import org.geotools.feature.SimpleFeature;
/**
* This class is a workaround since {@link FeatureIterator} does not
@@ -44,7 +44,7 @@
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a>
*
*/
-public class PipedFeatureIterator implements Iterator<Feature> {
+public class PipedFeatureIterator implements Iterator<SimpleFeature> {
/** Holds the {@link FeatureIterator} which is piped. */
protected FeatureIterator fIter = null;
@@ -65,10 +65,10 @@
}
/**
- * Returns the next Feature;
+ * Returns the next SimpleFeature;
*/
@Override
- public Feature next() {
+ public SimpleFeature next() {
return fIter.next();
}
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/grid/GridUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/grid/GridUtil.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/grid/GridUtil.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -47,7 +47,6 @@
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
-import org.geotools.coverage.FactoryFinder;
import org.geotools.coverage.GridSampleDimension;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.coverage.grid.GridCoverageFactory;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionFilterPanel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionFilterPanel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionFilterPanel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -175,7 +175,7 @@
* Erzeugt ein neues Panel.
*
* @param fc
- * definiert die zur Verfuegung gestellten Feature-Attribute
+ * definiert die zur Verfuegung gestellten SimpleFeature-Attribute
* @param geomPrev
* bestimmt, ob ein Preview-Bereich angezeigt wird ({@code true})
* oder nicht ({@code false})
@@ -189,7 +189,7 @@
* Erzeugt ein neues Panel
*
* @param fc
- * definiert die zur Verfuegung gestellten Feature-Attribute
+ * definiert die zur Verfuegung gestellten SimpleFeature-Attribute
* @param initGUI
* Flag, ob {@link #initGUI()} am Ende des Konstruktor aufgerufen
* werden soll (wenn {@code false} muss die explizit durch die
@@ -561,7 +561,7 @@
* angezeigt wird.
*
* @param fc
- * eine {@link FeatureCollection}, die zum Feature-Type (Schema)
+ * eine {@link FeatureCollection}, die zum SimpleFeature-Type (Schema)
* des Formel-Panels passt
* @exception IllegalArgumentException
* falls die FeatureCollection nicht zum Schema des Panels
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionTableModel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionTableModel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionTableModel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -35,11 +35,11 @@
import javax.swing.table.AbstractTableModel;
import org.geotools.feature.AttributeType;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureCollections;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import schmitzm.geotools.feature.AttributeTypeFilter;
import schmitzm.geotools.feature.FeatureUtil;
@@ -55,7 +55,7 @@
* {@code FeatureTableModel} von Geotools. Im Gegensatz zu
* {@link org.geotools.gui.swing.table.FeatureTableModel org.geotools.gui.swing.table.FeatureTableModel}.
* werden die Tabellennamen und die Anzahl an Spalten jedoch nicht bei jedem Zugriff
- * neu aus dem ersten Feature ermittelt, sondern global gespeichert. Dies ist
+ * neu aus dem ersten SimpleFeature ermittelt, sondern global gespeichert. Dies ist
* erffizienter, da das haeufige Oeffnen eines {@link FeatureIterator FeatureIterators}
* vermieden wird.
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
@@ -66,7 +66,7 @@
protected FeatureCollection featureTable = null;
/** Array mit den Daten von {@link #featureTable}. Wird nur beim Aufruf von
* {@link #reorganize} befuellt. */
- protected Feature[] featureArray;
+ protected SimpleFeature[] featureArray;
/** Spaltennamen. Wird nur beim Aufruf von {@link #reorganize} befuellt. */
protected String[] colNames = null;
/** Spalten-Typen. Wird nur beim Aufruf von {@link #reorganize} befuellt. */
@@ -80,9 +80,9 @@
* alle Spalten angezeigt werden!) */
protected int[] attrIdxForCol = null;
/** Speichert die Indexe der Features im TableModel um die Funktion
- * {@link #findFeature(Feature)} moeglichst effizient zugestalten.
- * Der Key ist nicht das Feature, sondern die FeatureID, weil
- * {@link Feature} die equals methode nicht überschreibt.*/
+ * {@link #findFeature(SimpleFeature)} moeglichst effizient zugestalten.
+ * Der Key ist nicht das SimpleFeature, sondern die FeatureID, weil
+ * {@link SimpleFeature} die equals methode nicht überschreibt.*/
protected HashMap<String,Integer> featureIdx = null;
/**
@@ -125,8 +125,8 @@
colNames = new String[0];
colClass = new Class[0];
} else {
- // Struktur der Tabelle von erstem Feature uebernehmen
- FeatureType ft = featureArray[0].getFeatureType();
+ // Struktur der Tabelle von erstem SimpleFeature uebernehmen
+ SimpleFeatureType ft = featureArray[0].getFeatureType();
// Pruefen, welche Attribute angezeigt werden
attrTypes.clear();
for (int i=0; i<ft.getAttributeCount(); i++) {
@@ -223,7 +223,7 @@
/**
* Liefert eine Zellen-Wert.
- * @param row Zeilennummer (Feature), beginnend bei 0
+ * @param row Zeilennummer (SimpleFeature), beginnend bei 0
* @param col Spaltennummer (Attribut), beginnen bei 0
*/
public Object getValueAt(final int row, final int col) {
@@ -235,7 +235,7 @@
}
/**
- * Liefert die Klasse des Feature-Attributs.
+ * Liefert die Klasse des SimpleFeature-Attributs.
* @param col Spaltennummer (Attribut), beginnen bei 0
*/
@Override
@@ -247,8 +247,8 @@
* Liefert Features der Tabelle als Array.
* @param idx Indizes der FeatureCollection
*/
- public Feature[] getFeaturesAsArray(int[] idx) {
- Feature[] features = new Feature[ idx == null ? 0 : idx.length ];
+ public SimpleFeature[] getFeaturesAsArray(int[] idx) {
+ SimpleFeature[] features = new SimpleFeature[ idx == null ? 0 : idx.length ];
for (int i=0; i<features.length; i++)
features[i] = featureArray[ idx[i] ];
return features;
@@ -266,24 +266,24 @@
}
/**
- * Returns a Feature of the model.
+ * Returns a SimpleFeature of the model.
* @param row row index
*/
- public Feature getFeature(int row) {
+ public SimpleFeature getFeature(int row) {
return featureArray[row];
}
/**
- * Returns the index of a {@link Feature} in the model.
+ * Returns the index of a {@link SimpleFeature} in the model.
* @param f a feature
* @return -1 if the model does not contain the feature
*/
- public int findFeature(Feature f) {
+ public int findFeature(SimpleFeature f) {
return findFeature(f.getID());
}
/**
- * Returns the index of a {@link Feature} in the model.
+ * Returns the index of a {@link SimpleFeature} in the model.
* @param fid A feature-ID
* @return -1 if the model does not contain the feature
*/
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureFilterPanel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureFilterPanel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureFilterPanel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -42,7 +42,7 @@
import javax.swing.ListSelectionModel;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.filter.Filter;
import schmitzm.geotools.feature.AttributeTypeFilter;
@@ -67,7 +67,7 @@
*/
public class FeatureFilterPanel extends OperationTreePanel {
/**
- * Konstante fuer das Label zur Tabelle der Feature-Attribute.
+ * Konstante fuer das Label zur Tabelle der SimpleFeature-Attribute.
*
* @see #layoutConstraints
* @see #resetCaptions(Map)
@@ -76,7 +76,7 @@
.getName()
+ ".FeatureAttributeLabel";
/**
- * Konstante fuer die Tabelle der Feature-Attribute.
+ * Konstante fuer die Tabelle der SimpleFeature-Attribute.
*
* @see #layoutConstraints
*/
@@ -84,11 +84,11 @@
.getName()
+ ".FeatureAttributeTable";
- /** Label ueber der Tabelle mit den Feature-Attributen. */
+ /** Label ueber der Tabelle mit den SimpleFeature-Attributen. */
protected JLabel attributeLabel = null;
- /** Tabelle in der die Feature-Attribute angegeben werden. */
+ /** Tabelle in der die SimpleFeature-Attribute angegeben werden. */
protected JTable attributeTable = null;
- /** Tabellen-Modell, das den Inhalt der Feature-Attribut-Tabelle bestimmt */
+ /** Tabellen-Modell, das den Inhalt der SimpleFeature-Attribut-Tabelle bestimmt */
protected FeatureTypeTableModel attributeTableModel = null;
private JScrollPane attributeScrollPane = null;
@@ -96,10 +96,10 @@
* Erzeugt ein neues Panel.
*
* @param ftype
- * definiert die zur Verfuegung gestellten Feature-Attribute
+ * definiert die zur Verfuegung gestellten SimpleFeature-Attribute
* @see FeatureCollection#getSchema()
*/
- public FeatureFilterPanel(FeatureType ftype) {
+ public FeatureFilterPanel(SimpleFeatureType ftype) {
this(ftype, true);
}
@@ -107,7 +107,7 @@
* Erzeugt ein neues Panel.
*
* @param fc
- * definiert die zur Verfuegung gestellten Feature-Attribute
+ * definiert die zur Verfuegung gestellten SimpleFeature-Attribute
* @see FeatureCollection#getSchema()
*/
public FeatureFilterPanel(FeatureCollection fc) {
@@ -118,13 +118,13 @@
* Erzeugt ein neues Panel
*
* @param ftype
- * definiert die zur Verfuegung gestellten Feature-Attribute
+ * definiert die zur Verfuegung gestellten SimpleFeature-Attribute
* @param initGUI
* Flag, ob {@link #initGUI()} am Ende des Konstruktor aufgerufen
* werden soll (wenn {@code false} muss die explizit durch die
* Unterklasse erfolgen!)
*/
- protected FeatureFilterPanel(FeatureType ftype, boolean initGUI) {
+ protected FeatureFilterPanel(SimpleFeatureType ftype, boolean initGUI) {
super(false);
// Zusaetzliche Operatoren und Konstanten
@@ -217,21 +217,21 @@
}
/**
- * Setzt den {@link FeatureType}, dessen Attribute fuer die Filter-Formel
+ * Setzt den {@link SimpleFeatureType}, dessen Attribute fuer die Filter-Formel
* angeboten werden.
*
* @param ftype
- * ein {@link FeatureType}
+ * ein {@link SimpleFeatureType}
*/
- public void setFeatureType(FeatureType ftype) {
+ public void setFeatureType(SimpleFeatureType ftype) {
attributeTableModel.setFeatureType(ftype);
}
/**
- * Liefert den {@link FeatureType}, dessen Attribute fuer die Filter-Formel
+ * Liefert den {@link SimpleFeatureType}, dessen Attribute fuer die Filter-Formel
* angeboten werden.
*/
- public FeatureType getFeatureType() {
+ public SimpleFeatureType getFeatureType() {
return attributeTableModel.getFeatureType();
}
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureInputOption.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureInputOption.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureInputOption.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -32,8 +32,8 @@
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import org.geotools.feature.Feature;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import schmitzm.geotools.feature.FeatureTableModel;
import schmitzm.swing.InputOption;
@@ -41,11 +41,11 @@
import schmitzm.swing.SwingUtil;
/**
- * {@linkplain InputOption Eingabe-Option} zur Definition eines {@link Feature} im
+ * {@linkplain InputOption Eingabe-Option} zur Definition eines {@link SimpleFeature} im
* {@link MultipleOptionPane}.
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
*/
-public class FeatureInputOption extends InputOption<Feature> {
+public class FeatureInputOption extends InputOption<SimpleFeature> {
/** Beinhaltet die Tabelle, in der die Attribute eingegeben
* werden. */
protected JTable inpTable;
@@ -57,9 +57,9 @@
* Erzeugt einen neue Eingabe-Option.
* @param label Ueberschrift
* @param inputNeeded bestimmt, ob eine Eingabe erforderlich ist
- * @param feature initalial dargestelltes {@link Feature}
+ * @param feature initalial dargestelltes {@link SimpleFeature}
*/
- public FeatureInputOption(String label, boolean inputNeeded, Feature feature) {
+ public FeatureInputOption(String label, boolean inputNeeded, SimpleFeature feature) {
this(label, inputNeeded, feature != null ? feature.getFeatureType() : null);
setValue(feature);
}
@@ -70,7 +70,7 @@
* @param inputNeeded bestimmt, ob eine Eingabe erforderlich ist
* @param fType bestimmt die dargestellten Attribute (kann {@code null} sein)
*/
- public FeatureInputOption(String label, boolean inputNeeded, FeatureType fType) {
+ public FeatureInputOption(String label, boolean inputNeeded, SimpleFeatureType fType) {
super(label, inputNeeded, true);
inpTableModel.setFeature(fType);
}
@@ -90,27 +90,27 @@
}
/**
- * Liefert das aktuell in der Tabelle definierte {@link Feature}.
+ * Liefert das aktuell in der Tabelle definierte {@link SimpleFeature}.
*/
- protected Feature performGetValue() {
+ protected SimpleFeature performGetValue() {
// Workaround: Editieren der zuletzt editierten Zelle
- // beenden, damit Wert in Feature uebernommen
+ // beenden, damit Wert in SimpleFeature uebernommen
// wird
inpTable.editCellAt(-1, -1);
return inpTableModel.getFeature();
}
/**
- * Initalisiert die Tabelle mit einem neuen {@link Feature}.
- * @param newValue neues {@link Feature}
+ * Initalisiert die Tabelle mit einem neuen {@link SimpleFeature}.
+ * @param newValue neues {@link SimpleFeature}
* @return immer {@code true}
*/
- protected boolean performSetValue(Feature newValue) {
+ protected boolean performSetValue(SimpleFeature newValue) {
inpTableModel.setFeature(newValue);
return true;
}
/**
- * Prueft, ob ein Feature definiert ist.
+ * Prueft, ob ein SimpleFeature definiert ist.
*/
protected boolean performIsInputEmpty() {
return inpTableModel.getFeature() == null;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTablePane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTablePane.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTablePane.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -62,7 +62,7 @@
* Tabelle die in der Tabelle ausgewaehlten Features grafisch dargestellt.<br>
* <br>
* <b>Bemerkung:</b><br>
- * Als {@code TableModel} fuer die Feature-Tabelle verwendet diese Klasse ein
+ * Als {@code TableModel} fuer die SimpleFeature-Tabelle verwendet diese Klasse ein
* eigenes internes {@link TableModel}, welches effizienter arbeitet, als
* {@link org.geotools.gui.swing.table.FeatureTableModel
* org.geotools.gui.swing.table.FeatureTableModel}.
@@ -77,7 +77,7 @@
/** Tabelle in der die Features angezeigt werden. */
protected SortableJTable featuresTable = null;
- /** Tabellen-Modell der Feature-Tabelle. */
+ /** Tabellen-Modell der SimpleFeature-Tabelle. */
protected FeatureCollectionTableModel featuresTableModel = null;
/** Preview-Bereich fuer die in der Tabelle selektierten Features. */
protected JMapPane mapPane = null;
@@ -420,7 +420,7 @@
/**
* TODO Das schmeisst eine blöde exception
* java.lang.UnsupportedOperationException: Unbekanntes
- * Feature-Attribut: POP2002 at
+ * SimpleFeature-Attribut: POP2002 at
* schmitzm.geotools.feature.FeatureOperationTree
* .evaluate(FeatureOperationTree.java:92) at
* schmitzm.lang.tree.OperationTree.evaluate(OperationTree.java:181)
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTypeInputOption.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTypeInputOption.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTypeInputOption.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -32,7 +32,7 @@
import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeatureType;
import schmitzm.geotools.feature.FeatureTypeBuilderTableModel;
import schmitzm.swing.InputOption;
@@ -41,11 +41,11 @@
import schmitzm.swing.table.MutableTable;
/**
- * {@linkplain InputOption Eingabe-Option} zur Definition eines {@link FeatureType} im
+ * {@linkplain InputOption Eingabe-Option} zur Definition eines {@link SimpleFeatureType} im
* {@link MultipleOptionPane}.
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
*/
-public class FeatureTypeInputOption extends InputOption<FeatureType> {
+public class FeatureTypeInputOption extends InputOption<SimpleFeatureType> {
/** Beinhaltet die Tabelle, in der die Attribute eingegeben
* werden. */
protected MutableTable inpTable;
@@ -67,9 +67,9 @@
* Erzeugt einen neue Eingabe-Option.
* @param label Ueberschrift
* @param inputNeeded bestimmt, ob eine Eingabe erforderlich ist
- * @param fType initalial dargestellter {@link FeatureType} (kann {@code null} sein)
+ * @param fType initalial dargestellter {@link SimpleFeatureType} (kann {@code null} sein)
*/
- public FeatureTypeInputOption(String label, boolean inputNeeded, FeatureType fType) {
+ public FeatureTypeInputOption(String label, boolean inputNeeded, SimpleFeatureType fType) {
super(label, inputNeeded, true);
if (fType != null)
setValue(fType);
@@ -90,17 +90,17 @@
}
/**
- * Liefert den aktuellen in der Tabelle definierten {@link FeatureType}.
+ * Liefert den aktuellen in der Tabelle definierten {@link SimpleFeatureType}.
*/
- protected FeatureType performGetValue() {
+ protected SimpleFeatureType performGetValue() {
return inpTableModel.createFeatureType();
}
/**
- * Initalisiert die Tabelle mit einem neuen {@link FeatureType}.
- * @param newValue neuer {@link FeatureType}
+ * Initalisiert die Tabelle mit einem neuen {@link SimpleFeatureType}.
+ * @param newValue neuer {@link SimpleFeatureType}
* @return immer {@code true}
*/
- protected boolean performSetValue(FeatureType newValue) {
+ protected boolean performSetValue(SimpleFeatureType newValue) {
inpTableModel.setFeatureType(newValue);
return true;
}
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoPositionLabel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoPositionLabel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoPositionLabel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -38,8 +38,6 @@
import javax.swing.JLabel;
import javax.swing.event.MouseInputListener;
-import org.geotools.gui.swing.event.GeoMouseEvent;
-
/**
* Diese Klasse stellt ein {@link JLabel} dar, in dem (2dimensionale) Geo-Koordinaten
* angezeigt werden. Dabei werden die Koordinaten auf eine bestimmte Anzahl
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -44,12 +44,12 @@
import org.geotools.feature.AttributeType;
import org.geotools.feature.DefaultFeatureCollection;
import org.geotools.feature.DefaultFeatureCollections;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureType;
import org.geotools.feature.FeatureTypeBuilder;
import org.geotools.feature.GeometryAttributeType;
import org.geotools.feature.SchemaException;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.feature.type.GeometricAttributeType;
import org.geotools.map.DefaultMapContext;
import org.geotools.map.DefaultMapLayer;
@@ -109,15 +109,15 @@
/** If the edited layer is empty, a dummy feature is inserted, because
* the StreamingRenderer can not handle empty FeatureCollections yet. */
- private Feature DUMMY_EDITOR_FEATURE = null;
- private Feature DUMMY_LINE_FEATURE = null;
- private Feature DUMMY_POINT_FEATURE = null;
+ private SimpleFeature DUMMY_EDITOR_FEATURE = null;
+ private SimpleFeature DUMMY_LINE_FEATURE = null;
+ private SimpleFeature DUMMY_POINT_FEATURE = null;
/** The map context of the displayed layer. */
protected MapContext mapContext = null;
/** Contains the additional attributes for new FeatureCollections. */
- protected FeatureType additionalAttr = null;
+ protected SimpleFeatureType additionalAttr = null;
/** Contains the {@link InputOption} to specify the additional
* attribute values. */
protected FeatureInputOption attrInputOption = null;
@@ -132,8 +132,8 @@
/** Holds the operation the editor currently performs. */
protected EditorMode editorMode = null;
- /** Holds the {@link FeatureType} of the edited layer. */
- protected FeatureType editorFeatureType = null;
+ /** Holds the {@link SimpleFeatureType} of the edited layer. */
+ protected SimpleFeatureType editorFeatureType = null;
/** Holds the kind of geometry of the edited layer. */
protected GeometryForm editorGeometryForm = null;
/** Holds the {@link FeatureCollection} of the edited layer. */
@@ -141,31 +141,31 @@
/** Holds the edited layer. */
protected MapLayer editorLayer = null;
- /** Holds the {@link FeatureType} of the new segment (incomplete Feature)
+ /** Holds the {@link SimpleFeatureType} of the new segment (incomplete SimpleFeature)
* displayed as line. */
- protected FeatureType segmLineFeatureType = null;
+ protected SimpleFeatureType segmLineFeatureType = null;
/** Holds the {@link FeatureCollection} which holds the new segment
- * (incomplete Feature) displayed as line. */
+ * (incomplete SimpleFeature) displayed as line. */
protected DefaultFeatureCollection segmLineFeatureCollection = null;
- /** Holds the layer, the new segment (incomplete Feature) is displayed in
+ /** Holds the layer, the new segment (incomplete SimpleFeature) is displayed in
* as line. */
protected MapLayer segmLineLayer = null;
- /** Holds the {@link FeatureType} of the new segment (incomplete Feature)
+ /** Holds the {@link SimpleFeatureType} of the new segment (incomplete SimpleFeature)
* displayed as points. */
- protected FeatureType segmPointFeatureType = null;
+ protected SimpleFeatureType segmPointFeatureType = null;
/** Holds the {@link FeatureCollection} which holds the new segment
- * (incomplete Feature) displayed as points. */
+ * (incomplete SimpleFeature) displayed as points. */
protected DefaultFeatureCollection segmPointFeatureCollection = null;
- /** Holds the layer, the new segment (incomplete Feature) is displayed in
+ /** Holds the layer, the new segment (incomplete SimpleFeature) is displayed in
* as points. */
protected MapLayer segmPointLayer = null;
- /** Holds the points of the edited segment (incomplete Feature) which
+ /** Holds the points of the edited segment (incomplete SimpleFeature) which
* can be undone. */
protected Stack<Coordinate> segmUndoPoints = new Stack<Coordinate>();
- /** Holds the undone points of the edited segment (incomplete Feature) which
+ /** Holds the undone points of the edited segment (incomplete SimpleFeature) which
* can be redone. */
protected Stack<Coordinate> segmRedoPoints = new Stack<Coordinate>();
/** Holds the points of former segments (complete Features) which
@@ -175,9 +175,9 @@
* can be redone. */
protected Stack<Stack<Coordinate>> globalRedoPoints = new Stack<Stack<Coordinate>>();
/** Holds the former segments (complete Features) which can be undone. */
- protected Stack<Feature> globalUndoFeatures = new Stack<Feature>();
+ protected Stack<SimpleFeature> globalUndoFeatures = new Stack<SimpleFeature>();
/** Holds the undone segments (complete Features) which can be redone. */
- protected Stack<Feature> globalRedoFeatures = new Stack<Feature>();
+ protected Stack<SimpleFeature> globalRedoFeatures = new Stack<SimpleFeature>();
/**
* Creates a new {@code GeoEditorPane}.
@@ -216,7 +216,7 @@
this.mapContext.addMapBoundsListener( new MapContextSynchronizer(editorMapContext) );
// create the input option to specify additional attribute values
- attrInputOption = new FeatureInputOption(null,true,(Feature)null);
+ attrInputOption = new FeatureInputOption(null,true,(SimpleFeature)null);
}
/**
@@ -313,7 +313,7 @@
* @param fType defines the attributes (If {@code null}, new FeatureCollections
* only contain the geometric attribute)
*/
- public void setAdditionalAttributes(FeatureType fType) {
+ public void setAdditionalAttributes(SimpleFeatureType fType) {
this.additionalAttr = fType;
}
@@ -321,7 +321,7 @@
* Returns the additional attributes for new FeatureCollections (besides
* the geometric attribute, which is added automatically).
*/
- public FeatureType getAdditionalAttributes() {
+ public SimpleFeatureType getAdditionalAttributes() {
return this.additionalAttr;
}
@@ -415,7 +415,7 @@
}
/**
- * Finishes the editing of the current segment (Feature).
+ * Finishes the editing of the current segment (SimpleFeature).
* If no editing operation is currently in progress, this method does nothing.
* @param refresh indicates whether the visualisation will be refreshed
* @param aClearRedo indicates whether the REDO-Stack is cleared (normally {@code true},
@@ -438,8 +438,8 @@
addSegment( segmUndoPoints.firstElement(), refresh, clearRedo );
return; // !!!! finishFeature(.) is called again by addSegment(..) !!!!
}
- // create a new Feature from the segment points
- Feature feature = createFeature();
+ // create a new SimpleFeature from the segment points
+ SimpleFeature feature = createFeature();
if ( feature == null )
return;
fireMapPaneEvent( new FeatureModifiedEvent(this,editorLayer,feature,this) );
@@ -449,7 +449,7 @@
globalUndoFeatures.push( feature );
editorFeatureCollection.add( feature );
- // after finishing a Feature, a new segment is started
+ // after finishing a SimpleFeature, a new segment is started
segmUndoPoints = new Stack<Coordinate>();
if ( clearRedo )
segmRedoPoints = globalRedoPoints.isEmpty() ? new Stack<Coordinate>() : globalRedoPoints.pop();
@@ -460,7 +460,7 @@
}
/**
- * Finishes the editing of the current segment (Feature).
+ * Finishes the editing of the current segment (SimpleFeature).
* If no editing operation is currently in progress, this method does nothing.
*/
public void finishFeature() {
@@ -702,16 +702,16 @@
}
/**
- * Creates a new segment Feature from the currently selected points.
+ * Creates a new segment SimpleFeature from the currently selected points.
*/
protected void generateSegmentFeatureCollection() {
initSegmentFeatureCollection();
// show the segment as single points
- Feature segmPointFeature = createSegmentPointFeature();
+ SimpleFeature segmPointFeature = createSegmentPointFeature();
if ( segmPointFeature != null )
segmPointFeatureCollection.add( segmPointFeature );
// show the segment as a line
- Feature segmLineFeature = createSegmentLineFeature();
+ SimpleFeature segmLineFeature = createSegmentLineFeature();
if ( segmLineFeature != null )
segmLineFeatureCollection.add( segmLineFeature );
// Fire event even if no (real) feature is created!
@@ -719,10 +719,10 @@
}
/**
- * Creates a new {@link Feature Line-Feature} from the currently selected
+ * Creates a new {@link SimpleFeature Line-SimpleFeature} from the currently selected
* segment points.
*/
- protected Feature createSegmentLineFeature() {
+ protected SimpleFeature createSegmentLineFeature() {
// Line can only be created with at least 2 points
// For point layer the segment is not shown
if ( segmUndoPoints.size() < 2 ||
@@ -739,10 +739,10 @@
}
/**
- * Creates a new {@link Feature MultiPoint-Feature} from the currently selected
+ * Creates a new {@link SimpleFeature MultiPoint-SimpleFeature} from the currently selected
* segment points.
*/
- protected Feature createSegmentPointFeature() {
+ protected SimpleFeature createSegmentPointFeature() {
// Point can only be created with at least 1 point
// For point layer the segment is not shown
if ( segmUndoPoints.size() < 1 ||
@@ -759,12 +759,12 @@
}
/**
- * Creates a new Feature from the currently selected points. The non-geometric
+ * Creates a new SimpleFeature from the currently selected points. The non-geometric
* attributes are set to default values.
*/
- private Feature createFeature() {
+ private SimpleFeature createFeature() {
Coordinate[] coord = segmUndoPoints.toArray(new Coordinate[0]);
- Feature feature = null;
+ SimpleFeature feature = null;
try {
// if a feature was undone previously use this as
// default for the new feature
@@ -863,7 +863,7 @@
* @param gtype default geometry of the new feature type
* @param ftype a feature type which is extended (can be {@code null})
*/
- private FeatureType createFeatureType(Class<? extends Geometry> gtype, FeatureType ftype) {
+ private SimpleFeatureType createFeatureType(Class<? extends Geometry> gtype, SimpleFeatureType ftype) {
GeometryAttributeType geomAttrType = new GeometricAttributeType(
GEOMETRY_ATTR,
gtype,
@@ -889,7 +889,7 @@
* @param mode specifies the the default geometry used for the feature type
* @param ftype a feature type which is extended (can be {@code null})
*/
- private FeatureType createFeatureType(EditorMode mode, FeatureType ftype) {
+ private SimpleFeatureType createFeatureType(EditorMode mode, SimpleFeatureType ftype) {
Class<? extends Geometry> gtype = null;
switch( mode ) {
case New_Point: gtype = Point.class; break;
@@ -903,7 +903,7 @@
* Creates a feature with default values for a given feature type.
* @param ftype a feature type
*/
- private static Feature createDummyFeature(FeatureType ftype) {
+ private static SimpleFeature createDummyFeature(SimpleFeatureType ftype) {
try {
return ftype.create( FeatureUtil.getDefaultAttributeValues(ftype) );
} catch (Exception e) {
@@ -913,15 +913,15 @@
/**
* Checks, whether the editor layer is empty. If it is, a dummy feature is inserted
- * because the StreamingRenderer can not handle empty Feature-Layers yet
+ * because the StreamingRenderer can not handle empty SimpleFeature-Layers yet
* (also if the layer is hidden!).
* At the moment, the first a feature is added, the dummy feature is removed, so
* is is not displayed any time.
*/
private void resetEditorLayerVisibility() {
- // if layer is empty, insert a Dummy-Feature (and hide the
+ // if layer is empty, insert a Dummy-SimpleFeature (and hide the
// layer) because the StreamingRenderer can not handle empty
- // Feature-Layers yet
+ // SimpleFeature-Layers yet
if ( segmLineFeatureCollection != null && segmLineFeatureCollection.size() == 0 )
segmLineFeatureCollection.add( DUMMY_LINE_FEATURE );
if ( segmPointFeatureCollection != null && segmPointFeatureCollection.size() == 0 )
@@ -929,7 +929,7 @@
if ( editorFeatureCollection != null && editorFeatureCollection.size() == 0 )
editorFeatureCollection.add( DUMMY_EDITOR_FEATURE );
- // if the layer is not empty anymore, remove the Dummy-Feature, so
+ // if the layer is not empty anymore, remove the Dummy-SimpleFeature, so
// it is not displayed
if ( segmLineFeatureCollection != null && segmLineFeatureCollection.size() == 2 )
segmLineFeatureCollection.remove( DUMMY_LINE_FEATURE );
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorToolBar.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorToolBar.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorToolBar.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -41,7 +41,7 @@
import javax.swing.JToolBar;
import org.apache.log4j.Logger;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeatureType;
import schmitzm.geotools.gui.JEditorPane.EditorMode;
import schmitzm.geotools.map.event.JEditorPaneEvent;
@@ -308,7 +308,7 @@
// for the default geometry of new layers
public boolean performIsInputValid() {
if ( super.performIsInputValid() ) {
- FeatureType ft = inpTableModel.createFeatureType();
+ SimpleFeatureType ft = inpTableModel.createFeatureType();
if ( ft.getAttributeType( JEditorPane.GEOMETRY_ATTR ) != null )
throw new UnsupportedOperationException(getResourceString("NewLayer.Err.GeomAttr",JEditorPane.GEOMETRY_ATTR));
}
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JMapPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JMapPane.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JMapPane.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -55,18 +55,18 @@
import javax.swing.event.MouseInputAdapter;
import org.apache.log4j.Logger;
-import org.geotools.coverage.grid.GeneralGridRange;
import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.coverage.grid.GridGeometry2D;
import org.geotools.coverage.grid.io.AbstractGridCoverage2DReader;
import org.geotools.coverage.grid.io.AbstractGridFormat;
+import org.geotools.coverage.io.AbstractGridCoverageReader;
import org.geotools.data.FeatureSource;
import org.geotools.data.memory.MemoryFeatureCollection;
import org.geotools.factory.GeoTools;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureType;
import org.geotools.feature.GeometryAttributeType;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.filter.AbstractFilter;
import org.geotools.filter.FilterFactoryImpl;
import org.geotools.filter.GeometryFilterImpl;
@@ -75,7 +75,6 @@
import org.geotools.geometry.jts.JTS;
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.geotools.gui.swing.MouseSelectionTracker_Public;
-import org.geotools.gui.swing.event.GeoMouseEvent;
import org.geotools.map.DefaultMapContext;
import org.geotools.map.MapContext;
import org.geotools.map.MapLayer;
@@ -243,14 +242,14 @@
*/
public static final int ZOOM_OUT = org.geotools.gui.swing.JMapPane.ZoomOut;
/**
- * Flag fuer Modus "Feature-Auswahl auf dem obersten (sichtbaren) Layer".
+ * Flag fuer Modus "SimpleFeature-Auswahl auf dem obersten (sichtbaren) Layer".
*
* @see #setWindowSelectionState(int)
* @see #setState(int)
*/
public static final int SELECT_TOP = org.geotools.gui.swing.JMapPane.Select;
/**
- * Flag fuer Modus "Feature-Auswahl auf allen (sichtbaren) Layern".
+ * Flag fuer Modus "SimpleFeature-Auswahl auf allen (sichtbaren) Layern".
*
* @see #setWindowSelectionState(int)
* @see #setState(int)
@@ -1195,7 +1194,7 @@
switch (e.getButton()) {
// Linksklick --> Eingestellte Funktion
- case MouseEvent.BUTTON1: // Feature-Auswahl nicht ueber die
+ case MouseEvent.BUTTON1: // SimpleFeature-Auswahl nicht ueber die
// super-Funktion
int state = getState();
@@ -1206,8 +1205,8 @@
* BEGIN StefanChange Dieser Block findet sichtbare Features im
* Umkreis des Mausklicks und kümmert sich selbst um das
* verschicken der Events. Dabei wird z.Zt. immer eine
- * FeaterCollection mit nur einem Feature verschickt. Und zwar
- * jenes Feature, welches am nächsten liegt.
+ * FeaterCollection mit nur einem SimpleFeature verschickt. Und zwar
+ * jenes SimpleFeature, welches am nächsten liegt.
*/
// Fenster-Koordinate in Geo-Koordinate umwandelt
@@ -1248,12 +1247,12 @@
// Hier werden alle Features weggeschmissen, bis auf
// das raeumlich naechste.
- Feature nearestFeature = null;
+ SimpleFeature nearestFeature = null;
Double nearestDist = 0.0;
- Iterator<Feature> fcIt = fc.iterator();
+ Iterator<SimpleFeature> fcIt = fc.iterator();
while (fcIt.hasNext()) {
- Feature f = fcIt.next();
+ SimpleFeature f = fcIt.next();
Object obj = f.getAttribute(0);
if (obj instanceof Geometry) {
@@ -1290,7 +1289,7 @@
}
}
- // TODO TODO TODO SK: DIese trennung: erst Feature layers, dann
+ // TODO TODO TODO SK: DIese trennung: erst SimpleFeature layers, dann
// grid layers check ist doof!
// if (state == SELECT_ALL || !result.isEmpty())
@@ -2034,7 +2033,7 @@
// /**
// * Bereitet einen BoundingBox-Filter vor. Das "linke" Attribut der
- // * Expression (das Feature-Attribut, auf das der Filter angewendet wird),
+ // * Expression (das SimpleFeature-Attribut, auf das der Filter angewendet wird),
// * wird dabei noch nicht belegt. Dies geschieht erst bei der Auswertung
// * entsprechend des jeweiligen Layers
// *
@@ -2056,7 +2055,7 @@
// /**
// * Bereitet einen Punkt-Filter vor. Das "linke" Attribut der Expression
// (das
- // * Feature-Attribut, auf das der Filter angewendet wird), wird dabei noch
+ // * SimpleFeature-Attribut, auf das der Filter angewendet wird), wird dabei noch
// * nicht belegt. Dies geschieht erst bei der Auswertung entsprechend des
// * jeweiligen Layers
// *
@@ -2076,7 +2075,7 @@
// /**
// * Bereitet einen "InDerNaehe von" Distance-Filter vor. Das "linke"
// Attribut
- // * der Expression (das Feature-Attribut, auf das der Filter angewendet
+ // * der Expression (das SimpleFeature-Attribut, auf das der Filter angewendet
// * wird), wird dabei noch nicht belegt. Dies geschieht erst bei der
// * Auswertung entsprechend des jeweiligen Layers
// *
@@ -2114,7 +2113,7 @@
/**
* Prueft, ob es sich bei einem Layer um ein Raster-Layer handelt.
* Raster-Layer zeichnen sich dadurch aus, dass die zugrunde liegende
- * {@link FeatureCollection} nur ein Feature enthaelt, das genau ein
+ * {@link FeatureCollection} nur ein SimpleFeature enthaelt, das genau ein
* Attribut mit dem Namen "GridCoverage" hat.
*
* SK: Pyramidenlayer aka AbstractGridCoverage2DReader geben auch true
@@ -2136,11 +2135,11 @@
return b;
// try {
// FeatureCollection fc = layer.getFeatureSource().getFeatures();
- // // Layer muss genau ein Feature beinhalten
+ // // Layer muss genau ein SimpleFeature beinhalten
// if ( fc == null || fc.size() != 1 )
// return false;
- // // Feature muss genau 1 Attribut mit dem Namen "GridCoverage" haben
- // FeatureType ftype = fc.getFeatureType();
+ // // SimpleFeature muss genau 1 Attribut mit dem Namen "GridCoverage" haben
+ // SimpleFeatureType ftype = fc.getFeatureType();
// if ( ftype == null || ftype.getAttributeCount() != 1 ||
// !"GridCoverage".equalsIgnoreCase(ftype.getAttributeType(0).getName())
// )
@@ -2154,7 +2153,7 @@
* Liefert das Objekt ({@link GridCoverage2D} oder {@link FeatureCollection}
* oder {@link AbstractGridCoverageReader} auf dem ein Layer basiert. Ein
* Raster-Layer zeichnen sich dadurch aus, dass die zugrunde liegende
- * {@link FeatureCollection} nur ein Feature enthaelt, das genau ein
+ * {@link FeatureCollection} nur ein SimpleFeature enthaelt, das genau ein
* Attribut mit Namen "GridCoverage" und Typ {@code GridCoverage2D} oder
* {@link AbstractGridCoverageReader} hat. Sind diese Bedingungen erfuellt,
* wird das 2. Attribut zurueckgegeben, ansonsten die
@@ -2169,28 +2168,28 @@
try {
final FeatureSource featureSource = layer.getFeatureSource();
FeatureCollection fc = featureSource.getFeatures();
- // RasterLayer muss genau ein Feature beinhalten
+ // RasterLayer muss genau ein SimpleFeature beinhalten
// Ist dies nicht der Fall wird die FeatureCollection zurueckgegeben
if (fc == null || fc.size() != 1) {
return fc;
}
- // FeatureType des RasterLayer muss genau 1 Attribut mit Namen
+ // SimpleFeatureType des RasterLayer muss genau 1 Attribut mit Namen
// "GridCoverage"
// Ist dies nicht der Fall wird die FeatureCollection zurueckgegeben
- FeatureType ftype = fc.getFeatureType();
+ SimpleFeatureType ftype = fc.getFeatureType();
if (ftype == null
|| ftype.getAttributeCount() != 1
|| !"GridCoverage".equalsIgnoreCase(ftype.getAttributeType(
0).getLocalName()))
return fc;
- // (Einziges) Feature muss genau 2 Attribute besitzen, wobei das
+ // (Einziges) SimpleFeature muss genau 2 Attribute besitzen, wobei das
// erste vom
// Typ Geometry ist und das zweite vom Typ GridCoverage2D
// sonst: FeatureCollextion zurueckgeben
/** CHANGE SK 9.8.08 BEGIN */
- Feature f = fc.features().next();
+ SimpleFeature f = fc.features().next();
if ((f.getFeatureType().getTypeName().equals("GridCoverage") && f
.getNumberOfAttributes() >= 2)) {
// I am sure, that it is a raster some. We do not have to cast
@@ -2314,7 +2313,7 @@
// /**
// * Prueft, ob es sich bei einem Layer um ein Raster-Layer handelt.
// * Raster-Layer zeichnen sich dadurch aus, dass die zugrunde liegende
- // * {@link FeatureCollection} nur ein Feature enthaelt, das genau ein
+ // * {@link FeatureCollection} nur ein SimpleFeature enthaelt, das genau ein
// Attribut
// * vom Type {@link org.geotools.feature.type.FeatureAttributeType} hat,
// welches
@@ -2327,11 +2326,11 @@
// public static boolean isGridCoverageLayer(MapLayer layer) {
// try {
// FeatureCollection fc = layer.getFeatureSource().getFeatures();
- // // Layer muss genau ein Feature beinhalten
+ // // Layer muss genau ein SimpleFeature beinhalten
// if ( fc == null || fc.size() != 1 )
// return false;
- // // Feature muss genau 1 Attribut vom Typ FeatureAttributeType haben
- // FeatureType ftype = fc.getFeatureType();
+ // // SimpleFeature muss genau 1 Attribut vom Typ FeatureAttributeType haben
+ // SimpleFeatureType ftype = fc.getFeatureType();
// if ( ftype == null || ftype.getAttributeCount() != 1 ||
// !(ftype.getAttributeType(0) instanceof
// org.geotools.feature.type.FeatureAttributeType) )
@@ -2380,7 +2379,7 @@
* Sets the mapArea to smartly present the given features. Note: The method
* does not call {@link #repaint()} on the {@link JMapPane}.
*/
- public void zoomTo(org.geotools.feature.Feature feature) {
+ public void zoomTo(org.geotools.feature.SimpleFeature feature) {
final MemoryFeatureCollection mfc = new MemoryFeatureCollection(feature
.getFeatureType());
mfc.add(feature);
@@ -2419,7 +2418,7 @@
// feature count == 1 Just move the window to the point and zoom 'a
// bit'
- Feature singleFeature = (Feature) features.iterator().next();
+ SimpleFeature singleFeature = (SimpleFeature) features.iterator().next();
if (singleFeature.getDefaultGeometry().getCoordinates().length > 1) {
// System.out.println("Zoomed to only pne poylgon");
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapFrame.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapFrame.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapFrame.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -90,7 +90,7 @@
private MapContext mapContext = null;
/** Status-Balken. */
protected MapPaneStatusBar statusBar = null;
- /** Fenster fuer Feature-Details */
+ /** Fenster fuer SimpleFeature-Details */
protected FeatureCollectionFrame featuresFrame = null;
/** Auswahlfeld fuer das Raster, fuer welches die Koordinaten angezeigt werden. */
protected SelectionInputOption<MapLayer> rasterComboBox = null;
@@ -186,7 +186,7 @@
contentPane.add(statusBarContainer, new GridBagConstraints(0, 1, 2, 1, 1.0, 0.0
,GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(2, 0, 0, 0), 0, 0));
- // Fenster fuer Feature-Details
+ // Fenster fuer SimpleFeature-Details
featuresFrame = new FeatureCollectionFrame(null,true);
featuresFrame.setSize( new Dimension(400,200) );
// Ausgewaehlte Features werden im Detail-Frame angezeigt
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapPane.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapPane.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -274,8 +274,8 @@
/**
* Fuegt ein FeatureCollection-Layer (als oberstes Layer) ein.
- * @param fc eine Feature-Collection
- * @param desc Beschreibung fuer die Feature-Collection
+ * @param fc eine SimpleFeature-Collection
+ * @param desc Beschreibung fuer die SimpleFeature-Collection
* @param style Darstellungs-Style fuer das Layer
*/
public MapLayer addLayer(FeatureCollection fc, String desc, Style style) {
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/MapActionControlPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/MapActionControlPane.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/MapActionControlPane.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -64,10 +64,10 @@
* <li>Rechts-Drag: Karten-Ausschnitt verschieben</li>
* </ul></li>
* <li><b>SelectTop:</b><br>
- * Die Auswahl-Aktionen beziehen sich auf das oberste sichtbare Feature
+ * Die Auswahl-Aktionen beziehen sich auf das oberste sichtbare SimpleFeature
* und fuehren zu einem {@link FeatureSelectedEvent}:
* <ul>
- * <li>Links-Klick: einzelnes Feature selektieren</li>
+ * <li>Links-Klick: einzelnes SimpleFeature selektieren</li>
* <li>Links-Drag: alle Features im selektierten Bereich auswaehlen</li>
* <li>Rechts-Klick: nichts</li>
* <li>Rechts-Drag: Karten-Ausschnitt verschieben</li>
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/MapContextControlPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/MapContextControlPane.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/MapContextControlPane.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -85,7 +85,7 @@
public static final String MENU_MOVE_LAYER_DOWN = MapContextControlPane.class.getName()+".Menu.MOVE_DOWN";
/** Key, um den Menue-Eintrag "Zoom to layer" in der {@link CaptionsChangeable}-Map anzusprechen. */
public static final String MENU_ZOOM_TO_LAYER = MapContextControlPane.class.getName()+".Menu.ZOOM_TO";
- /** Key, um den Menue-Eintrag "Feature-Filter..." in der {@link CaptionsChangeable}-Map anzusprechen. */
+ /** Key, um den Menue-Eintrag "SimpleFeature-Filter..." in der {@link CaptionsChangeable}-Map anzusprechen. */
public static final String MENU_FILTER_LAYER = MapContextControlPane.class.getName()+".Menu.FILTER";
/** Key, um den Menue-Eintrag "Recolor..." in der {@link CaptionsChangeable}-Map anzusprechen. */
public static final String MENU_RECOLOR_LAYER = MapContextControlPane.class.getName()+".Menu.RECOLOR";
@@ -312,13 +312,13 @@
/**
* Ruft die {@code super}-Methode auf. Zudem wird (beim ersten Anzeigen)
* ein {@link WindowEventConnector} in das uebergeordnete Fenster eingetragen,
- * der dessen Aktionen mit denen des Feature-Filter-Fensters verbindet.
+ * der dessen Aktionen mit denen des SimpleFeature-Filter-Fensters verbindet.
* @param g Graphics
*/
public void paint(Graphics g) {
super.paint(g);
// Wenn das Fenster geschlossen/minimiert wird, soll auch das
- // Feature-Filter-Fenster geschlossen/minimiert werden
+ // SimpleFeature-Filter-Fenster geschlossen/minimiert werden
if ( !windowListenerAdded && filterDialog != null ) {
Window parentFrame = SwingUtil.getParentWindow(this);
if ( parentFrame != null) {
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoExportUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoExportUtil.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoExportUtil.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -45,7 +45,6 @@
import org.geotools.data.Transaction;
import org.geotools.data.shapefile.ShapefileDataStore;
import org.geotools.feature.FeatureCollection;
-import org.geotools.gce.arcgrid.ArcGridRaster;
import org.opengis.metadata.Identifier;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoImportUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoImportUtil.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoImportUtil.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -55,14 +55,12 @@
import org.geotools.coverage.grid.GridCoverageFactory;
import org.geotools.coverage.grid.io.AbstractGridCoverage2DReader;
import org.geotools.data.DataStore;
-import org.geotools.data.shapefile.Lock;
import org.geotools.data.shapefile.ShapefileDataStore;
import org.geotools.data.shapefile.indexed.IndexedShapefileDataStore;
import org.geotools.data.shapefile.shp.ShapefileReader;
import org.geotools.factory.Hints;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureCollections;
-import org.geotools.gce.arcgrid.ArcGridRaster;
import org.geotools.gce.geotiff.GeoTiffReader;
import org.geotools.gce.image.WorldImageReader;
import org.geotools.geometry.Envelope2D;
@@ -73,6 +71,7 @@
import schmitzm.data.WritableGridRaster;
import schmitzm.geotools.GTUtil;
import schmitzm.io.IOUtil;
+import sun.misc.Lock;
import com.vividsolutions.jts.geom.Geometry;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/map/event/FeatureModifiedEvent.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/map/event/FeatureModifiedEvent.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/map/event/FeatureModifiedEvent.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -29,7 +29,7 @@
******************************************************************************/
package schmitzm.geotools.map.event;
-import org.geotools.feature.Feature;
+import org.geotools.feature.SimpleFeature;
import org.geotools.map.MapLayer;
import schmitzm.geotools.gui.JEditorPane;
@@ -41,8 +41,8 @@
* @version 1.0
*/
public class FeatureModifiedEvent extends JEditorPaneEvent {
- /** Feature das veraendert wurde. */
- protected Feature feature = null;
+ /** SimpleFeature das veraendert wurde. */
+ protected SimpleFeature feature = null;
/**
* Erzeugt ein neues Ereignis.
@@ -52,15 +52,15 @@
* @param sourceObject Objekt, das die Aenderung initiiert hat (wenn {@code null},
* wird das MapPane als Ausloeser gesetzt)
*/
- public FeatureModifiedEvent(JEditorPane sourceMap, MapLayer sourceLayer, Feature feature, Object sourceObject) {
+ public FeatureModifiedEvent(JEditorPane sourceMap, MapLayer sourceLayer, SimpleFeature feature, Object sourceObject) {
super(sourceMap, sourceLayer, sourceObject);
this.feature = feature;
}
/**
- * Liefert das veraenderte Feature.
+ * Liefert das veraenderte SimpleFeature.
*/
- public Feature getModifiedFeature() {
+ public SimpleFeature getModifiedFeature() {
return feature;
}
}
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -53,7 +53,6 @@
import javax.swing.BoxLayout;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
-import javax.units.Unit;
import javax.xml.transform.TransformerException;
import org.apache.log4j.Logger;
@@ -68,10 +67,10 @@
import org.geotools.data.memory.MemoryFeatureCollection;
import org.geotools.factory.CommonFactoryFinder;
import org.geotools.factory.GeoTools;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureType;
import org.geotools.feature.GeometryAttributeType;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.filter.ConstantExpression;
import org.geotools.gui.swing.ExceptionMonitor;
import org.geotools.renderer.lite.RendererUtilities;
@@ -103,6 +102,7 @@
import org.geotools.styling.Symbolizer;
import org.geotools.styling.TextSymbolizer;
import org.geotools.util.NumberRange;
+import org.hsqldb.lib.StringInputStream;
import org.jdom.Element;
import org.jdom.output.XMLOutputter;
import org.opengis.coverage.grid.Grid;
@@ -121,7 +121,6 @@
import skrueger.geotools.LegendIconFeatureRenderer;
import skrueger.i8n.Translation;
-import com.sun.xml.bind.StringInputStream;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.LineString;
import com.vividsolutions.jts.geom.MultiLineString;
@@ -245,7 +244,7 @@
// /**
// * Up to three {@link Style styles} suitable to present selected {@link
- // Feature features} are cached here. (SK)
+ // SimpleFeature features} are cached here. (SK)
// */
// private static Map<GeometryForm,Style> selectionStyles = new
// HashMap<GeometryForm, Style>();
@@ -1010,7 +1009,7 @@
*
* Kommentar: "Sichtbarkeit" bezieht es nicht darauf, ob die Elemente auf
* dem Kartenausschnitt sichtbar sind, sondern um die SLD Regeln, welche das
- * Feature evt. nur Scalenabhängig zeichnen.<br/>
+ * SimpleFeature evt. nur Scalenabhängig zeichnen.<br/>
* SK 19.6.2009:Bei einem {@link PolygonSymbolizer} zählt nicht der Rand,
* sondern nur ob eine Füllung vorhanden ist! Man kann dann zwar leider
* nicht auf ein Rand eines Polygons ohne Fill klicken, aber dafür kann man
@@ -1047,12 +1046,12 @@
fc.getFeatureType());
// Prüfen aller Features in der Collection
- final Iterator<Feature> fcIt = fc.iterator();
+ final Iterator<SimpleFeature> fcIt = fc.iterator();
try {
while (fcIt.hasNext()) {
- final Feature feature = fcIt.next();
+ final SimpleFeature feature = fcIt.next();
for (final FeatureTypeStyle fts : style.getFeatureTypeStyles()) {
final List<Rule> rules = fts.rules();
@@ -1072,14 +1071,14 @@
// 2. Check: Eine Rule ist gülrig, aber trifft der
// Filter
- // für dieses Feature?
+ // für dieses SimpleFeature?
final Filter rFilter = rule.getFilter();
if ((rFilter != null) && (!rFilter.evaluate(feature)))
continue;
// 3. Check: Passt einer der Symbolizer dieser Rule zu
// dem
- // Feature? Dieser Check wird in
+ // SimpleFeature? Dieser Check wird in
// "real world" meistens klappen, es sei denn, ein
// Hansel
// gibt einen LineSymbolizer für ein PointLayer an.
@@ -1153,15 +1152,15 @@
/**
* @param style
* A {@link Style} to search for the first {@link TextSymbolizer}
- * that will be used for the given {@link Feature}.
+ * that will be used for the given {@link SimpleFeature}.
*
* @author Stefan A. Krüger
*
* @return <code>null</code> or the first {@link TextSymbolizer} found in
- * the style that applies to the {@link Feature}.
+ * the style that applies to the {@link SimpleFeature}.
*/
public static TextSymbolizer getTextSymbolizer(final Style style,
- final Feature f) {
+ final SimpleFeature f) {
if (f == null)
return null;
try {
@@ -1660,7 +1659,7 @@
* Krüger</a>
*/
public static Box createLegendPanel(FeatureTypeStyle[] featureTypeStyles,
- FeatureType featureType) {
+ SimpleFeatureType featureType) {
Box box = new Box(BoxLayout.Y_AXIS) {
Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2CategoryDatasetMapping.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2CategoryDatasetMapping.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2CategoryDatasetMapping.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -29,13 +29,13 @@
******************************************************************************/
package schmitzm.jfree.feature;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
+import org.geotools.feature.SimpleFeature;
import org.jfree.data.category.CategoryDataset;
/**
* This class implements the mapping between {@link CategoryDataset} items (points in chart)
- * and the corresponding {@link Feature Features}.
+ * and the corresponding {@link SimpleFeature Features}.
* The structure of this mapping assumes that there can be multiple
* dataset items for one feature (e.g. in each series), but only one feature
* for each dataset item.
Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2DatasetMapping.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2DatasetMapping.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2DatasetMapping.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -32,13 +32,13 @@
import java.util.HashMap;
import java.util.Map;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
+import org.geotools.feature.SimpleFeature;
import org.jfree.data.general.Dataset;
/**
* This class implements the mapping between {@link Dataset} items (points in chart)
- * and the corresponding {@link Feature Features}.<br>
+ * and the corresponding {@link SimpleFeature Features}.<br>
* <br>
* {@code D} = the dataset type the model handles<br>
* {@code E} = the data type the series are identified with in the dataset<br>
Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2SeriesDatasetMapping.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2SeriesDatasetMapping.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2SeriesDatasetMapping.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -29,13 +29,13 @@
******************************************************************************/
package schmitzm.jfree.feature;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
+import org.geotools.feature.SimpleFeature;
import org.jfree.data.general.SeriesDataset;
/**
* This class implements the mapping between {@link SeriesDataset} items (points in chart)
- * and the corresponding {@link Feature Features}.
+ * and the corresponding {@link SimpleFeature Features}.
* The structure of this mapping assumes that there can be multiple
* dataset items for one feature (e.g. in each series), but only one feature
* for each dataset item.
Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureCategoryDatasetSelectionModel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureCategoryDatasetSelectionModel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureCategoryDatasetSelectionModel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -56,7 +56,7 @@
*/
public FeatureCategoryDatasetSelectionModel(CategoryDataset dataset) {
super(dataset);
- // DatasetGroup must provide meta data (containing the Feature<->DataItem mapping)
+ // DatasetGroup must provide meta data (containing the SimpleFeature<->DataItem mapping)
DatasetGroup group = dataset.getGroup();
if ( group == null || !(group instanceof FeatureDatasetMetaData) )
throw new UnsupportedOperationException("Dataset must provide FeatureDatasetMetaData as DatasetGroup: "+LangUtil.getSimpleClassName(group));
@@ -111,7 +111,7 @@
public void setItemSelected(String fID, Comparable<?> seriesKey, boolean selected) {
Comparable<?> dataItem = mapping.getDataID(seriesKey,fID);
if ( dataItem == null )
- LOGGER.warn("Feature unknown in Feature2DatasetItemDatasetGroup: "+fID);
+ LOGGER.warn("SimpleFeature unknown in Feature2DatasetItemDatasetGroup: "+fID);
else
setItemSelected(seriesKey, dataItem, selected);
}
Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureChartPanel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureChartPanel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureChartPanel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -97,7 +97,7 @@
protected SelectionRenderer<?> createSelectionRenderer(Dataset dataset) {
// check whether dataset provides a Feature2DatasetMapping
// if not: create a "normal" SelectionRenderer by super-class
- // method (without "Feature-Synchronizing" functionality)
+ // method (without "SimpleFeature-Synchronizing" functionality)
if ( dataset.getGroup() instanceof FeatureDatasetMetaData &&
((FeatureDatasetMetaData)dataset.getGroup()).getMapping() != null ) {
Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureSeriesDatasetSelectionModel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureSeriesDatasetSelectionModel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/FeatureSeriesDatasetSelectionModel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -56,7 +56,7 @@
*/
public FeatureSeriesDatasetSelectionModel(SeriesDataset dataset) {
super(dataset);
- // DatasetGroup must provide meta data (containing the Feature<->DataItem mapping)
+ // DatasetGroup must provide meta data (containing the SimpleFeature<->DataItem mapping)
DatasetGroup group = dataset.getGroup();
if ( group == null || !(group instanceof FeatureDatasetMetaData) )
throw new UnsupportedOperationException("Dataset must provide FeatureDatasetMetaData as DatasetGroup: "+LangUtil.getSimpleClassName(group));
@@ -111,7 +111,7 @@
public void setItemSelected(String fID, Comparable<?> seriesKey, boolean selected) {
Integer dataItem = mapping.getDataID(seriesKey,fID);
if ( dataItem == null )
- LOGGER.warn("Feature unknown in Feature2DatasetItemDatasetGroup: "+fID);
+ LOGGER.warn("SimpleFeature unknown in Feature2DatasetItemDatasetGroup: "+fID);
else
setItemSelected(seriesKey, dataItem, selected);
}
Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureChartUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureChartUtil.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureChartUtil.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -40,10 +40,10 @@
import org.apache.log4j.Logger;
import org.geotools.feature.AttributeType;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.Plot;
@@ -181,7 +181,7 @@
* the type the attribute must support (if {@code null} only the
* attribute existing is checked!)
*/
- private static void checkAttributeType(FeatureType fType, String aName,
+ private static void checkAttributeType(SimpleFeatureType fType, String aName,
Class typeToCheck, String... errDesc) {
AttributeType aType = fType.getAttributeType(aName);
if (aType == null)
@@ -259,9 +259,9 @@
//
// Only solution: Pre-sort the features so that the XYSeries internal
// order does not change!
- Iterator<Feature> fi = null;
+ Iterator<SimpleFeature> fi = null;
if (chartStyle.isSortDomainAxis()) {
- Vector<Feature> sortedFeatures = FeatureUtil.sortFeatures(fc.features(), xAttrName);
+ Vector<SimpleFeature> sortedFeatures = FeatureUtil.sortFeatures(fc.features(), xAttrName);
// Create an Iterator for the sorted Features
fi = sortedFeatures.iterator();
} else
@@ -269,7 +269,7 @@
// Iterate the FeatureCollection and fill the series
for (int fIdx = 0; fi.hasNext(); fIdx++) {
- Feature f = fi.next();
+ SimpleFeature f = fi.next();
// Determine X value (NULL not permitted for XYDateset!)
Number xValue = (Number) f.getAttribute(xAttrName);
if (xValue == null)
@@ -343,7 +343,7 @@
final FeatureIterator fIt = fc.features();
// Loop over all features, and collect the attribute values we are interested in.
while (fIt.hasNext()){
- Feature f = fIt.next();
+ SimpleFeature f = fIt.next();
for (int attrIdx = 0; attrIdx < chartStyle.getAttributeCount(); attrIdx++) {
@@ -431,9 +431,9 @@
// according to the domain attribute. CategoryDataset has no
// "autoSort", and this - at all - would not work (see
// createXYDataset(..))
- Iterator<Feature> fi = null;
+ Iterator<SimpleFeature> fi = null;
if (chartStyle.isSortDomainAxis()) {
- Vector<Feature> sortedFeatures = FeatureUtil.sortFeatures(fc.features(), xAttrName);
+ Vector<SimpleFeature> sortedFeatures = FeatureUtil.sortFeatures(fc.features(), xAttrName);
// Create an Iterator for the sorted Features
fi = sortedFeatures.iterator();
} else
@@ -441,7 +441,7 @@
// Iterate the FeatureCollection and fill the series
for (int fIdx = 0; fi.hasNext(); fIdx++) {
- Feature f = fi.next();
+ SimpleFeature f = fi.next();
// Determine the category (NULL not permitted!)
Comparable<?> catValue = (Comparable<?>)f.getAttribute(xAttrName);
if (catValue == null)
Modified: branches/1.0-gt2-2.6/src/schmitzm/lang/LangUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/lang/LangUtil.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/schmitzm/lang/LangUtil.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -40,8 +40,6 @@
import java.util.TreeSet;
import java.util.Vector;
-import net.jini.loader.pref.PreferredClassLoader;
-
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/LegendIconFeatureRenderer.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/LegendIconFeatureRenderer.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/LegendIconFeatureRenderer.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -60,9 +60,9 @@
import org.geotools.factory.GeoTools;
import org.geotools.factory.Hints;
import org.geotools.feature.AttributeType;
-import org.geotools.feature.Feature;
-import org.geotools.feature.FeatureType;
import org.geotools.feature.IllegalAttributeException;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.geometry.jts.LiteShape2;
import org.geotools.renderer.lite.StyledShapePainter;
import org.geotools.renderer.style.SLDStyleFactory;
@@ -92,8 +92,8 @@
* <br>
* <ul>
* <li>07.02.2008:<br>
- * Determining the default values of a {@link FeatureType} by
- * {@link FeatureUtil#getDefaultAttributeValues(FeatureType)} instead of using
+ * Determining the default values of a {@link SimpleFeatureType} by
+ * {@link FeatureUtil#getDefaultAttributeValues(SimpleFeatureType)} instead of using
* {@link AttributeType#createDefaultValue()} directly, because the latter
* returns {@code null} even though the attribut is not nillable.</li>
* </ul>
@@ -247,7 +247,7 @@
/**
* Puts a BufferedImage into this.legendGraphic
*/
- public void produceLegendGraphic(FeatureType featureType, Style gt2Style,
+ public void produceLegendGraphic(SimpleFeatureType featureType, Style gt2Style,
Rule[] applicableRules) {
// final FeatureTypeStyle[] ftStyles = gt2Style.getFeatureTypeStyles();
@@ -448,19 +448,19 @@
/**
* Creates a little BufferedImage that presents the Style/Symbols used by
- * the {@link MapLegend} to show a legend for the {@link FeatureType}
+ * the {@link MapLegend} to show a legend for the {@link SimpleFeatureType}
*
* @param rule
* {@link Rule} that provides the text and the style to present
* @param featureType
- * Schema that describes the kind of the sample {@link Feature}
+ * Schema that describes the kind of the sample {@link SimpleFeature}
* that will be rendered with the {@link Style}
* @param bg
* Background {@link Color} or <code>null</code>
*
* @throws IllegalAttributeException
*/
- public BufferedImage createImageForRule(Rule rule, FeatureType featureType,
+ public BufferedImage createImageForRule(Rule rule, SimpleFeatureType featureType,
Dimension size, Color bg) {
Symbolizer[] symbolizers = rule.getSymbolizers();
@@ -504,7 +504,7 @@
// RasterSymbolizers..");
// }
// else
- final Feature sampleFeature = FeatureUtil.createSampleFeature(featureType);
+ final SimpleFeature sampleFeature = FeatureUtil.createSampleFeature(featureType);
// The SLDStyleFactory has to be recreated, as it seams to cache
// some stuff.
@@ -559,18 +559,18 @@
/**
* Creates a little BufferedImage that presents the Style/Symbols used by
- * the {@link MapLegend} to show a legend for the {@link FeatureType}
+ * the {@link MapLegend} to show a legend for the {@link SimpleFeatureType}
*
* @param rule
* {@link Rule} that provides the text and the style to present
* @param featureType
- * Schema that describes the kind of the sample {@link Feature}
+ * Schema that describes the kind of the sample {@link SimpleFeature}
* that will be rendered with the {@link Style}
*
* @throws IllegalAttributeException
*/
public BufferedImage createImageForRule(final Rule rule,
- final FeatureType featureType, final Dimension size) {
+ final SimpleFeatureType featureType, final Dimension size) {
return createImageForRule(rule, featureType, size, null);
}
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 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollection.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -40,7 +40,7 @@
import org.geotools.data.collection.CollectionDataStore;
import org.geotools.feature.AttributeType;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.styling.Style;
import schmitzm.geotools.feature.FeatureUtil;
@@ -302,7 +302,7 @@
public static Map<Integer, AttributeMetaData> createDefaultAttributeMetaDataMap(
FeatureCollection fc) {
HashMap<Integer, AttributeMetaData> metaDataMap = new HashMap<Integer, AttributeMetaData>();
- FeatureType ftype = fc.getSchema();
+ SimpleFeatureType ftype = fc.getSchema();
for (int i = 0; i < ftype.getAttributeCount(); i++) {
AttributeType aType = ftype.getAttributeType(i);
if (aType != ftype.getDefaultGeometry())
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/LabelSearch.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/LabelSearch.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/LabelSearch.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -39,9 +39,9 @@
import org.apache.log4j.Logger;
import org.geotools.data.DefaultQuery;
import org.geotools.feature.AttributeType;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureType;
+import org.geotools.feature.SimpleFeature;
+import org.geotools.feature.SimpleFeatureType;
import org.geotools.map.MapLayer;
import org.geotools.styling.Style;
import org.geotools.styling.TextSymbolizer;
@@ -82,7 +82,7 @@
}
private AttributeType getLabelAttribute(final TextSymbolizer ts,
- final FeatureType schema) {
+ final SimpleFeatureType schema) {
if (ts == null) {
// This layer has no labels
return null;
@@ -141,9 +141,9 @@
* support case insensitivity and i don't find a lower or UPPER
* function.
*/
- final Iterator<Feature> fi = features.iterator();
+ final Iterator<SimpleFeature> fi = features.iterator();
while (fi.hasNext()) {
- final Feature f = fi.next();
+ final SimpleFeature f = fi.next();
final TextSymbolizer ts = StylingUtil.getTextSymbolizer(ml
.getStyle(), f);
@@ -204,7 +204,7 @@
return hits;
}
- protected SearchResult createSearchResult(final Feature f, final String title,
+ protected SearchResult createSearchResult(final SimpleFeature f, final String title,
final String inTitle, MapLayer ml) {
return new SearchResultFeature(f, title, inTitle, mapPane, ml);
}
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/SearchResult.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/SearchResult.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/SearchResult.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -31,7 +31,7 @@
import java.util.Map;
-import org.geotools.feature.Feature;
+import org.geotools.feature.SimpleFeature;
public interface SearchResult {
@@ -43,7 +43,7 @@
String getTitle();
/**
- * "Open" the result. For a {@link Feature} that mean to zoom to the
+ * "Open" the result. For a {@link SimpleFeature} that mean to zoom to the
* location. For a {@link Map} if means to open the {@link Map}.
*/
void open();
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/SearchResultFeature.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/SearchResultFeature.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/SearchResultFeature.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -32,21 +32,21 @@
import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
-import org.geotools.feature.Feature;
+import org.geotools.feature.SimpleFeature;
import org.geotools.map.MapLayer;
public class SearchResultFeature implements SearchResult {
final static private Logger LOGGER = Logger
.getLogger(SearchResultFeature.class);
- private final Feature feature;
+ private final SimpleFeature feature;
private final String title;
private final schmitzm.geotools.gui.JMapPane mapPane;
private final String inTitle;
private final MapLayer mapLayer;
- public SearchResultFeature(Feature feature, String title, String inTitle,
+ public SearchResultFeature(SimpleFeature feature, String title, String inTitle,
schmitzm.geotools.gui.JMapPane mapPane, MapLayer mapLayer) {
this.feature = feature;
this.title = title;
@@ -60,7 +60,7 @@
return feature.toString();
}
- public Feature getFeature() {
+ public SimpleFeature getFeature() {
return feature;
}
@@ -82,7 +82,7 @@
mapPane.refresh();
// TODO
- // Mark the selected Feature using a spacial style.. similar to the
+ // Mark the selected SimpleFeature using a spacial style.. similar to the
// selection stuff.
// mapLayer.getStyle().addFeatureTypeStyle( new FeatureTypeStyle());
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -54,7 +54,7 @@
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionListener;
-import org.geotools.feature.Feature;
+import org.geotools.feature.SimpleFeature;
import org.geotools.map.MapLayer;
import org.geotools.styling.FeatureTypeStyle;
import org.geotools.styling.Style;
@@ -167,7 +167,7 @@
* selection.
*
* @param newSelection
- * A {@link Vector} of Feature-IDs that are selected.
+ * A {@link Vector} of SimpleFeature-IDs that are selected.
*/
private void changeLayerStyle(final Vector<String> newSelection) {
Style selectionMapStyle = null;
@@ -299,7 +299,7 @@
// Avoid event circles in propertyChange(..)
selectionChangeCausedByMe = true;
- Collection<Feature> selectionResult = (Collection<Feature>) fse
+ Collection<SimpleFeature> selectionResult = (Collection<SimpleFeature>) fse
.getSelectionResult();
// reset the selection of the DpLayerSelectionModel
@@ -307,7 +307,7 @@
if (selectedTool == MapPaneToolBar.TOOL_SELECTION_ADD) {
layerSelModel.setValueIsAdjusting(true);
- for (Feature f : selectionResult) {
+ for (SimpleFeature f : selectionResult) {
layerSelModel.addSelection(f.getID());
}
layerSelModel.setValueIsAdjusting(false);
@@ -315,7 +315,7 @@
layerSelModel.setValueIsAdjusting(true);
layerSelModel.clearSelection();
- for (Feature f : selectionResult) {
+ for (SimpleFeature f : selectionResult) {
layerSelModel.addSelection(f.getID());
}
@@ -323,7 +323,7 @@
layerSelModel.setValueIsAdjusting(false);
} else if (selectedTool == MapPaneToolBar.TOOL_SELECTION_REMOVE) {
layerSelModel.setValueIsAdjusting(true);
- for (Feature f : selectionResult) {
+ for (SimpleFeature f : selectionResult) {
layerSelModel.removeSelection(f.getID());
}
layerSelModel.setValueIsAdjusting(false);
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/selection/StyledFeatureLayerSelectionModel.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/selection/StyledFeatureLayerSelectionModel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/selection/StyledFeatureLayerSelectionModel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -43,7 +43,7 @@
package skrueger.geotools.selection;
-import org.geotools.feature.Feature;
+import org.geotools.feature.SimpleFeature;
import skrueger.geotools.StyledFeatureCollectionInterface;
import skrueger.geotools.StyledFeatureSourceInterface;
@@ -51,7 +51,7 @@
import skrueger.geotools.StyledLayerInterface;
/**
- * This manager holds a set of {@link Feature Features} which are <i>selected</i>
+ * This manager holds a set of {@link SimpleFeature Features} which are <i>selected</i>
* in a {@link StyledLayerInterface} ({@link StyledFeatureCollectionInterface} or
* {@link StyledFeatureSourceInterface}).
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
@@ -184,11 +184,11 @@
// // in the selection list
// selectionFilter = new AbstractFilterImpl( FeatureUtil.FILTER_FACTORY ) {
// public boolean evaluate(Object feature) {
-// if ( feature instanceof Feature )
+// if ( feature instanceof SimpleFeature )
// return evaluate((Filter)feature);
// return false;
// }
-// public boolean evaluate(Feature feature) {
+// public boolean evaluate(SimpleFeature feature) {
// return selectionFeatures.contains(feature);
// }
// };
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/selection/StyledLayerSelectionModel.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/selection/StyledLayerSelectionModel.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/selection/StyledLayerSelectionModel.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -52,7 +52,7 @@
import javax.swing.event.EventListenerList;
import org.apache.log4j.Logger;
-import org.geotools.feature.Feature;
+import org.geotools.feature.SimpleFeature;
import schmitzm.swing.event.PropertyChangeEmitter;
import skrueger.geotools.StyledLayerInterface;
@@ -75,7 +75,7 @@
/** Holds the connected listeners. */
protected EventListenerList listenerList = new EventListenerList();
- /** Holds the current selection (e.g. {@link Feature Features}). */
+ /** Holds the current selection (e.g. {@link SimpleFeature Features}). */
protected final HashSet<E> selectionObjects;
/** Holds the styled map whose selection is managed by this class. */
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/selection/TableSelectionSynchronizer.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/selection/TableSelectionSynchronizer.java 2009-08-26 13:22:29 UTC (rev 317)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/selection/TableSelectionSynchronizer.java 2009-08-26 13:33:32 UTC (rev 318)
@@ -52,7 +52,7 @@
import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableModel;
-import org.geotools.feature.Feature;
+import org.geotools.feature.SimpleFeature;
import schmitzm.geotools.gui.FeatureCollectionTableModel;
import schmitzm.swing.table.PipedTableModel;
@@ -192,7 +192,7 @@
for (int i = evt.getFirstIndex(); i <= evt.getLastIndex(); i++) {
int featureIndex = featureTable.convertRowIndexToModel(i);
- Feature changedFeature = featureTableModel.getFeature(featureIndex);
+ SimpleFeature changedFeature = featureTableModel.getFeature(featureIndex);
if (featureTable.isRowSelected(i))
layerSelModel.addSelection(changedFeature.getID());
else
More information about the Schmitzm-commits
mailing list