svn - r34281 - in trunk/modules: library library/api/src/main/java/org/
|
|
svn_geotools
|
Author: jive
Date: 2009-10-30 02:00:52 -0400 (Fri, 30 Oct 2009) New Revision: 34281 Removed: trunk/modules/library/api/src/main/java/org/geotools/feature/visitor/FeatureVisitor.java trunk/modules/library/legacy/ Modified: trunk/modules/library/data/src/main/java/org/geotools/data/store/ContentFeatureCollection.java trunk/modules/library/main/src/main/java/org/geotools/data/memory/MemoryFeatureCollection.java trunk/modules/library/main/src/main/java/org/geotools/data/store/DataFeatureCollection.java trunk/modules/library/main/src/main/java/org/geotools/data/store/ReprojectingFeatureCollection.java trunk/modules/library/main/src/main/java/org/geotools/feature/DefaultFeatureCollection.java trunk/modules/library/main/src/main/java/org/geotools/feature/collection/AbstractFeatureCollection.java trunk/modules/library/main/src/main/java/org/geotools/feature/collection/DecoratingFeatureCollection.java trunk/modules/library/main/src/main/java/org/geotools/feature/collection/SubFeatureCollection.java trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/BoundsVisitor.java trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/CollectionUtil.java trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/FeatureCalc.java trunk/modules/library/main/src/test/java/org/geotools/feature/MockFeatureCollection.java trunk/modules/library/pom.xml trunk/modules/plugin/arcsde/datastore/src/main/java/org/geotools/arcsde/ArcSDEDataStoreFactory.java Log: down with legacy api; GEOT-2809 Deleted: trunk/modules/library/api/src/main/java/org/geotools/feature/visitor/FeatureVisitor.java =================================================================== --- trunk/modules/library/api/src/main/java/org/geotools/feature/visitor/FeatureVisitor.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/api/src/main/java/org/geotools/feature/visitor/FeatureVisitor.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -1,33 +0,0 @@ -/* - * GeoTools - The Open Source Java GIS Toolkit - * http://geotools.org - * - * (C) 2005-2008, Open Source Geospatial Foundation (OSGeo) - * - * 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.visitor; - -import org.opengis.feature.simple.SimpleFeature; - - -/** - * FeatureVisitor interface (for Feature Calculations) - * - * @author Cory Horner, Refractions - * - * @since 2.2.M2 - * @source $URL$ - * @deprecated use {@link org.opengis.feature.FeatureVisitor}. - */ -public interface FeatureVisitor extends org.opengis.feature.FeatureVisitor { - public void visit(SimpleFeature feature); -} Modified: trunk/modules/library/data/src/main/java/org/geotools/data/store/ContentFeatureCollection.java =================================================================== --- trunk/modules/library/data/src/main/java/org/geotools/data/store/ContentFeatureCollection.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/data/src/main/java/org/geotools/data/store/ContentFeatureCollection.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -37,7 +37,6 @@ import org.geotools.feature.FeatureCollection; import org.geotools.feature.FeatureIterator; import org.geotools.feature.simple.SimpleFeatureTypeBuilder; -import org.geotools.feature.visitor.FeatureVisitor; import org.geotools.filter.SortBy; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.util.NullProgressListener; @@ -126,15 +125,6 @@ } //Visitors - /** - * Accepts a visitor, which then visits each feature in the collection. - * @throws IOException - */ - public void accepts(FeatureVisitor visitor, ProgressListener progress ) throws IOException { - accepts( (org.opengis.feature.FeatureVisitor) visitor, - (org.opengis.util.ProgressListener) progress ); - } - public void accepts(org.opengis.feature.FeatureVisitor visitor, org.opengis.util.ProgressListener progress) throws IOException { featureSource.accepts( query, visitor, progress); Modified: trunk/modules/library/main/src/main/java/org/geotools/data/memory/MemoryFeatureCollection.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/data/memory/MemoryFeatureCollection.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/main/java/org/geotools/data/memory/MemoryFeatureCollection.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -135,10 +135,7 @@ @Override public ReferencedEnvelope getBounds() { BoundsVisitor bounds = new BoundsVisitor(); - try { - accepts(bounds, new NullProgressListener()); - } catch (IOException e) { - } + accepts(bounds, new NullProgressListener()); return bounds.getBounds(); } Modified: trunk/modules/library/main/src/main/java/org/geotools/data/store/DataFeatureCollection.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/data/store/DataFeatureCollection.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/main/java/org/geotools/data/store/DataFeatureCollection.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -38,7 +38,6 @@ import org.geotools.feature.IllegalAttributeException; import org.geotools.feature.collection.DelegateFeatureIterator; import org.geotools.feature.collection.SubFeatureCollection; -import org.geotools.feature.visitor.FeatureVisitor; import org.geotools.filter.SortBy2; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.util.NullProgressListener; @@ -538,9 +537,6 @@ throws NullPointerException { listeners.remove(listener); } - public final void accepts(FeatureVisitor visitor, ProgressListener progress) throws IOException { - accepts( (org.opengis.feature.FeatureVisitor)visitor, (org.opengis.util.ProgressListener)progress); - } public SimpleFeatureType getSchema() { return schema; } Modified: trunk/modules/library/main/src/main/java/org/geotools/data/store/ReprojectingFeatureCollection.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/data/store/ReprojectingFeatureCollection.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/main/java/org/geotools/data/store/ReprojectingFeatureCollection.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -32,7 +32,6 @@ import org.geotools.feature.SchemaException; import org.geotools.feature.collection.DecoratingFeatureCollection; import org.geotools.feature.collection.DelegateFeatureIterator; -import org.geotools.feature.visitor.FeatureVisitor; import org.geotools.geometry.jts.GeometryCoordinateSequenceTransformer; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.referencing.CRS; Modified: trunk/modules/library/main/src/main/java/org/geotools/feature/DefaultFeatureCollection.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/feature/DefaultFeatureCollection.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/main/java/org/geotools/feature/DefaultFeatureCollection.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -36,7 +36,6 @@ import org.geotools.feature.collection.SubFeatureCollection; import org.geotools.feature.simple.SimpleFeatureBuilder; import org.geotools.feature.simple.SimpleFeatureTypeImpl; -import org.geotools.feature.visitor.FeatureVisitor; import org.geotools.filter.SortBy2; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.util.NullProgressListener; @@ -765,10 +764,6 @@ listeners.remove(listener); } - public final void accepts(FeatureVisitor visitor, ProgressListener progress) throws IOException { - accepts( (org.opengis.feature.FeatureVisitor)visitor, (org.opengis.util.ProgressListener)progress); - } - public SimpleFeatureType getSchema() { return schema; } Modified: trunk/modules/library/main/src/main/java/org/geotools/feature/collection/AbstractFeatureCollection.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/feature/collection/AbstractFeatureCollection.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/main/java/org/geotools/feature/collection/AbstractFeatureCollection.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -27,7 +27,6 @@ import org.geotools.feature.CollectionListener; import org.geotools.feature.FeatureCollection; import org.geotools.feature.FeatureIterator; -import org.geotools.feature.visitor.FeatureVisitor; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.util.NullProgressListener; import org.geotools.util.ProgressListener; @@ -547,10 +546,6 @@ listeners.remove(listener); } - public final void accepts(FeatureVisitor visitor, ProgressListener progress) throws IOException { - accepts( (org.opengis.feature.FeatureVisitor)visitor, (org.opengis.util.ProgressListener)progress); - } - public SimpleFeatureType getSchema() { return schema; } Modified: trunk/modules/library/main/src/main/java/org/geotools/feature/collection/DecoratingFeatureCollection.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/feature/collection/DecoratingFeatureCollection.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/main/java/org/geotools/feature/collection/DecoratingFeatureCollection.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -27,7 +27,6 @@ import org.geotools.feature.FeatureIterator; import org.geotools.feature.IllegalAttributeException; -import org.geotools.feature.visitor.FeatureVisitor; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.util.ProgressListener; import org.opengis.feature.Feature; @@ -68,11 +67,6 @@ this.delegate = delegate; } - public void accepts(FeatureVisitor visitor, ProgressListener progress) - throws IOException { - delegate.accepts(visitor, progress); - } - public void accepts(org.opengis.feature.FeatureVisitor visitor, org.opengis.util.ProgressListener progress) throws IOException { delegate.accepts(visitor, progress); Modified: trunk/modules/library/main/src/main/java/org/geotools/feature/collection/SubFeatureCollection.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/feature/collection/SubFeatureCollection.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/main/java/org/geotools/feature/collection/SubFeatureCollection.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -218,10 +218,7 @@ @Override public ReferencedEnvelope getBounds() { BoundsVisitor bounds = new BoundsVisitor(); - try { - accepts( bounds, new NullProgressListener() ); - } catch (IOException e) { - } + accepts( bounds, new NullProgressListener() ); return bounds.getBounds(); } Modified: trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/BoundsVisitor.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/BoundsVisitor.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/BoundsVisitor.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -35,11 +35,7 @@ */ public class BoundsVisitor implements FeatureCalc { ReferencedEnvelope bounds = new ReferencedEnvelope(); - - public void visit(SimpleFeature feature) { - visit((org.opengis.feature.Feature)feature); - } - + public void visit(org.opengis.feature.Feature feature) { bounds.include( feature.getBounds() ); } Modified: trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/CollectionUtil.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/CollectionUtil.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/CollectionUtil.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -17,6 +17,7 @@ package org.geotools.feature.visitor; import org.geotools.feature.FeatureCollection; +import org.opengis.feature.FeatureVisitor; import org.opengis.feature.simple.SimpleFeature; import org.opengis.feature.simple.SimpleFeatureType; Modified: trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/FeatureCalc.java =================================================================== --- trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/FeatureCalc.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/main/java/org/geotools/feature/visitor/FeatureCalc.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -16,6 +16,8 @@ */ package org.geotools.feature.visitor; +import org.opengis.feature.FeatureVisitor; + /** * A visitor which performs a calculation on a FeatureCollection. A FeatureCalc * will not modify the features visited. Modified: trunk/modules/library/main/src/test/java/org/geotools/feature/MockFeatureCollection.java =================================================================== --- trunk/modules/library/main/src/test/java/org/geotools/feature/MockFeatureCollection.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/main/src/test/java/org/geotools/feature/MockFeatureCollection.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -24,9 +24,7 @@ import java.util.List; import java.util.Map; -import org.geotools.feature.visitor.FeatureVisitor; import org.geotools.geometry.jts.ReferencedEnvelope; -import org.geotools.util.ProgressListener; import org.opengis.feature.GeometryAttribute; import org.opengis.feature.Property; import org.opengis.feature.simple.SimpleFeature; @@ -50,9 +48,6 @@ public MockFeatureCollection() { } - public void accepts(FeatureVisitor visitor, ProgressListener progress) - throws IOException { - } public void accepts(org.opengis.feature.FeatureVisitor visitor, org.opengis.util.ProgressListener progress) { Modified: trunk/modules/library/pom.xml =================================================================== --- trunk/modules/library/pom.xml 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/library/pom.xml 2009-10-30 06:00:52 UTC (rev 34281) @@ -49,7 +49,6 @@ <module>referencing</module> <module>coverage</module> <module>api</module> - <module>legacy</module> <module>main</module> <module>data</module> <module>sample-data</module> Modified: trunk/modules/plugin/arcsde/datastore/src/main/java/org/geotools/arcsde/ArcSDEDataStoreFactory.java =================================================================== --- trunk/modules/plugin/arcsde/datastore/src/main/java/org/geotools/arcsde/ArcSDEDataStoreFactory.java 2009-10-30 02:29:04 UTC (rev 34280) +++ trunk/modules/plugin/arcsde/datastore/src/main/java/org/geotools/arcsde/ArcSDEDataStoreFactory.java 2009-10-30 06:00:52 UTC (rev 34281) @@ -195,7 +195,9 @@ */ public ArcSDEDataStoreFactory() { if (!isAvailable()) { - LOGGER.warning("The ESRI ArcSDE Java API seems to not be on your classpath. Please" + // This is not the correct place to annoy people; as it will be hit by each call + // to DataStoreFinder + LOGGER.fine("The ESRI ArcSDE Java API seems to not be on your classpath. Please" + " verify that all needed jars are. ArcSDE data stores" + " will not be available."); } ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ GeoTools-commits mailing list [hidden email] https://lists.sourceforge.net/lists/listinfo/geotools-commits |
||||||||||||||||
| Free Embeddable Forum Powered by Nabble | Help |
