[Schmitzm-commits] r322 - in branches/1.0-gt2-2.6/src: org/geotools/data/wfs org/geotools/feature/collection org/geotools/renderer/shape schmitzm/geotools/feature schmitzm/geotools/gui schmitzm/geotools/map/event schmitzm/geotools/styling schmitzm/jfree/feature schmitzm/jfree/feature/style skrueger/geotools skrueger/geotools/labelsearch skrueger/geotools/selection
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 26 16:12:19 CEST 2009
Author: alfonx
Date: 2009-08-26 16:12:17 +0200 (Wed, 26 Aug 2009)
New Revision: 322
Added:
branches/1.0-gt2-2.6/src/org/geotools/feature/collection/SubFeatureCollection.java
Modified:
branches/1.0-gt2-2.6/src/org/geotools/data/wfs/WFSFeatureSource.java
branches/1.0-gt2-2.6/src/org/geotools/renderer/shape/TransitionShapefileRenderer.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/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/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/FeatureTypeInputOption.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/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/style/FeatureChartUtil.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:
Moving to
import org.opengis.feature.simple.SimpleFeature;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/org/geotools/data/wfs/WFSFeatureSource.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -27,7 +27,7 @@
import org.geotools.data.Transaction;
import org.geotools.data.store.EmptyFeatureCollection;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.filter.Filter;
import org.geotools.geometry.jts.ReferencedEnvelope;
Added: 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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/org/geotools/feature/collection/SubFeatureCollection.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -0,0 +1,280 @@
+/*
+ * GeoTools - OpenSource mapping toolkit
+ * http://geotools.org
+ * (C) 2005-2006, GeoTools Project Managment Committee (PMC)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ */
+package org.geotools.feature.collection;
+
+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.FeatureCollection;
+import org.geotools.feature.FeatureIterator;
+import org.geotools.feature.IllegalAttributeException;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
+import org.geotools.feature.visitor.FeatureVisitor;
+import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.opengis.util.ProgressListener;
+import org.opengis.filter.Filter;
+import org.opengis.filter.FilterFactory;
+import org.opengis.filter.sort.SortBy;
+
+import com.vividsolutions.jts.geom.Geometry;
+
+/**
+ * <b>Xulu:<br>
+ * Code taken from gt-2.4.2 to optimize the {@link #size()} method!
+ * The original variant always iterates ALL features at every call!.</b><br><br>
+ *
+ * Used as a reasonable default implementation for subCollection.
+ * <p>
+ * Note: to implementors, this is not optimal, please do your own
+ * thing - your users will thank you.
+ * </p>
+ *
+ * @author Jody Garnett, Refractions Research, Inc.
+ *
+ * @source $URL: http://svn.geotools.org/geotools/tags/2.4.2/modules/library/main/src/main/java/org/geotools/feature/collection/SubFeatureCollection.java $
+ */
+public class SubFeatureCollection extends AbstractResourceCollection implements FeatureCollection {
+// Xulu-01.sn
+ private int size = -1;
+// Xulu-01.en
+
+ /** Filter */
+ protected Filter filter;
+
+ /** Origional Collection */
+ protected FeatureCollection collection;
+ protected FeatureState state;
+ protected FilterFactory ff = CommonFactoryFinder.getFilterFactory( null );
+
+ public SubFeatureCollection(FeatureCollection collection ) {
+ this( collection, Filter.INCLUDE );
+ }
+ public SubFeatureCollection(FeatureCollection collection, Filter subfilter ){
+ if (subfilter == null ) subfilter = Filter.INCLUDE;
+ if (subfilter.equals(Filter.EXCLUDE)) {
+ throw new IllegalArgumentException("A subcollection with Filter.EXCLUDE is a null operation");
+ }
+
+ if( collection instanceof SubFeatureCollection){
+ SubFeatureCollection filtered = (SubFeatureCollection) collection;
+ if( subfilter.equals(Filter.INCLUDE)){
+ this.collection = filtered.collection;
+ this.filter = filtered.filter();
+ }
+ else {
+ this.collection = filtered.collection;
+ this.filter = ff.and( filtered.filter(), subfilter );
+ }
+ } else {
+ this.collection = collection;
+ this.filter = subfilter;
+ }
+ state = new SubFeatureState( this.collection, this );
+ }
+
+ protected Filter filter(){
+ if( filter == null ){
+ filter = createFilter();
+ }
+ return filter;
+ }
+ /** Override to implement subsetting */
+ protected Filter createFilter(){
+ return Filter.INCLUDE;
+ }
+
+ public SimpleFeatureType getFeatureType() {
+ return state.getFeatureType();
+ }
+
+ public FeatureIterator features() {
+ return new DelegateFeatureIterator( this, iterator() );
+ }
+
+ public void closeIterator(Iterator iterator) {
+ if( iterator == null ) return;
+
+ if( iterator instanceof FilteredIterator){
+ FilteredIterator filtered = (FilteredIterator) iterator;
+ filtered.close();
+ }
+ }
+ public void close(FeatureIterator close) {
+ if( close != null ) close.close();
+ }
+
+ //
+ // SimpleFeature methods
+ //
+ public String getID() {
+ return state.getId();
+ }
+
+ public ReferencedEnvelope getBounds(){
+ return ReferencedEnvelope.reference(state.getBounds());
+ }
+
+ public Geometry getDefaultGeometry() {
+ return state.getDefaultGeometry();
+ }
+
+ public void setDefaultGeometry(Geometry g) throws IllegalAttributeException {
+ state.setDefaultGeometry( g );
+ }
+
+ public void addListener(CollectionListener listener) throws NullPointerException {
+ state.addListener( listener );
+ }
+
+ public void removeListener(CollectionListener listener) throws NullPointerException {
+ state.removeListener( listener );
+ }
+
+ public FeatureCollection getParent() {
+ return state.getParent();
+ }
+
+ public void setParent(FeatureCollection collection) {
+ state.setParent( collection );
+ }
+
+ public Object[] getAttributes(Object[] attributes) {
+ return state.getAttributes( attributes );
+ }
+
+ public Object getAttribute(String xPath) {
+ return state.getAttribute( xPath );
+ }
+
+ public Object getAttribute(int index) {
+ return state.getAttribute( index );
+ }
+
+ public void setAttribute(int position, Object val) throws IllegalAttributeException, ArrayIndexOutOfBoundsException {
+ state.setAttribute( position, val );
+ }
+ public int getNumberOfAttributes() {
+ return state.getNumberOfAttributes();
+ }
+
+ public void setAttribute(String xPath, Object attribute) throws IllegalAttributeException {
+ state.setAttribute( xPath, attribute );
+ }
+
+ //
+ //
+ //
+ public FeatureCollection subCollection(Filter filter) {
+ if (filter.equals(Filter.INCLUDE)) {
+ return this;
+ }
+ if (filter.equals(Filter.EXCLUDE)) {
+ // TODO implement EmptyFeatureCollection( schema )
+ }
+ return new SubFeatureCollection(this, filter);
+ }
+
+ public int size() {
+//Xulu-01.sn
+ if ( this.size >= 0 )
+ return this.size;
+//Xulu-01.en
+ int count = 0;
+ Iterator i = null;
+ try {
+ for( i = iterator(); i.hasNext(); count++) i.next();
+ }
+ finally {
+ close( i );
+ }
+//Xulu-01.sn
+ this.size = count;
+//Xulu-01.en
+ return count;
+ }
+
+ public boolean isEmpty() {
+ Iterator iterator = iterator();
+ try {
+ return !iterator.hasNext();
+ }
+ finally {
+ close( iterator );
+ }
+ }
+
+ public Iterator openIterator() {
+ return new FilteredIterator( collection, filter() );
+ }
+
+
+ public SimpleFeatureType getSchema() {
+ return collection.getSchema();
+ }
+
+ /**
+ * Accepts a visitor, which then visits each feature in the collection.
+ * @throws IOException
+ */
+ public void accepts(FeatureVisitor visitor, ProgressListener progress ) throws IOException {
+ Iterator iterator = null;
+ // if( progress == null ) progress = new NullProgressListener();
+ try{
+ float size = size();
+ float position = 0;
+ progress.started();
+ for( iterator = iterator(); !progress.isCanceled() && iterator.hasNext(); progress.progress( position++/size )){
+ try {
+ SimpleFeature feature = (SimpleFeature) iterator.next();
+ visitor.visit(feature);
+ }
+ catch( Exception erp ){
+ progress.exceptionOccurred( erp );
+ }
+ }
+ }
+ finally {
+ progress.complete();
+ close( iterator );
+ }
+ }
+
+ public FeatureReader reader() throws IOException {
+ return new DelegateFeatureReader( getSchema(), features() );
+ }
+
+ public int getCount() throws IOException {
+ return size();
+ }
+
+ public FeatureCollection collection() throws IOException {
+ return this;
+ }
+
+ public FeatureList sort(SortBy order) {
+ return null;
+ }
+
+ public void purge() {
+ collection.purge();
+ }
+}
Property changes on: branches/1.0-gt2-2.6/src/org/geotools/feature/collection/SubFeatureCollection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/org/geotools/renderer/shape/TransitionShapefileRenderer.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -58,8 +58,8 @@
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.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.filter.FilterAttributeExtractor;
import org.geotools.geometry.jts.Decimator;
import org.geotools.geometry.jts.LiteCoordinateSequenceFactory;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/AttributeFilter.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -29,7 +29,7 @@
******************************************************************************/
package schmitzm.geotools.feature;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import org.geotools.filter.AbstractFilterImpl;
import org.geotools.filter.Filter;
import org.geotools.filter.FilterFactoryImpl;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureCollectionReader.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -34,8 +34,8 @@
import org.geotools.data.FeatureReader;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.SimpleFeature;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.feature.collection.FeatureIteratorImpl;
/**
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTree.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -29,7 +29,7 @@
******************************************************************************/
package schmitzm.geotools.feature;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import schmitzm.lang.tree.BinaryTreeNode;
import schmitzm.lang.tree.OperationTree;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeFilter.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -29,7 +29,7 @@
******************************************************************************/
package schmitzm.geotools.feature;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import org.geotools.filter.AbstractFilterImpl;
import org.geotools.filter.FilterFactoryImpl;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTableModel.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -32,8 +32,8 @@
import javax.swing.table.TableModel;
import org.geotools.feature.AttributeType;
-import org.geotools.feature.SimpleFeature;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import schmitzm.geotools.gui.GeotoolsGUIUtil;
import schmitzm.swing.table.AbstractTableModel;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTypeBuilderTableModel.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -46,7 +46,7 @@
import org.geotools.feature.DefaultAttributeType;
import org.geotools.feature.FeatureTypeBuilder;
import org.geotools.feature.SchemaException;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.feature.type.GeometricAttributeType;
import schmitzm.geotools.gui.GeotoolsGUIUtil;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureTypeTableModel.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -34,7 +34,7 @@
import javax.swing.table.TableModel;
import org.geotools.feature.AttributeType;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeatureType;
import schmitzm.geotools.gui.GeotoolsGUIUtil;
import schmitzm.swing.table.AbstractTableModel;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureUtil.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -62,8 +62,8 @@
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.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.feature.type.GeometricAttributeType;
import org.geotools.filter.FilterFactory;
import org.geotools.map.MapLayer;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/PipedFeatureIterator.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -33,7 +33,7 @@
import java.util.Iterator;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
/**
* This class is a workaround since {@link FeatureIterator} does not
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureCollectionTableModel.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -38,8 +38,8 @@
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureCollections;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.SimpleFeature;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import schmitzm.geotools.feature.AttributeTypeFilter;
import schmitzm.geotools.feature.FeatureUtil;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureFilterPanel.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -42,7 +42,7 @@
import javax.swing.ListSelectionModel;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.filter.Filter;
import schmitzm.geotools.feature.AttributeTypeFilter;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureInputOption.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -32,8 +32,8 @@
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import org.geotools.feature.SimpleFeature;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import schmitzm.geotools.feature.FeatureTableModel;
import schmitzm.swing.InputOption;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTypeInputOption.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -32,7 +32,7 @@
import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeatureType;
import schmitzm.geotools.feature.FeatureTypeBuilderTableModel;
import schmitzm.swing.InputOption;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -48,8 +48,8 @@
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.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.feature.type.GeometricAttributeType;
import org.geotools.map.DefaultMapContext;
import org.geotools.map.DefaultMapLayer;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorToolBar.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -41,7 +41,7 @@
import javax.swing.JToolBar;
import org.apache.log4j.Logger;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeatureType;
import schmitzm.geotools.gui.JEditorPane.EditorMode;
import schmitzm.geotools.map.event.JEditorPaneEvent;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JMapPane.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -65,8 +65,8 @@
import org.geotools.factory.GeoTools;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.GeometryAttributeType;
-import org.geotools.feature.SimpleFeature;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.filter.AbstractFilter;
import org.geotools.filter.FilterFactoryImpl;
import org.geotools.filter.GeometryFilterImpl;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/map/event/FeatureModifiedEvent.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -29,7 +29,7 @@
******************************************************************************/
package schmitzm.geotools.map.event;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import org.geotools.map.MapLayer;
import schmitzm.geotools.gui.JEditorPane;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -69,8 +69,8 @@
import org.geotools.factory.GeoTools;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.GeometryAttributeType;
-import org.geotools.feature.SimpleFeature;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.filter.ConstantExpression;
import org.geotools.gui.swing.ExceptionMonitor;
import org.geotools.renderer.lite.RendererUtilities;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2CategoryDatasetMapping.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -30,7 +30,7 @@
package schmitzm.jfree.feature;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import org.jfree.data.category.CategoryDataset;
/**
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2DatasetMapping.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -33,7 +33,7 @@
import java.util.Map;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import org.jfree.data.general.Dataset;
/**
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/Feature2SeriesDatasetMapping.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -30,7 +30,7 @@
package schmitzm.jfree.feature;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import org.jfree.data.general.SeriesDataset;
/**
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureChartUtil.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -42,8 +42,8 @@
import org.geotools.feature.AttributeType;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.SimpleFeature;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.Plot;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/LegendIconFeatureRenderer.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -61,8 +61,8 @@
import org.geotools.factory.Hints;
import org.geotools.feature.AttributeType;
import org.geotools.feature.IllegalAttributeException;
-import org.geotools.feature.SimpleFeature;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.geometry.jts.LiteShape2;
import org.geotools.renderer.lite.StyledShapePainter;
import org.geotools.renderer.style.SLDStyleFactory;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFeatureCollection.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -40,7 +40,7 @@
import org.geotools.data.collection.CollectionDataStore;
import org.geotools.feature.AttributeType;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.styling.Style;
import schmitzm.geotools.feature.FeatureUtil;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/LabelSearch.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -40,8 +40,8 @@
import org.geotools.data.DefaultQuery;
import org.geotools.feature.AttributeType;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.SimpleFeature;
-import org.geotools.feature.SimpleFeatureType;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import org.geotools.map.MapLayer;
import org.geotools.styling.Style;
import org.geotools.styling.TextSymbolizer;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/SearchResult.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -31,7 +31,7 @@
import java.util.Map;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
public interface SearchResult {
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/SearchResultFeature.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -32,7 +32,7 @@
import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import org.geotools.map.MapLayer;
public class SearchResultFeature implements SearchResult {
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -54,7 +54,7 @@
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionListener;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import org.geotools.map.MapLayer;
import org.geotools.styling.FeatureTypeStyle;
import org.geotools.styling.Style;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/selection/StyledFeatureLayerSelectionModel.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -43,7 +43,7 @@
package skrueger.geotools.selection;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import skrueger.geotools.StyledFeatureCollectionInterface;
import skrueger.geotools.StyledFeatureSourceInterface;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/selection/StyledLayerSelectionModel.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -52,7 +52,7 @@
import javax.swing.event.EventListenerList;
import org.apache.log4j.Logger;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import schmitzm.swing.event.PropertyChangeEmitter;
import skrueger.geotools.StyledLayerInterface;
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:52:54 UTC (rev 321)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/selection/TableSelectionSynchronizer.java 2009-08-26 14:12:17 UTC (rev 322)
@@ -52,7 +52,7 @@
import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableModel;
-import org.geotools.feature.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeature;
import schmitzm.geotools.gui.FeatureCollectionTableModel;
import schmitzm.swing.table.PipedTableModel;
More information about the Schmitzm-commits
mailing list