Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

feature collection cleanup #161

Closed
wants to merge 6 commits into from

2 participants

Jody Garnett Andrea Antonello
Jody Garnett
Owner

Remove references to deprecated feature collection methods, that are now removed from GeoTools.

  • Remove CollectionListener methods (addListener, removeListener)
  • Remove Iterator Methods (iterator, close, purge)
  • Remove Collection Methods (add,adAll,clear,remove,removeAll,retainAll)

For more information see geotools/geotools#44

The cleanup went smoothly for uDig ... except for TableView.

Had to migrate from FeatureCollection/CollectionListener methods (which are gone) to FeatureSource/FeatureListener methods. This may mean we need to ask TableView to latch onto a FeatureSource now

So testing is needed

Andrea Antonello moovida closed this September 22, 2013
Jody Garnett
Owner

Yeah we will need this when we update to a newer version of GeoTools.

Give the package name changes we will have to redo the work file by file, still it did not take too long the first time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.

Showing 41 changed files with 526 additions and 356 deletions. Show diff stats Hide diff stats

  1. 5  plugins/eu.udig.catalog.kml/src/main/java/eu/udig/catalog/kml/core/KmlUtils.java
  2. 4  plugins/eu.udig.tools.jgrass/src/eu/udig/tools/jgrass/csv/CsvImportWizard.java
  3. 11  plugins/eu.udig.tools.jgrass/src/eu/udig/tools/jgrass/geopaparazzi/ImportGeopaparazziFolderWizard.java
  4. 7  plugins/eu.udig.tools.jgrass/src/eu/udig/tools/jgrass/navigationview/NavigationView.java
  5. 6  plugins/eu.udig.tools/src/eu/udig/tools/feature/util/FeatureUtil.java
  6. 3  plugins/eu.udig.tools/src/eu/udig/tools/internal/ui/util/LayerUtil.java
  7. 4  plugins/eu.udig.tools/src/eu/udig/tools/parallel/internal/PrecisionToolsUtil.java
  8. 2  plugins/eu.udig.tools/src/eu/udig/tools/trim/internal/TrimFeaturesCommand.java
  9. 35  ...ig.catalog.ui/src/net/refractions/udig/catalog/ui/export/AbstractGeometryTransformingFeatureCollection.java
  10. 27  plugins/net.refractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/export/CatalogExportWizard.java
  11. 52  ...t.refractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/export/ReprojectingFeatureCollection.java
  12. 5  ...et.refractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/export/ToMultiLineFeatureCollection.java
  13. 3  ...t.refractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/export/ToMultiPointFeatureCollection.java
  14. 3  ...refractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/export/ToMultiPolygonFeatureCollection.java
  15. 2  plugins/net.refractions.udig.info/src/net/refractions/udig/tool/info/internal/InfoView2.java
  16. 5  ...t.refractions.udig.issues/src/net/refractions/udig/issues/internal/datastore/AbstractDatastoreStrategy.java
  17. 8  ...ig.issues/src/net/refractions/udig/issues/internal/datastore/FeatureCollectionToIssueCollectionAdapter.java
  18. 122  plugins/net.refractions.udig.libs/.classpath
  19. 122  plugins/net.refractions.udig.libs/META-INF/MANIFEST.MF
  20. 2  plugins/net.refractions.udig.libs/pom-libs.xml
  21. 32  ...et.refractions.udig.project.tests/src/net/refractions/udig/project/interceptor/ShowViewInterceptorTest.java
  22. 3  plugins/net.refractions.udig.project.tests/src/net/refractions/udig/project/internal/LayerImplTest.java
  23. 15  ...tions.udig.project.tests/src/net/refractions/udig/project/internal/commands/edit/AddFeatureCommandTest.java
  24. 10  ...ons.udig.project.tests/src/net/refractions/udig/project/internal/commands/edit/CopyFeaturesCommandTest.java
  25. 16  plugins/net.refractions.udig.project.tests/src/net/refractions/udig/project/internal/impl/EditFeatureTest.java
  26. 2  plugins/net.refractions.udig.project.ui/src/net/refractions/udig/project/ui/controls/FeatureTableControl.java
  27. 2  ...net.refractions.udig.project/src/net/refractions/udig/project/internal/commands/edit/AddFeatureCommand.java
  28. 3  ...ns.udig.tool.edit.tests/src/net/refractions/udig/tools/edit/commands/DifferenceFeatureCommandQuickTest.java
  29. 3  ...ns/net.refractions.udig.tool.edit.tests/src/net/refractions/udig/tools/edit/support/EditBlackboardTest.java
  30. 5  plugins/net.refractions.udig.tool.edit.tests/src/net/refractions/udig/tools/edit/support/TimingTests.java
  31. 4  plugins/net.refractions.udig.tool.edit/src/net/refractions/udig/tool/edit/DifferenceOp.java
  32. 2  ....refractions.udig.tool.edit/src/net/refractions/udig/tools/edit/commands/SelectFeaturesInFilterCommand.java
  33. 2  plugins/net.refractions.udig.tool.edit/src/net/refractions/udig/tools/edit/support/EditUtils.java
  34. 11  plugins/net.refractions.udig.tool.select/src/net/refractions/udig/tool/select/ArrowSelection.java
  35. 7  ...et.refractions.udig.tutorials.shpexport/src/net/refractions/udig/tutorials/shpexport/CalculateLengthOp.java
  36. 9  plugins/net.refractions.udig.ui.tests/src/net/refractions/udig/ui/FeatureTableControlTest.java
  37. 7  plugins/net.refractions.udig.ui/src/net/refractions/udig/internal/ui/FeatureTextTransfer.java
  38. 82  plugins/net.refractions.udig.ui/src/net/refractions/udig/ui/FeatureCollectionSelection.java
  39. 160  plugins/net.refractions.udig.ui/src/net/refractions/udig/ui/FeatureTableContentProvider.java
  40. 60  plugins/net.refractions.udig.ui/src/net/refractions/udig/ui/ProgressFeatureCollection.java
  41. 19  plugins/net.refractions.udig.validation/src/net/refractions/udig/validation/FeatureValidationOp.java
5  plugins/eu.udig.catalog.kml/src/main/java/eu/udig/catalog/kml/core/KmlUtils.java
@@ -26,6 +26,7 @@
26 26
 import java.util.zip.ZipInputStream;
27 27
 import java.util.zip.ZipOutputStream;
28 28
 
  29
+import org.geotools.feature.DefaultFeatureCollection;
29 30
 import org.geotools.feature.FeatureCollection;
30 31
 import org.geotools.feature.FeatureCollections;
31 32
 import org.geotools.feature.FeatureIterator;
@@ -92,7 +93,7 @@
92 93
         
93 94
         StreamingParser parser = new StreamingParser(new KMLConfiguration(), inputStream, KML.Placemark);
94 95
 
95  
-        FeatureCollection<SimpleFeatureType, SimpleFeature> newCollection = FeatureCollections.newCollection();
  96
+        DefaultFeatureCollection newCollection = new DefaultFeatureCollection();
96 97
         int index = 0;
97 98
         SimpleFeature f;
98 99
         DefaultGeographicCRS crs = DefaultGeographicCRS.WGS84;
