Fixes for recent geotools changes

Author: jericks

src/main/groovy/geoscript/layer/Shapefile.groovy

@@ -2,9 +2,9 @@ package geoscript.layer
 
 import geoscript.GeoScript
 import geoscript.workspace.Directory
-import org.geotools.data.DataUtilities
 import org.geotools.data.shapefile.files.ShpFileType
 import org.geotools.data.shapefile.ShapefileDumper
+import org.geotools.util.URLs
 
 /**
  * A Shapefile Layer.
@@ -37,7 +37,7 @@ class Shapefile extends Layer {
      * @return The Shapefile's File
      */
     File getFile() {
-        DataUtilities.urlToFile(new URL(fs.dataStore.shpFiles.get(ShpFileType.SHP)))
+        URLs.urlToFile(new URL(fs.dataStore.shpFiles.get(ShpFileType.SHP)))
     }
 
     /**

src/main/groovy/geoscript/style/Symbolizer.groovy

@@ -351,7 +351,7 @@ class Symbolizer implements Style, Cloneable {
                 ftbl.keySet().each{Filter fil ->
                     List syms = ftbl[fil]
                     Rule rule = styleFactory.createRule()
-                    fts.addRule(rule)
+                    fts.rules().add(rule)
                     if (scale[0] > -1) {
                         rule.minScaleDenominator = scale.min
                     }

src/main/groovy/geoscript/workspace/Database.groovy

@@ -160,7 +160,7 @@ class Database extends Workspace {
         if (primaryKeyFields != null && primaryKeyFields.size() > 0) {
             vt.setPrimaryKeyColumns(primaryKeyFields[0] instanceof Field ? primaryKeyFields.collect{fld->fld.name} : primaryKeyFields)
         }
-        (ds as JDBCDataStore).addVirtualTable(vt)
+        (ds as JDBCDataStore).createVirtualTable(vt)
     }
 
     /**

src/main/groovy/geoscript/workspace/Directory.groovy

@@ -3,11 +3,11 @@ package geoscript.workspace
 import geoscript.GeoScript
 import geoscript.layer.Layer
 import org.geotools.data.DataStore
-import org.geotools.data.DataUtilities
 import org.geotools.data.directory.DirectoryDataStore
 import org.geotools.data.shapefile.ShapefileDataStore
 import org.geotools.data.shapefile.ShapefileDataStoreFactory
 import org.geotools.data.shapefile.files.ShpFileType
+import org.geotools.util.URLs
 
 /**
  * A Directory Workspace can contain one or more Shapefiles.
@@ -133,9 +133,9 @@ class Directory extends Workspace {
             Map params = [:]
             if (!str.contains("=") && str.endsWith(".shp")) {
                 if (str.startsWith("file:/")) {
-                    params.put("url", DataUtilities.fileToURL(DataUtilities.urlToFile(new URL(str)).getAbsoluteFile().getParentFile()))
+                    params.put("url", URLs.fileToUrl(URLs.urlToFile(new URL(str)).getAbsoluteFile().getParentFile()))
                 } else {
-                    params.put("url", DataUtilities.fileToURL(new File(str).getAbsoluteFile().getParentFile()))
+                    params.put("url", URLs.fileToUrl(new File(str).getAbsoluteFile().getParentFile()))
                 }
             } else if (!str.contains("=") && new File(str).isDirectory()) {
                 params.put("url", new File(str).toURL())
@@ -149,7 +149,7 @@ class Directory extends Workspace {
         Directory create(String type, Map params) {
             if (type.equalsIgnoreCase('shapefile') && params.containsKey('file')) {
                 File file = params.get('file') instanceof File ? params.get('file') : new File(params.get('file'))
-                super.create([url: DataUtilities.fileToURL(file.absoluteFile)])
+                super.create([url: URLs.fileToUrl(file.absoluteFile)])
             } else if (type.equalsIgnoreCase('shapefile') && params.containsKey('url') && params.containsKey("dir")) {
                 URL url = params.get('url') instanceof URL ? params.get('url') : new URL(params.get('url'))
                 File dir = params.get('dir') instanceof File ? params.get('dir') : new File(params.get('dir'))
@@ -159,7 +159,7 @@ class Directory extends Workspace {
                 File file = File.createTempFile("download",".zip")
                 GeoScript.download(url, file, overwrite: params.get("overwrite", true) as boolean)
                 GeoScript.unzip(file, dir)
-                super.create([url: DataUtilities.fileToURL(dir.absoluteFile)])
+                super.create([url: URLs.fileToUrl(dir.absoluteFile)])
             } else {
                 null
             }

src/main/groovy/geoscript/workspace/Workspace.groovy

@@ -7,10 +7,10 @@ import geoscript.feature.Schema
 import geoscript.layer.Cursor
 import geoscript.layer.Layer
 import org.geotools.data.DataStore
-import org.geotools.data.DataUtilities
 import org.geotools.feature.FeatureCollection
 import org.geotools.data.collection.ListFeatureCollection
 import org.geotools.data.DataStoreFinder
+import org.geotools.util.URLs
 
 /**
  * A Workspace is a container of Layers.
@@ -319,9 +319,9 @@ class Workspace {
                     try {
                         // URLs with a protocol (file: http:)
                         value = new URL(value)
-                        File file = DataUtilities.urlToFile(value)
+                        File file = URLs.urlToFile(value)
                         if (file != null) {
-                            value = DataUtilities.fileToURL(file.absoluteFile)
+                            value = URLs.fileToUrl(file.absoluteFile)
                         } else {
                             value = new URL(value)
                         }