@@ -132,7 +133,7 @@ public static void writeKml( File kmlFile, FeatureCollection<SimpleFeatureType,
132 133
         CoordinateReferenceSystem crs = featureCollection.getSchema().getCoordinateReferenceSystem();
133 134
         MathTransform mtrans = CRS.findMathTransform(crs, epsg4326, true);
134 135
 
135  
-        FeatureCollection<SimpleFeatureType, SimpleFeature> newCollection = FeatureCollections.newCollection();
  136
+        DefaultFeatureCollection newCollection = new DefaultFeatureCollection();
136 137
         FeatureIterator<SimpleFeature> featuresIterator = featureCollection.features();
137 138
         while( featuresIterator.hasNext() ) {
138 139
             SimpleFeature f = featuresIterator.next();
4  plugins/eu.udig.tools.jgrass/src/eu/udig/tools/jgrass/csv/CsvImportWizard.java
@@ -46,8 +46,8 @@
46 46
 import org.geotools.data.FeatureStore;
47 47
 import org.geotools.data.simple.SimpleFeatureCollection;
48 48
 import org.geotools.data.simple.SimpleFeatureStore;
  49
+import org.geotools.feature.DefaultFeatureCollection;
49 50
 import org.geotools.feature.FeatureCollection;
50  
-import org.geotools.feature.FeatureCollections;
51 51
 import org.geotools.feature.simple.SimpleFeatureBuilder;
52 52
 import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
53 53
 import org.geotools.gce.grassraster.JGrassConstants;
@@ -196,7 +196,7 @@ public static SimpleFeatureCollection csvFileToFeatureCollection( File csvFile,
196 196
         }
197 197
         SimpleFeatureType featureType = b.buildFeatureType();
198 198
 
199  
-        SimpleFeatureCollection newCollection = FeatureCollections.newCollection();
  199
+        DefaultFeatureCollection newCollection = new DefaultFeatureCollection();
200 200
         Collection<Integer> orderedTypeIndexes = fieldsAndTypesIndex.values();
201 201
         Integer[] orderedTypeIndexesArray = (Integer[]) orderedTypeIndexes.toArray(new Integer[orderedTypeIndexes.size()]);
202 202
 
11  plugins/eu.udig.tools.jgrass/src/eu/udig/tools/jgrass/geopaparazzi/ImportGeopaparazziFolderWizard.java
@@ -50,8 +50,7 @@
50 50
 import org.eclipse.ui.progress.IProgressService;
51 51
 import org.geotools.data.shapefile.ShapefileDataStore;
52 52
 import org.geotools.data.shapefile.ShapefileDataStoreFactory;
53  
-import org.geotools.feature.FeatureCollection;
54  
-import org.geotools.feature.FeatureCollections;
  53
+import org.geotools.feature.DefaultFeatureCollection;
55 54
 import org.geotools.feature.simple.SimpleFeatureBuilder;
56 55
 import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
57 56
 import org.geotools.geometry.jts.JTS;
@@ -205,7 +204,7 @@ private void notesToShapefile( Connection connection, File outputFolderFile, IPr
205 204
         SimpleFeatureType featureType = b.buildFeatureType();
206 205
         MathTransform transform = CRS.findMathTransform(DefaultGeographicCRS.WGS84, mapCrs);
207 206
         pm.beginTask("Import notes...", IProgressMonitor.UNKNOWN);
208  
-        FeatureCollection<SimpleFeatureType, SimpleFeature> newCollection = FeatureCollections.newCollection();
  207
+        DefaultFeatureCollection newCollection = new DefaultFeatureCollection();
209 208
 
210 209
         Statement statement = null;
211 210
         try {
@@ -335,7 +334,7 @@ private void gpsLogToShapefiles( Connection connection, File outputFolderFile, I
335 334
         try {
336 335
             MathTransform transform = CRS.findMathTransform(DefaultGeographicCRS.WGS84, mapCrs);
337 336
             pm.beginTask("Import gps to lines...", logsList.size());
338  
-            FeatureCollection<SimpleFeatureType, SimpleFeature> newCollection = FeatureCollections.newCollection();
  337
+            DefaultFeatureCollection newCollection = new DefaultFeatureCollection();
339 338
             int index = 0;
340 339
             for( GpsLog log : logsList ) {
341 340
                 List<GpsPoint> points = log.points;
@@ -400,7 +399,7 @@ private void gpsLogToShapefiles( Connection connection, File outputFolderFile, I
400 399
             MathTransform transform = CRS.findMathTransform(DefaultGeographicCRS.WGS84, mapCrs);
401 400
 
402 401
             pm.beginTask("Import gps to points...", logsList.size());
403  
-            FeatureCollection<SimpleFeatureType, SimpleFeature> newCollection = FeatureCollections.newCollection();
  402
+            DefaultFeatureCollection newCollection = new DefaultFeatureCollection();
404 403
             int index = 0;
405 404
             for( GpsLog log : logsList ) {
406 405
                 List<GpsPoint> gpsPointList = log.points;
@@ -477,7 +476,7 @@ private void mediaToShapeFile( File geopapFolderFile, File outputFolderFile, IPr
477 476
 
478 477
             MathTransform transform = CRS.findMathTransform(DefaultGeographicCRS.WGS84, mapCrs);
479 478
 
480  
-            FeatureCollection<SimpleFeatureType, SimpleFeature> newCollection = FeatureCollections.newCollection();
  479
+            DefaultFeatureCollection newCollection = new DefaultFeatureCollection();
481 480
             for( File imageFile : listFiles ) {
482 481
                 String name = imageFile.getName();
483 482
                 if (name.endsWith("jpg") || imageFile.getName().endsWith("JPG") || imageFile.getName().endsWith("png")
7  plugins/eu.udig.tools.jgrass/src/eu/udig/tools/jgrass/navigationview/NavigationView.java
@@ -78,8 +78,7 @@
78 78
 import org.eclipse.ui.part.ViewPart;
79 79
 import org.eclipse.ui.plugin.AbstractUIPlugin;
80 80
 import org.geotools.data.FeatureStore;
81  
-import org.geotools.feature.FeatureCollection;
82  
-import org.geotools.feature.FeatureCollections;
  81
+import org.geotools.feature.DefaultFeatureCollection;
83 82
 import org.geotools.feature.simple.SimpleFeatureBuilder;
84 83
 import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
85 84
 import org.geotools.geometry.jts.JTS;
@@ -104,7 +103,6 @@
104 103
 import com.vividsolutions.jts.geom.MultiPoint;
105 104
 import com.vividsolutions.jts.geom.Point;
106 105
 
107  
-import eu.udig.catalog.jgrass.JGrassPlugin;
108 106
 import eu.udig.tools.jgrass.JGrassToolsPlugin;
109 107
 
110 108
 /**
@@ -545,8 +543,7 @@ public void run( IProgressMonitor pm ) throws InvocationTargetException, Interru
545 543
                                 b.add("name", String.class);
546 544
                                 SimpleFeatureType type = b.buildFeatureType();
547 545
 
548  
-                                FeatureCollection<SimpleFeatureType, SimpleFeature> newCollection = FeatureCollections
549  
-                                        .newCollection();
  546
+                                DefaultFeatureCollection newCollection = new DefaultFeatureCollection();
550 547
 
551 548
                                 int size = keySet.size();
552 549
 
6  plugins/eu.udig.tools/src/eu/udig/tools/feature/util/FeatureUtil.java
@@ -550,7 +550,7 @@ public static SimpleFeature createFeatureWithGeometry(final SimpleFeatureType ty
550 550
 	 */
551 551
 	public static int computeCollectionSize(FeatureCollection<SimpleFeatureType, SimpleFeature> features) {
552 552
 
553  
-		Iterator<SimpleFeature> iter = features.iterator();
  553
+		FeatureIterator<SimpleFeature> iter = features.features();
554 554
 		int count = 0;
555 555
 		try {
556 556
 			while (iter.hasNext()) {
@@ -560,7 +560,7 @@ public static int computeCollectionSize(FeatureCollection<SimpleFeatureType, Sim
560 560
 		} catch (ArithmeticException e) {
561 561
 			count = Integer.MAX_VALUE;
562 562
 		} finally {
563  
-			features.close(iter);
  563
+		    iter.close();
564 564
 		}
565 565
 
566 566
 		return count;
@@ -707,7 +707,7 @@ public static SimpleFeatureType addAttributeToFeatureType(	SimpleFeatureType pro
707 707
 			return featureList;
708 708
 		} finally {
709 709
 			if (iter != null) {
710  
-				featureCollection.close(iter);
  710
+			    iter.close();
711 711
 			}
712 712
 		}
713 713
 
3  plugins/eu.udig.tools/src/eu/udig/tools/internal/ui/util/LayerUtil.java
@@ -39,6 +39,7 @@
39 39
 import org.geotools.data.FeatureSource;
40 40
 import org.geotools.data.Query;
41 41
 import org.geotools.factory.CommonFactoryFinder;
  42
+import org.geotools.feature.DefaultFeatureCollection;
42 43
 import org.geotools.feature.FeatureCollection;
43 44
 import org.geotools.feature.FeatureCollections;
44 45
 import org.opengis.feature.simple.SimpleFeature;
@@ -199,7 +200,7 @@ public static int getCountOfSelectedFeatures(final ILayer layer, final Filter fi
199 200
 					.instance().get());
200 201
 
201 202
 		if (source == null) {
202  
-			return FeatureCollections.newCollection();
  203
+			return new DefaultFeatureCollection();
203 204
 		}
204 205
 
205 206
 		FeatureCollection<SimpleFeatureType, SimpleFeature> features;
4  plugins/eu.udig.tools/src/eu/udig/tools/parallel/internal/PrecisionToolsUtil.java
@@ -104,7 +104,7 @@ public static boolean isFeatureUnderCursor(EditToolHandler handler, MapMouseEven
104 104
 			e1.printStackTrace();
105 105
 		} finally {
106 106
 			if (iterator != null) {
107  
-				collection.close(iterator);
  107
+			    iterator.close();
108 108
 			}
109 109
 		}
110 110
 		return false;
@@ -189,7 +189,7 @@ public static SimpleFeature getFeatureUnderCursor(EditToolHandler handler, MapMo
189 189
 			e1.printStackTrace();
190 190
 		} finally {
191 191
 			if (iterator != null) {
192  
-				collection.close(iterator);
  192
+			    iterator.close();
193 193
 			}
194 194
 		}
195 195
 
2  plugins/eu.udig.tools/src/eu/udig/tools/trim/internal/TrimFeaturesCommand.java
@@ -145,7 +145,7 @@ public void run() {
145 145
 						}
146 146
 					}
147 147
 				} finally {
148  
-					featuresToTrim.close(iterator);
  148
+				    iterator.close();
149 149
 				}
150 150
 
151 151
 				if (!fidNotTrimmed.equals("")) { //$NON-NLS-1$
35  ...catalog.ui/src/net/refractions/udig/catalog/ui/export/AbstractGeometryTransformingFeatureCollection.java
@@ -19,8 +19,11 @@
19 19
 import net.refractions.udig.catalog.ui.internal.Messages;
20 20
 
21 21
 import org.eclipse.core.runtime.IProgressMonitor;
  22
+import org.geotools.data.simple.SimpleFeatureCollection;
  23
+import org.geotools.data.simple.SimpleFeatureIterator;
22 24
 import org.geotools.feature.FeatureCollection;
23 25
 import org.geotools.feature.collection.AdaptorFeatureCollection;
  26
+import org.geotools.feature.collection.BaseFeatureCollection;
24 27
 import org.geotools.geometry.jts.JTS;
25 28
 import org.opengis.feature.simple.SimpleFeature;
26 29
 import org.opengis.feature.simple.SimpleFeatureType;
@@ -37,9 +40,8 @@
37 40
  * @author Jesse
38 41
  * @since 1.1.0
39 42
  */
40  
-abstract class AbstractGeometryTransformingFeatureCollection extends AdaptorFeatureCollection {
41  
-
42  
-    private final FeatureCollection<SimpleFeatureType, SimpleFeature> source;
  43
+abstract class AbstractGeometryTransformingFeatureCollection extends BaseFeatureCollection {
  44
+    private final SimpleFeatureCollection source;
43 45
     private final SimpleFeatureType schema;
44 46
     private final GeometryDescriptor typeToUseAsGeometry;
45 47
     private final IProgressMonitor monitor;
@@ -53,9 +55,9 @@
53 55
      * @param mt the math transform to use to transform the geometries from the source projection to the destination projection
54 56
      * @param monitor2 progress monitor
55 57
      */
56  
-    public AbstractGeometryTransformingFeatureCollection( FeatureCollection<SimpleFeatureType, SimpleFeature> source, SimpleFeatureType schema,
  58
+    public AbstractGeometryTransformingFeatureCollection( SimpleFeatureCollection source, SimpleFeatureType schema,
57 59
             GeometryDescriptor typeToUseAsGeometry, MathTransform mt, IProgressMonitor monitor2) {
58  
-        super("transform", schema);
  60
+        super( schema);
59 61
         
60 62
         this.source=source;
61 63
         this.schema=schema;
@@ -65,18 +67,10 @@ public AbstractGeometryTransformingFeatureCollection( FeatureCollection<SimpleFe
65 67
     }
66 68
 
67 69
     @Override
68  
-    protected void closeIterator( Iterator close ) {
69  
-        source.close(close);
70  
-    }
71  
-
72  
-    @SuppressWarnings("unchecked")
73  
-    @Override
74  
-    protected Iterator<SimpleFeature> openIterator() {
75  
-        final Iterator<SimpleFeature> iter=source.iterator();
76  
-        return new Iterator<SimpleFeature>(){
77  
-
  70
+    public SimpleFeatureIterator features() {
  71
+        final SimpleFeatureIterator iter=source.features();
  72
+        return new SimpleFeatureIterator(){
78 73
             private SimpleFeature feature;
79  
-
80 74
             public boolean hasNext() {
81 75
                 while( feature==null ){
82 76
                     if ( !iter.hasNext() )
@@ -106,11 +100,10 @@ public SimpleFeature next() {
106 100
                 monitor.worked(1);
107 101
                 return tmp;
108 102
             }
109  
-
110  
-            public void remove() {
111  
-                iter.remove();
112  
-            }
113  
-            
  103
+            @Override
  104
+            public void close() {
  105
+                iter.close();
  106
+            }            
114 107
         };
115 108
     }
116 109
     
27  plugins/net.refractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/export/CatalogExportWizard.java
@@ -42,7 +42,6 @@
42 42
 
43 43
 import org.eclipse.core.runtime.IProgressMonitor;
44 44
 import org.eclipse.core.runtime.NullProgressMonitor;
45  
-import org.eclipse.core.runtime.SubMonitor;
46 45
 import org.eclipse.core.runtime.SubProgressMonitor;
47 46
 import org.eclipse.jface.dialogs.IDialogSettings;
48 47
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -65,9 +64,11 @@
65 64
 import org.geotools.data.FeatureStore;
66 65
 import org.geotools.data.shapefile.ShapefileDataStore;
67 66
 import org.geotools.data.shapefile.indexed.IndexedShapefileDataStore;
  67
+import org.geotools.data.simple.SimpleFeatureCollection;
  68
+import org.geotools.data.simple.SimpleFeatureSource;
68 69
 import org.geotools.factory.CommonFactoryFinder;
  70
+import org.geotools.feature.DefaultFeatureCollection;
69 71
 import org.geotools.feature.FeatureCollection;
70  
-import org.geotools.feature.FeatureCollections;
71 72
 import org.geotools.feature.FeatureIterator;
72 73
 import org.geotools.feature.SchemaException;
73 74
 import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
@@ -79,7 +80,6 @@
79 80
 import org.opengis.feature.simple.SimpleFeatureType;
80 81
 import org.opengis.feature.type.AttributeDescriptor;
81 82
 import org.opengis.feature.type.GeometryDescriptor;
82  
-import org.opengis.filter.Filter;
83 83
 import org.opengis.filter.FilterFactory2;
84 84
 import org.opengis.filter.expression.Function;
85 85
 import org.opengis.filter.identity.FeatureId;
@@ -170,10 +170,8 @@ private boolean exportResource( Data data, IProgressMonitor monitor ) {
170 170
         IGeoResource resource = data.getResource();
171 171
 
172 172
         try {
173  
-            FeatureSource<SimpleFeatureType, SimpleFeature> fs = resource.resolve(
174  
-                    FeatureSource.class, null);
175  
-            FeatureCollection<SimpleFeatureType, SimpleFeature> fc = fs
176  
-                    .getFeatures(data.getQuery());
  173
+            SimpleFeatureSource fs = resource.resolve(SimpleFeatureSource.class, null);
  174
+            SimpleFeatureCollection fc = fs.getFeatures(data.getQuery());
177 175
 
178 176
             // TODO: remove from catalog/close layers if open?
179 177
             SimpleFeatureType schema = fs.getSchema();
@@ -208,12 +206,9 @@ else if (fromCRS != null)
208 206
                 // possibly multiple geometry types
209 207
                 String geomName = schema.getGeometryDescriptor().getName().getLocalPart();
210 208
 
211  
-                FeatureCollection<SimpleFeatureType, SimpleFeature> pointCollection = FeatureCollections
212  
-                        .newCollection();
213  
-                FeatureCollection<SimpleFeatureType, SimpleFeature> lineCollection = FeatureCollections
214  
-                        .newCollection();
215  
-                FeatureCollection<SimpleFeatureType, SimpleFeature> polygonCollection = FeatureCollections
216  
-                        .newCollection();
  209
+                DefaultFeatureCollection pointCollection = new DefaultFeatureCollection();
  210
+                DefaultFeatureCollection lineCollection = new DefaultFeatureCollection();
  211
+                DefaultFeatureCollection polygonCollection = new DefaultFeatureCollection();
217 212
 
218 213
                 FeatureCollection<SimpleFeatureType, SimpleFeature> featureCollection = fs
219 214
                         .getFeatures();
@@ -478,7 +473,7 @@ private CatalogView getCatalogView() {
478 473
     }
479 474
 
480 475
     private void exportLineFeatures( Data data, IProgressMonitor currentMonitor, File file,
481  
-            FeatureCollection<SimpleFeatureType, SimpleFeature> lineCollection,
  476
+            SimpleFeatureCollection lineCollection,
482 477
             SimpleFeatureType schema, String geomName, MathTransform mt )
483 478
             throws IllegalFilterException, IOException, SchemaException, MalformedURLException {
484 479
 
@@ -495,7 +490,7 @@ private void exportLineFeatures( Data data, IProgressMonitor currentMonitor, Fil
495 490
     }
496 491
 
497 492
     private void exportPointFeatures( Data data, IProgressMonitor currentMonitor, File file,
498  
-            FeatureCollection<SimpleFeatureType, SimpleFeature> pointCollection,
  493
+            SimpleFeatureCollection pointCollection,
499 494
             SimpleFeatureType schema, String geomName, MathTransform mt )
500 495
             throws IllegalFilterException, IOException, SchemaException, MalformedURLException {
501 496
 
@@ -512,7 +507,7 @@ private void exportPointFeatures( Data data, IProgressMonitor currentMonitor, Fi
512 507
     }
513 508
 
514 509
     private void exportPolygonFeatures( Data data, IProgressMonitor currentMonitor, File file,
515  
-            FeatureCollection<SimpleFeatureType, SimpleFeature> polygonCollection,
  510
+            SimpleFeatureCollection polygonCollection,
516 511
             SimpleFeatureType schema, String geomName, MathTransform mt )
517 512
             throws IllegalFilterException, IOException, SchemaException, MalformedURLException {
518 513
         File polyFile = addFileNameSuffix(file, POLY_SUFFIX);
52  ...efractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/export/ReprojectingFeatureCollection.java
@@ -14,14 +14,13 @@
14 14
  */
15 15
 package net.refractions.udig.catalog.ui.export;
16 16
 
17  
-import java.util.Iterator;
18  
-
19 17
 import net.refractions.udig.catalog.ui.internal.Messages;
20 18
 import net.refractions.udig.ui.ProgressFeatureCollection;
21 19
 
22 20
 import org.eclipse.core.runtime.IProgressMonitor;
  21
+import org.geotools.data.simple.SimpleFeatureCollection;
  22
+import org.geotools.data.simple.SimpleFeatureIterator;
23 23
 import org.geotools.feature.FeatureCollection;
24  
-import org.geotools.feature.FeatureIterator;
25 24
 import org.geotools.geometry.jts.JTS;
26 25
 import org.opengis.feature.simple.SimpleFeature;
27 26
 import org.opengis.feature.simple.SimpleFeatureType;
@@ -54,7 +53,7 @@
54 53
      * type declares the projection <em>after</em> the transformation.
55 54
      * @param mt
56 55
      */
57  
-    public ReprojectingFeatureCollection( FeatureCollection<SimpleFeatureType, SimpleFeature> delegate, IProgressMonitor monitor, 
  56
+    public ReprojectingFeatureCollection( SimpleFeatureCollection delegate, IProgressMonitor monitor, 
58 57
             SimpleFeatureType SimplefeatureType, MathTransform mt ) {
59 58
         super(delegate, monitor);
60 59
         this.mt=mt;
@@ -62,12 +61,16 @@ public ReprojectingFeatureCollection( FeatureCollection<SimpleFeatureType, Simpl
62 61
     }
63 62
     
64 63
     @Override
65  
-    protected Iterator<SimpleFeature> openIterator() {
66  
-        final FeatureIterator<SimpleFeature> iterator = delegate.features();
67  
-        return new Iterator<SimpleFeature>(){
68  
-
  64
+    public SimpleFeatureIterator features() {
  65
+        final SimpleFeatureIterator iterator = delegate.features();
  66
+        
  67
+        if( size == -1 ){
  68
+            size = delegate.size();
  69
+            monitor.beginTask(delegate.getID(), size );
  70
+        }
  71
+        return new SimpleFeatureIterator(){
  72
+            int index = 0;
69 73
             private FeatureWrapper feature;
70  
-
71 74
             public boolean hasNext() {
72 75
                 while( feature == null ) {
73 76
                     if( !iterator.hasNext() )
@@ -77,35 +80,36 @@ public boolean hasNext() {
77 80
                         continue;
78 81
                     Geometry geometry = (Geometry) next.getDefaultGeometry();
79 82
                     if( geometry!=null ){
80  
-	                    try {
81  
-	                        geometry = JTS.transform(geometry, mt);
82  
-	                    } catch (TransformException e) {
83  
-	                        throw (RuntimeException) new RuntimeException(
84  
-	                                Messages.ReprojectingFeatureCollection_transformationError + next.getID()).initCause(e);
85  
-	                    }
  83
+                            try {
  84
+                                geometry = JTS.transform(geometry, mt);
  85
+                            } catch (TransformException e) {
  86
+                                throw (RuntimeException) new RuntimeException(
  87
+                                        Messages.ReprojectingFeatureCollection_transformationError + next.getID()).initCause(e);
  88
+                            }
86 89
                     }
87 90
                     GeometryDescriptor defaultGeometry2 = featureType.getGeometryDescriptor();
88 91
                     Name name = defaultGeometry2.getName();
89 92
                     String localPart = name.getLocalPart();
90 93
                     feature = new FeatureWrapper(next, featureType, new Geometry[]{geometry}, 
91  
-                    		new String[]{ localPart});
  94
+                                new String[]{ localPart});
92 95
                 }
93 96
                 return feature!=null;
94 97
             }
95  
-
96 98
             public SimpleFeature next() {
97  
-                monitor.worked(1);
  99
+                index++;
  100
+                if( index > progress){
  101
+                    progress = index;
  102
+                    monitor.worked(1);
  103
+                }
98 104
                 FeatureWrapper tmp = feature;
99 105
                 feature=null;
100 106
                 return tmp;
101 107
             }
102  
-
103  
-            public void remove() {
104  
-                iterator.next();
105  
-            }
106  
-            
  108
+            public void close() {
  109
+                monitor.done();
  110
+                iterator.close();                
  111
+            }            
107 112
         };
108 113
     }
109 114
 
110  
-
111 115
 }
5  ...refractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/export/ToMultiLineFeatureCollection.java
@@ -15,6 +15,7 @@
15 15
 package net.refractions.udig.catalog.ui.export;
16 16
 
17 17
 import org.eclipse.core.runtime.IProgressMonitor;
  18
+import org.geotools.data.simple.SimpleFeatureCollection;
18 19
 import org.geotools.feature.FeatureCollection;
19 20
 import org.opengis.feature.simple.SimpleFeature;
20 21
 import org.opengis.feature.simple.SimpleFeatureType;
@@ -32,9 +33,9 @@
32 33
  * @author Jesse
33 34
  * @since 1.1.0
34 35
  */
35  
-class ToMultiLineFeatureCollection extends AbstractGeometryTransformingFeatureCollection{
  36
+class ToMultiLineFeatureCollection extends AbstractGeometryTransformingFeatureCollection {
36 37
 
37  
-    public ToMultiLineFeatureCollection( FeatureCollection<SimpleFeatureType, SimpleFeature> source, SimpleFeatureType schema, GeometryDescriptor typeToUseAsGeometry, 
  38
+    public ToMultiLineFeatureCollection( SimpleFeatureCollection source, SimpleFeatureType schema, GeometryDescriptor typeToUseAsGeometry, 
38 39
             MathTransform mt, IProgressMonitor monitor ) {
39 40
         super(source, schema, typeToUseAsGeometry, mt, monitor);
40 41
     }
3  ...efractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/export/ToMultiPointFeatureCollection.java
@@ -15,6 +15,7 @@
15 15
 package net.refractions.udig.catalog.ui.export;
16 16
 
17 17
 import org.eclipse.core.runtime.IProgressMonitor;
  18
+import org.geotools.data.simple.SimpleFeatureCollection;
18 19
 import org.geotools.feature.FeatureCollection;
19 20
 import org.opengis.feature.simple.SimpleFeature;
20 21
 import org.opengis.feature.simple.SimpleFeatureType;
@@ -34,7 +35,7 @@
34 35
  */
35 36
 class ToMultiPointFeatureCollection extends AbstractGeometryTransformingFeatureCollection{
36 37
 
37  
-    public ToMultiPointFeatureCollection( FeatureCollection<SimpleFeatureType, SimpleFeature> source, SimpleFeatureType schema, GeometryDescriptor typeToUseAsGeometry, 
  38
+    public ToMultiPointFeatureCollection( SimpleFeatureCollection source, SimpleFeatureType schema, GeometryDescriptor typeToUseAsGeometry, 
38 39
             MathTransform mt, IProgressMonitor currentMonitor ) {
39 40
         super(source, schema, typeToUseAsGeometry, mt, currentMonitor);
40 41
     }
3  ...ractions.udig.catalog.ui/src/net/refractions/udig/catalog/ui/export/ToMultiPolygonFeatureCollection.java
@@ -16,6 +16,7 @@
16 16
 package net.refractions.udig.catalog.ui.export;
17 17
 
18 18
 import org.eclipse.core.runtime.IProgressMonitor;
  19
+import org.geotools.data.simple.SimpleFeatureCollection;
19 20
 import org.geotools.feature.FeatureCollection;
20 21
 import org.opengis.feature.simple.SimpleFeature;
21 22
 import org.opengis.feature.simple.SimpleFeatureType;
@@ -34,7 +35,7 @@
34 35
 class ToMultiPolygonFeatureCollection extends
35 36
 		AbstractGeometryTransformingFeatureCollection {
36 37
 
37  
-    public ToMultiPolygonFeatureCollection( FeatureCollection<SimpleFeatureType, SimpleFeature> source, SimpleFeatureType schema, GeometryDescriptor typeToUseAsGeometry, MathTransform mt, IProgressMonitor monitor ) {
  38
+    public ToMultiPolygonFeatureCollection( SimpleFeatureCollection source, SimpleFeatureType schema, GeometryDescriptor typeToUseAsGeometry, MathTransform mt, IProgressMonitor monitor ) {
38 39
         super(source, schema, typeToUseAsGeometry, mt, monitor);
39 40
     }
40 41
 
2  plugins/net.refractions.udig.info/src/net/refractions/udig/tool/info/internal/InfoView2.java
@@ -610,7 +610,7 @@ private boolean isFeatureOnStore( Filter id ) {
610 610
                 } catch (IOException e) {
611 611
                     e.printStackTrace();
612 612
                 } finally {
613  
-                    collection.close(iter);
  613
+                    iter.close();
614 614
                 }
615 615
                 return false;
616 616
             }
5  ...efractions.udig.issues/src/net/refractions/udig/issues/internal/datastore/AbstractDatastoreStrategy.java
@@ -29,6 +29,7 @@
29 29
 import org.geotools.data.FeatureStore;
30 30
 import org.geotools.factory.CommonFactoryFinder;
31 31
 import org.geotools.factory.GeoTools;
  32
+import org.geotools.feature.DefaultFeatureCollection;
32 33
 import org.geotools.feature.FeatureCollection;
33 34
 import org.geotools.feature.SchemaException;
34 35
 import org.opengis.feature.simple.SimpleFeature;
@@ -144,7 +145,9 @@ public FeatureTypeAttributeMapper getAttributeMapper() throws IOException {
144 145
     }
145 146
 
146 147
     public Collection<? extends IIssue> getIssues() throws IOException {
147  
-        return new FeatureCollectionToIssueCollectionAdapter(getFeatures(), getAttributeMapper());
  148
+        DefaultFeatureCollection features = new DefaultFeatureCollection( getFeatures());
  149
+        
  150
+        return new FeatureCollectionToIssueCollectionAdapter( features , getAttributeMapper());
148 151
     }
149 152
 
150 153
     protected FeatureCollection<SimpleFeatureType, SimpleFeature> getFeatures() throws IOException {
8  ...issues/src/net/refractions/udig/issues/internal/datastore/FeatureCollectionToIssueCollectionAdapter.java
@@ -28,6 +28,7 @@
28 28
 
29 29
 import org.eclipse.ui.WorkbenchException;
30 30
 import org.eclipse.ui.XMLMemento;
  31
+import org.geotools.feature.DefaultFeatureCollection;
31 32
 import org.geotools.feature.FeatureCollection;
32 33
 import org.geotools.geometry.jts.ReferencedEnvelope;
33 34
 import org.opengis.feature.simple.SimpleFeature;
@@ -35,16 +36,19 @@
35 36
 
36 37
 /**
37 38
  * Converts a features collection(issues that have been saved as features) to a collection of issues.
  39
+ * <p>
  40
+ * Note a DefaultFeatureCollection is explicitly used inorder to force the contents
  41
+ * into memory (allowing us to use an iterator through memory).
38 42
  * 
39 43
  * @author Jesse
40 44
  * @since 1.1.0
41 45
  */
42 46
 public class FeatureCollectionToIssueCollectionAdapter extends AbstractCollection<IIssue> implements Collection<IIssue> {
43 47
 
44  
-    private FeatureCollection<SimpleFeatureType, SimpleFeature>  features;
  48
+    private DefaultFeatureCollection features;
45 49
     private FeatureTypeAttributeMapper mapper;
46 50
 
47  
-    public FeatureCollectionToIssueCollectionAdapter( FeatureCollection<SimpleFeatureType, SimpleFeature> features, FeatureTypeAttributeMapper mapper ) {
  51
+    public FeatureCollectionToIssueCollectionAdapter( DefaultFeatureCollection features, FeatureTypeAttributeMapper mapper ) {
48 52
         this.features=features;
49 53
         this.mapper=mapper;
50 54
     }
122  plugins/net.refractions.udig.libs/.classpath
@@ -18,62 +18,62 @@
18 18
 	<classpathentry exported="true" kind="lib" path="lib/geodb-0.7-RC2.jar" sourcepath="lib-src/geodb-0.7-RC2-sources.jar"/>
19 19
 	<classpathentry exported="true" kind="lib" path="lib/google-collections-0.8.jar" sourcepath="lib-src/google-collections-0.8-sources.jar"/>
20 20
 	<classpathentry exported="true" kind="lib" path="lib/groovy-all-1.7.1.jar" sourcepath="lib-src/groovy-all-1.7.1-sources.jar"/>
21  
-	<classpathentry exported="true" kind="lib" path="lib/gt-api-9-SNAPSHOT.jar" sourcepath="lib-src/gt-api-9-SNAPSHOT-sources.jar"/>
22  
-	<classpathentry exported="true" kind="lib" path="lib/gt-arcgrid-9-SNAPSHOT.jar" sourcepath="lib-src/gt-arcgrid-9-SNAPSHOT-sources.jar"/>
23  
-	<classpathentry exported="true" kind="lib" path="lib/gt-arcsde-9-SNAPSHOT.jar" sourcepath="lib-src/gt-arcsde-9-SNAPSHOT-sources.jar"/>
24  
-	<classpathentry exported="true" kind="lib" path="lib/gt-arcsde-common-9-SNAPSHOT.jar" sourcepath="lib-src/gt-arcsde-common-9-SNAPSHOT-sources.jar"/>
25  
-	<classpathentry exported="true" kind="lib" path="lib/gt-brewer-9-SNAPSHOT.jar" sourcepath="lib-src/gt-brewer-9-SNAPSHOT-sources.jar"/>
26  
-	<classpathentry exported="true" kind="lib" path="lib/gt-charts-9-SNAPSHOT.jar" sourcepath="lib-src/gt-charts-9-SNAPSHOT-sources.jar"/>
27  
-	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-9-SNAPSHOT.jar" sourcepath="lib-src/gt-coverage-9-SNAPSHOT-sources.jar"/>
28  
-	<classpathentry exported="true" kind="lib" path="lib/gt-cql-9-SNAPSHOT.jar" sourcepath="lib-src/gt-cql-9-SNAPSHOT-sources.jar"/>
29  
-	<classpathentry exported="true" kind="lib" path="lib/gt-data-9-SNAPSHOT.jar" sourcepath="lib-src/gt-data-9-SNAPSHOT-sources.jar"/>
30  
-	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-9-SNAPSHOT.jar" sourcepath="lib-src/gt-epsg-hsql-9-SNAPSHOT-sources.jar"/>
31  
-	<classpathentry exported="true" kind="lib" path="lib/gt-geotiff-9-SNAPSHOT.jar" sourcepath="lib-src/gt-geotiff-9-SNAPSHOT-sources.jar"/>
32  
-	<classpathentry exported="true" kind="lib" path="lib/gt-graph-9-SNAPSHOT.jar" sourcepath="lib-src/gt-graph-9-SNAPSHOT-sources.jar"/>
33  
-	<classpathentry exported="true" kind="lib" path="lib/gt-grassraster-9-SNAPSHOT.jar" sourcepath="lib-src/gt-grassraster-9-SNAPSHOT-sources.jar"/>
34  
-	<classpathentry exported="true" kind="lib" path="lib/gt-grid-9-SNAPSHOT.jar" sourcepath="lib-src/gt-grid-9-SNAPSHOT-sources.jar"/>
35  
-	<classpathentry exported="true" kind="lib" path="lib/gt-image-9-SNAPSHOT.jar" sourcepath="lib-src/gt-image-9-SNAPSHOT-sources.jar"/>
36  
-	<classpathentry exported="true" kind="lib" path="lib/gt-imageio-ext-gdal-9-SNAPSHOT.jar" sourcepath="lib-src/gt-imageio-ext-gdal-9-SNAPSHOT-sources.jar"/>
37  
-	<classpathentry exported="true" kind="lib" path="lib/gt-imagemosaic-9-SNAPSHOT.jar" sourcepath="lib-src/gt-imagemosaic-9-SNAPSHOT-sources.jar"/>
38  
-	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-9-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-9-SNAPSHOT-sources.jar"/>
39  
-	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-db2-9-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-db2-9-SNAPSHOT-sources.jar"/>
40  
-	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-h2-9-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-h2-9-SNAPSHOT-sources.jar"/>
41  
-	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-mysql-9-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-mysql-9-SNAPSHOT-sources.jar"/>
42  
-	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-oracle-9-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-oracle-9-SNAPSHOT-sources.jar"/>
43  
-	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-postgis-9-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-postgis-9-SNAPSHOT-sources.jar"/>
44  
-	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-spatialite-9-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-spatialite-9-SNAPSHOT-sources.jar"/>
45  
-	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-sqlserver-9-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-sqlserver-9-SNAPSHOT-sources.jar"/>
46  
-	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-teradata-9-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-teradata-9-SNAPSHOT-sources.jar"/>
47  
-	<classpathentry exported="true" kind="lib" path="lib/gt-main-9-SNAPSHOT.jar" sourcepath="lib-src/gt-main-9-SNAPSHOT-sources.jar"/>
48  
-	<classpathentry exported="true" kind="lib" path="lib/gt-metadata-9-SNAPSHOT.jar" sourcepath="lib-src/gt-metadata-9-SNAPSHOT-sources.jar"/>
49  
-	<classpathentry exported="true" kind="lib" path="lib/gt-opengis-9-SNAPSHOT.jar" sourcepath="lib-src/gt-opengis-9-SNAPSHOT-sources.jar"/>
50  
-	<classpathentry exported="true" kind="lib" path="lib/gt-process-9-SNAPSHOT.jar" sourcepath="lib-src/gt-process-9-SNAPSHOT-sources.jar"/>
51  
-	<classpathentry exported="true" kind="lib" path="lib/gt-process-feature-9-SNAPSHOT.jar" sourcepath="lib-src/gt-process-feature-9-SNAPSHOT-sources.jar"/>
52  
-	<classpathentry exported="true" kind="lib" path="lib/gt-process-geometry-9-SNAPSHOT.jar" sourcepath="lib-src/gt-process-geometry-9-SNAPSHOT-sources.jar"/>
53  
-	<classpathentry exported="true" kind="lib" path="lib/gt-process-raster-9-SNAPSHOT.jar" sourcepath="lib-src/gt-process-raster-9-SNAPSHOT-sources.jar"/>
54  
-	<classpathentry exported="true" kind="lib" path="lib/gt-property-9-SNAPSHOT.jar" sourcepath="lib-src/gt-property-9-SNAPSHOT-sources.jar"/>
55  
-	<classpathentry exported="true" kind="lib" path="lib/gt-referencing-9-SNAPSHOT.jar" sourcepath="lib-src/gt-referencing-9-SNAPSHOT-sources.jar"/>
56  
-	<classpathentry exported="true" kind="lib" path="lib/gt-render-9-SNAPSHOT.jar" sourcepath="lib-src/gt-render-9-SNAPSHOT-sources.jar"/>
57  
-	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-9-SNAPSHOT.jar" sourcepath="lib-src/gt-shapefile-9-SNAPSHOT-sources.jar"/>
58  
-	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-ng-9-SNAPSHOT.jar" sourcepath="lib-src/gt-shapefile-ng-9-SNAPSHOT-sources.jar"/>
59  
-	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-renderer-9-SNAPSHOT.jar" sourcepath="lib-src/gt-shapefile-renderer-9-SNAPSHOT-sources.jar"/>
60  
-	<classpathentry exported="true" kind="lib" path="lib/gt-svg-9-SNAPSHOT.jar" sourcepath="lib-src/gt-svg-9-SNAPSHOT-sources.jar"/>
61  
-	<classpathentry exported="true" kind="lib" path="lib/gt-swing-9-SNAPSHOT.jar" sourcepath="lib-src/gt-swing-9-SNAPSHOT-sources.jar"/>
62  
-	<classpathentry exported="true" kind="lib" path="lib/gt-validation-9-SNAPSHOT.jar" sourcepath="lib-src/gt-validation-9-SNAPSHOT-sources.jar"/>
63  
-	<classpathentry exported="true" kind="lib" path="lib/gt-wfs-9-SNAPSHOT.jar" sourcepath="lib-src/gt-wfs-9-SNAPSHOT-sources.jar"/>
64  
-	<classpathentry exported="true" kind="lib" path="lib/gt-wms-9-SNAPSHOT.jar" sourcepath="lib-src/gt-wms-9-SNAPSHOT-sources.jar"/>
65  
-	<classpathentry exported="true" kind="lib" path="lib/gt-wps-9-SNAPSHOT.jar" sourcepath="lib-src/gt-wps-9-SNAPSHOT-sources.jar"/>
66  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xml-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xml-9-SNAPSHOT-sources.jar"/>
67  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-core-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-core-9-SNAPSHOT-sources.jar"/>
68  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-fes-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-fes-9-SNAPSHOT-sources.jar"/>
69  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-filter-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-filter-9-SNAPSHOT-sources.jar"/>
70  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-gml2-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-gml2-9-SNAPSHOT-sources.jar"/>
71  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-gml3-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-gml3-9-SNAPSHOT-sources.jar"/>
72  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-kml-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-kml-9-SNAPSHOT-sources.jar"/>
73  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-ows-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-ows-9-SNAPSHOT-sources.jar"/>
74  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-sld-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-sld-9-SNAPSHOT-sources.jar"/>
75  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-wfs-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-wfs-9-SNAPSHOT-sources.jar"/>
76  
-	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-wps-9-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-wps-9-SNAPSHOT-sources.jar"/>
  21
+	<classpathentry exported="true" kind="lib" path="lib/gt-api-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-api-9.0-M0-SNAPSHOT-sources.jar"/>
  22
+	<classpathentry exported="true" kind="lib" path="lib/gt-arcgrid-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-arcgrid-9.0-M0-SNAPSHOT-sources.jar"/>
  23
+	<classpathentry exported="true" kind="lib" path="lib/gt-arcsde-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-arcsde-9.0-M0-SNAPSHOT-sources.jar"/>
  24
+	<classpathentry exported="true" kind="lib" path="lib/gt-arcsde-common-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-arcsde-common-9.0-M0-SNAPSHOT-sources.jar"/>
  25
+	<classpathentry exported="true" kind="lib" path="lib/gt-brewer-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-brewer-9.0-M0-SNAPSHOT-sources.jar"/>
  26
+	<classpathentry exported="true" kind="lib" path="lib/gt-charts-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-charts-9.0-M0-SNAPSHOT-sources.jar"/>
  27
+	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-coverage-9.0-M0-SNAPSHOT-sources.jar"/>
  28
+	<classpathentry exported="true" kind="lib" path="lib/gt-cql-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-cql-9.0-M0-SNAPSHOT-sources.jar"/>
  29
+	<classpathentry exported="true" kind="lib" path="lib/gt-data-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-data-9.0-M0-SNAPSHOT-sources.jar"/>
  30
+	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-epsg-hsql-9.0-M0-SNAPSHOT-sources.jar"/>
  31
+	<classpathentry exported="true" kind="lib" path="lib/gt-geotiff-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-geotiff-9.0-M0-SNAPSHOT-sources.jar"/>
  32
+	<classpathentry exported="true" kind="lib" path="lib/gt-graph-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-graph-9.0-M0-SNAPSHOT-sources.jar"/>
  33
+	<classpathentry exported="true" kind="lib" path="lib/gt-grassraster-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-grassraster-9.0-M0-SNAPSHOT-sources.jar"/>
  34
+	<classpathentry exported="true" kind="lib" path="lib/gt-grid-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-grid-9.0-M0-SNAPSHOT-sources.jar"/>
  35
+	<classpathentry exported="true" kind="lib" path="lib/gt-image-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-image-9.0-M0-SNAPSHOT-sources.jar"/>
  36
+	<classpathentry exported="true" kind="lib" path="lib/gt-imageio-ext-gdal-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-imageio-ext-gdal-9.0-M0-SNAPSHOT-sources.jar"/>
  37
+	<classpathentry exported="true" kind="lib" path="lib/gt-imagemosaic-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-imagemosaic-9.0-M0-SNAPSHOT-sources.jar"/>
  38
+	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-9.0-M0-SNAPSHOT-sources.jar"/>
  39
+	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-db2-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-db2-9.0-M0-SNAPSHOT-sources.jar"/>
  40
+	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-h2-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-h2-9.0-M0-SNAPSHOT-sources.jar"/>
  41
+	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-mysql-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-mysql-9.0-M0-SNAPSHOT-sources.jar"/>
  42
+	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-oracle-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-oracle-9.0-M0-SNAPSHOT-sources.jar"/>
  43
+	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-postgis-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-postgis-9.0-M0-SNAPSHOT-sources.jar"/>
  44
+	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-spatialite-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-spatialite-9.0-M0-SNAPSHOT-sources.jar"/>
  45
+	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-sqlserver-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-sqlserver-9.0-M0-SNAPSHOT-sources.jar"/>
  46
+	<classpathentry exported="true" kind="lib" path="lib/gt-jdbc-teradata-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-jdbc-teradata-9.0-M0-SNAPSHOT-sources.jar"/>
  47
+	<classpathentry exported="true" kind="lib" path="lib/gt-main-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-main-9.0-M0-SNAPSHOT-sources.jar"/>
  48
+	<classpathentry exported="true" kind="lib" path="lib/gt-metadata-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-metadata-9.0-M0-SNAPSHOT-sources.jar"/>
  49
+	<classpathentry exported="true" kind="lib" path="lib/gt-opengis-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-opengis-9.0-M0-SNAPSHOT-sources.jar"/>
  50
+	<classpathentry exported="true" kind="lib" path="lib/gt-process-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-process-9.0-M0-SNAPSHOT-sources.jar"/>
  51
+	<classpathentry exported="true" kind="lib" path="lib/gt-process-feature-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-process-feature-9.0-M0-SNAPSHOT-sources.jar"/>
  52
+	<classpathentry exported="true" kind="lib" path="lib/gt-process-geometry-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-process-geometry-9.0-M0-SNAPSHOT-sources.jar"/>
  53
+	<classpathentry exported="true" kind="lib" path="lib/gt-process-raster-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-process-raster-9.0-M0-SNAPSHOT-sources.jar"/>
  54
+	<classpathentry exported="true" kind="lib" path="lib/gt-property-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-property-9.0-M0-SNAPSHOT-sources.jar"/>
  55
+	<classpathentry exported="true" kind="lib" path="lib/gt-referencing-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-referencing-9.0-M0-SNAPSHOT-sources.jar"/>
  56
+	<classpathentry exported="true" kind="lib" path="lib/gt-render-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-render-9.0-M0-SNAPSHOT-sources.jar"/>
  57
+	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-shapefile-9.0-M0-SNAPSHOT-sources.jar"/>
  58
+	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-ng-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-shapefile-ng-9.0-M0-SNAPSHOT-sources.jar"/>
  59
+	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-renderer-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-shapefile-renderer-9.0-M0-SNAPSHOT-sources.jar"/>
  60
+	<classpathentry exported="true" kind="lib" path="lib/gt-svg-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-svg-9.0-M0-SNAPSHOT-sources.jar"/>
  61
+	<classpathentry exported="true" kind="lib" path="lib/gt-swing-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-swing-9.0-M0-SNAPSHOT-sources.jar"/>
  62
+	<classpathentry exported="true" kind="lib" path="lib/gt-validation-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-validation-9.0-M0-SNAPSHOT-sources.jar"/>
  63
+	<classpathentry exported="true" kind="lib" path="lib/gt-wfs-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-wfs-9.0-M0-SNAPSHOT-sources.jar"/>
  64
+	<classpathentry exported="true" kind="lib" path="lib/gt-wms-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-wms-9.0-M0-SNAPSHOT-sources.jar"/>
  65
+	<classpathentry exported="true" kind="lib" path="lib/gt-wps-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-wps-9.0-M0-SNAPSHOT-sources.jar"/>
  66
+	<classpathentry exported="true" kind="lib" path="lib/gt-xml-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xml-9.0-M0-SNAPSHOT-sources.jar"/>
  67
+	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-core-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-core-9.0-M0-SNAPSHOT-sources.jar"/>
  68
+	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-fes-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-fes-9.0-M0-SNAPSHOT-sources.jar"/>
  69
+	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-filter-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-filter-9.0-M0-SNAPSHOT-sources.jar"/>
  70
+	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-gml2-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-gml2-9.0-M0-SNAPSHOT-sources.jar"/>
  71
+	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-gml3-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-gml3-9.0-M0-SNAPSHOT-sources.jar"/>
  72
+	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-kml-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-kml-9.0-M0-SNAPSHOT-sources.jar"/>
  73
+	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-ows-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-ows-9.0-M0-SNAPSHOT-sources.jar"/>
  74
+	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-sld-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-sld-9.0-M0-SNAPSHOT-sources.jar"/>
  75
+	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-wfs-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-wfs-9.0-M0-SNAPSHOT-sources.jar"/>
  76
+	<classpathentry exported="true" kind="lib" path="lib/gt-xsd-wps-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/gt-xsd-wps-9.0-M0-SNAPSHOT-sources.jar"/>
77 77
 	<classpathentry exported="true" kind="lib" path="lib/h2-1.1.119.jar"/>
78 78
 	<classpathentry exported="true" kind="lib" path="lib/hatbox-1.0.b7.jar"/>
79 79
 	<classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.7.jar"/>
@@ -125,13 +125,13 @@
125 125
 	<classpathentry exported="true" kind="lib" path="lib/jts-1.12.jar" sourcepath="lib-src/jts-1.12-sources.jar"/>
126 126
 	<classpathentry exported="true" kind="lib" path="lib/miglayout-3.7.jar" sourcepath="lib-src/miglayout-3.7-sources.jar"/>
127 127
 	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.17.jar"/>
128  
-	<classpathentry exported="true" kind="lib" path="lib/net.opengis.fes-9-SNAPSHOT.jar" sourcepath="lib-src/net.opengis.fes-9-SNAPSHOT-sources.jar"/>
129  
-	<classpathentry exported="true" kind="lib" path="lib/net.opengis.ows-9-SNAPSHOT.jar" sourcepath="lib-src/net.opengis.ows-9-SNAPSHOT-sources.jar"/>
130  
-	<classpathentry exported="true" kind="lib" path="lib/net.opengis.wfs-9-SNAPSHOT.jar" sourcepath="lib-src/net.opengis.wfs-9-SNAPSHOT-sources.jar"/>
131  
-	<classpathentry exported="true" kind="lib" path="lib/net.opengis.wps-9-SNAPSHOT.jar" sourcepath="lib-src/net.opengis.wps-9-SNAPSHOT-sources.jar"/>
  128
+	<classpathentry exported="true" kind="lib" path="lib/net.opengis.fes-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/net.opengis.fes-9.0-M0-SNAPSHOT-sources.jar"/>
  129
+	<classpathentry exported="true" kind="lib" path="lib/net.opengis.ows-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/net.opengis.ows-9.0-M0-SNAPSHOT-sources.jar"/>
  130
+	<classpathentry exported="true" kind="lib" path="lib/net.opengis.wfs-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/net.opengis.wfs-9.0-M0-SNAPSHOT-sources.jar"/>
  131
+	<classpathentry exported="true" kind="lib" path="lib/net.opengis.wps-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/net.opengis.wps-9.0-M0-SNAPSHOT-sources.jar"/>
132 132
 	<classpathentry exported="true" kind="lib" path="lib/netcdf-java-4.0.41.jar"/>
133 133
 	<classpathentry exported="true" kind="lib" path="lib/opendap-2.1.jar"/>
134  
-	<classpathentry exported="true" kind="lib" path="lib/org.w3.xlink-9-SNAPSHOT.jar" sourcepath="lib-src/org.w3.xlink-9-SNAPSHOT-sources.jar"/>
  134
+	<classpathentry exported="true" kind="lib" path="lib/org.w3.xlink-9.0-M0-SNAPSHOT.jar" sourcepath="lib-src/org.w3.xlink-9.0-M0-SNAPSHOT-sources.jar"/>
135 135
 	<classpathentry exported="true" kind="lib" path="lib/picocontainer-1.2.jar"/>
136 136
 	<classpathentry exported="true" kind="lib" path="lib/postgresql-8.4-701.jdbc3.jar"/>
137 137
 	<classpathentry exported="true" kind="lib" path="lib/scannotation-1.0.2.jar" sourcepath="lib-src/scannotation-1.0.2-sources.jar"/>
122  plugins/net.refractions.udig.libs/META-INF/MANIFEST.MF
@@ -42,62 +42,62 @@ Bundle-ClassPath: .,
42 42
  lib/geodb-0.7-RC2.jar,
43 43
  lib/google-collections-0.8.jar,
44 44
  lib/groovy-all-1.7.1.jar,
45  
- lib/gt-api-9-SNAPSHOT.jar,
46  
- lib/gt-arcgrid-9-SNAPSHOT.jar,
47  
- lib/gt-arcsde-9-SNAPSHOT.jar,
48  
- lib/gt-arcsde-common-9-SNAPSHOT.jar,
49  
- lib/gt-brewer-9-SNAPSHOT.jar,
50  
- lib/gt-charts-9-SNAPSHOT.jar,
51  
- lib/gt-coverage-9-SNAPSHOT.jar,
52  
- lib/gt-cql-9-SNAPSHOT.jar,
53  
- lib/gt-data-9-SNAPSHOT.jar,
54  
- lib/gt-epsg-hsql-9-SNAPSHOT.jar,
55  
- lib/gt-geotiff-9-SNAPSHOT.jar,
56  
- lib/gt-graph-9-SNAPSHOT.jar,
57  
- lib/gt-grassraster-9-SNAPSHOT.jar,
58  
- lib/gt-grid-9-SNAPSHOT.jar,
59  
- lib/gt-image-9-SNAPSHOT.jar,
60  
- lib/gt-imageio-ext-gdal-9-SNAPSHOT.jar,
61  
- lib/gt-imagemosaic-9-SNAPSHOT.jar,
62  
- lib/gt-jdbc-9-SNAPSHOT.jar,
63  
- lib/gt-jdbc-db2-9-SNAPSHOT.jar,
64  
- lib/gt-jdbc-h2-9-SNAPSHOT.jar,
65  
- lib/gt-jdbc-mysql-9-SNAPSHOT.jar,
66  
- lib/gt-jdbc-oracle-9-SNAPSHOT.jar,
67  
- lib/gt-jdbc-postgis-9-SNAPSHOT.jar,
68  
- lib/gt-jdbc-spatialite-9-SNAPSHOT.jar,
69  
- lib/gt-jdbc-sqlserver-9-SNAPSHOT.jar,
70  
- lib/gt-jdbc-teradata-9-SNAPSHOT.jar,
71  
- lib/gt-main-9-SNAPSHOT.jar,
72  
- lib/gt-metadata-9-SNAPSHOT.jar,
73  
- lib/gt-opengis-9-SNAPSHOT.jar,
74  
- lib/gt-process-9-SNAPSHOT.jar,
75  
- lib/gt-process-feature-9-SNAPSHOT.jar,
76  
- lib/gt-process-geometry-9-SNAPSHOT.jar,
77  
- lib/gt-process-raster-9-SNAPSHOT.jar,
78  
- lib/gt-property-9-SNAPSHOT.jar,
79  
- lib/gt-referencing-9-SNAPSHOT.jar,
80  
- lib/gt-render-9-SNAPSHOT.jar,
81  
- lib/gt-shapefile-9-SNAPSHOT.jar,
82  
- lib/gt-shapefile-ng-9-SNAPSHOT.jar,
83  
- lib/gt-shapefile-renderer-9-SNAPSHOT.jar,
84  
- lib/gt-svg-9-SNAPSHOT.jar,
85  
- lib/gt-swing-9-SNAPSHOT.jar,
86  
- lib/gt-validation-9-SNAPSHOT.jar,
87  
- lib/gt-wfs-9-SNAPSHOT.jar,
88  
- lib/gt-wms-9-SNAPSHOT.jar,
89  
- lib/gt-wps-9-SNAPSHOT.jar,
90  
- lib/gt-xml-9-SNAPSHOT.jar,
91  
- lib/gt-xsd-core-9-SNAPSHOT.jar,
92  
- lib/gt-xsd-fes-9-SNAPSHOT.jar,
93  
- lib/gt-xsd-filter-9-SNAPSHOT.jar,
94  
- lib/gt-xsd-gml2-9-SNAPSHOT.jar,
95  
- lib/gt-xsd-gml3-9-SNAPSHOT.jar,
96  
- lib/gt-xsd-kml-9-SNAPSHOT.jar,
97  
- lib/gt-xsd-ows-9-SNAPSHOT.jar,
98  
- lib/gt-xsd-sld-9-SNAPSHOT.jar,
99  
- lib/gt-xsd-wfs-9-SNAPSHOT.jar,
100  
- lib/gt-xsd-wps-9-SNAPSHOT.jar,
  45
+ lib/gt-api-9.0-M0-SNAPSHOT.jar,
  46
+ lib/gt-arcgrid-9.0-M0-SNAPSHOT.jar,
  47
+ lib/gt-arcsde-9.0-M0-SNAPSHOT.jar,
  48
+ lib/gt-arcsde-common-9.0-M0-SNAPSHOT.jar,
  49
+ lib/gt-brewer-9.0-M0-SNAPSHOT.jar,
  50
+ lib/gt-charts-9.0-M0-SNAPSHOT.jar,
  51
+ lib/gt-coverage-9.0-M0-SNAPSHOT.jar,
  52
+ lib/gt-cql-9.0-M0-SNAPSHOT.jar,
  53
+ lib/gt-data-9.0-M0-SNAPSHOT.jar,
  54
+ lib/gt-epsg-hsql-9.0-M0-SNAPSHOT.jar,
  55
+ lib/gt-geotiff-9.0-M0-SNAPSHOT.jar,
  56
+ lib/gt-graph-9.0-M0-SNAPSHOT.jar,
  57
+ lib/gt-grassraster-9.0-M0-SNAPSHOT.jar,
  58
+ lib/gt-grid-9.0-M0-SNAPSHOT.jar,
  59
+ lib/gt-image-9.0-M0-SNAPSHOT.jar,
  60
+ lib/gt-imageio-ext-gdal-9.0-M0-SNAPSHOT.jar,
  61
+ lib/gt-imagemosaic-9.0-M0-SNAPSHOT.jar,
  62
+ lib/gt-jdbc-9.0-M0-SNAPSHOT.jar,
  63
+ lib/gt-jdbc-db2-9.0-M0-SNAPSHOT.jar,
  64
+ lib/gt-jdbc-h2-9.0-M0-SNAPSHOT.jar,
  65
+ lib/gt-jdbc-mysql-9.0-M0-SNAPSHOT.jar,
  66
+ lib/gt-jdbc-oracle-9.0-M0-SNAPSHOT.jar,
  67
+ lib/gt-jdbc-postgis-9.0-M0-SNAPSHOT.jar,
  68
+ lib/gt-jdbc-spatialite-9.0-M0-SNAPSHOT.jar,
  69
+ lib/gt-jdbc-sqlserver-9.0-M0-SNAPSHOT.jar,
  70
+ lib/gt-jdbc-teradata-9.0-M0-SNAPSHOT.jar,
  71
+ lib/gt-main-9.0-M0-SNAPSHOT.jar,
  72
+ lib/gt-metadata-9.0-M0-SNAPSHOT.jar,
  73
+ lib/gt-opengis-9.0-M0-SNAPSHOT.jar,
  74
+ lib/gt-process-9.0-M0-SNAPSHOT.jar,
  75
+ lib/gt-process-feature-9.0-M0-SNAPSHOT.jar,
  76
+ lib/gt-process-geometry-9.0-M0-SNAPSHOT.jar,
  77
+ lib/gt-process-raster-9.0-M0-SNAPSHOT.jar,
  78
+ lib/gt-property-9.0-M0-SNAPSHOT.jar,
  79
+ lib/gt-referencing-9.0-M0-SNAPSHOT.jar,
  80
+ lib/gt-render-9.0-M0-SNAPSHOT.jar,
  81
+ lib/gt-shapefile-9.0-M0-SNAPSHOT.jar,
  82
+ lib/gt-shapefile-ng-9.0-M0-SNAPSHOT.jar,
  83
+ lib/gt-shapefile-renderer-9.0-M0-SNAPSHOT.jar,
  84
+ lib/gt-svg-9.0-M0-SNAPSHOT.jar,
  85
+ lib/gt-swing-9.0-M0-SNAPSHOT.jar,
  86
+ lib/gt-validation-9.0-M0-SNAPSHOT.jar,
  87
+ lib/gt-wfs-9.0-M0-SNAPSHOT.jar,
  88
+ lib/gt-wms-9.0-M0-SNAPSHOT.jar,
  89
+ lib/gt-wps-9.0-M0-SNAPSHOT.jar,
  90
+ lib/gt-xml-9.0-M0-SNAPSHOT.jar,
  91
+ lib/gt-xsd-core-9.0-M0-SNAPSHOT.jar,
  92
+ lib/gt-xsd-fes-9.0-M0-SNAPSHOT.jar,
  93
+ lib/gt-xsd-filter-9.0-M0-SNAPSHOT.jar,
  94
+ lib/gt-xsd-gml2-9.0-M0-SNAPSHOT.jar,
  95
+ lib/gt-xsd-gml3-9.0-M0-SNAPSHOT.jar,
  96
+ lib/gt-xsd-kml-9.0-M0-SNAPSHOT.jar,
  97
+ lib/gt-xsd-ows-9.0-M0-SNAPSHOT.jar,
  98
+ lib/gt-xsd-sld-9.0-M0-SNAPSHOT.jar,
  99
+ lib/gt-xsd-wfs-9.0-M0-SNAPSHOT.jar,
  100
+ lib/gt-xsd-wps-9.0-M0-SNAPSHOT.jar,
101 101
  lib/h2-1.1.119.jar,
102 102
  lib/hatbox-1.0.b7.jar,
103 103
  lib/hsqldb-1.8.0.7.jar,
@@ -149,13 +149,13 @@ Bundle-ClassPath: .,
149 149
  lib/jts-1.12.jar,
150 150
  lib/miglayout-3.7.jar,
151 151
  lib/mysql-connector-java-5.1.17.jar,
152  
- lib/net.opengis.fes-9-SNAPSHOT.jar,
153  
- lib/net.opengis.ows-9-SNAPSHOT.jar,
154  
- lib/net.opengis.wfs-9-SNAPSHOT.jar,
155  
- lib/net.opengis.wps-9-SNAPSHOT.jar,
  152
+ lib/net.opengis.fes-9.0-M0-SNAPSHOT.jar,
  153
+ lib/net.opengis.ows-9.0-M0-SNAPSHOT.jar,
  154
+ lib/net.opengis.wfs-9.0-M0-SNAPSHOT.jar,
  155
+ lib/net.opengis.wps-9.0-M0-SNAPSHOT.jar,
156 156
  lib/netcdf-java-4.0.41.jar,
157 157
  lib/opendap-2.1.jar,
158  
- lib/org.w3.xlink-9-SNAPSHOT.jar,
  158
+ lib/org.w3.xlink-9.0-M0-SNAPSHOT.jar,
159 159
  lib/picocontainer-1.2.jar,
160 160
  lib/postgresql-8.4-701.jdbc3.jar,
161 161
  lib/scannotation-1.0.2.jar,
2  plugins/net.refractions.udig.libs/pom-libs.xml
@@ -33,7 +33,7 @@
33 33
     <packaging>pom</packaging>
34 34
 
35 35
     <properties>
36  
-        <geotools.version>9-SNAPSHOT</geotools.version>
  36
+        <geotools.version>9.0-M0-SNAPSHOT</geotools.version>
37 37
         <imageio-ext.version>1.1.5</imageio-ext.version>
38 38
         <jfreechart.version>1.0.13</jfreechart.version>
39 39
         <jt.version>1.3.0</jt.version>
32  ...refractions.udig.project.tests/src/net/refractions/udig/project/interceptor/ShowViewInterceptorTest.java