[Geotools-commits] svn - r36505 - in trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic: . properties/numeric

[<svn...@os...>]

Author: danieleromagnoli
Date: 2011-01-31 08:34:22 -0800 (Mon, 31 Jan 2011)
New Revision: 36505

Modified:
   trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/MosaicConfigurationBean.java
   trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/Utils.java
   trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/properties/numeric/NumericFileNameExtractor.java
Log:
GEOT-3404: NumericConverterFactory

Modified: trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/MosaicConfigurationBean.java
===================================================================
--- trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/MosaicConfigurationBean.java	2011-01-31 16:32:48 UTC (rev 36504)
+++ trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/MosaicConfigurationBean.java	2011-01-31 16:34:22 UTC (rev 36505)
@@ -125,7 +125,7 @@
 	}
 
 	/** we want to use caching for our index.*/
-	private boolean caching=true;
+	private boolean caching = Utils.DEFAULT_CACHING;
 
    /** <code>true</code> if we need to manage footprint if available.  */
     private boolean footprintManagement;

Modified: trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/Utils.java
===================================================================
--- trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/Utils.java	2011-01-31 16:32:48 UTC (rev 36504)
+++ trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/Utils.java	2011-01-31 16:34:22 UTC (rev 36505)
@@ -966,6 +966,8 @@
 	static final int DEFAULT_MAX_POOLSIZE = 15;
 	public static final int DEFAULT_KEEP_ALIVE = 30;
 	static final QueueType DEFAULT_QUEUE_TYPE = QueueType.getDefault();
+
+	public static final boolean DEFAULT_CACHING = true;
 	/** 
 	     * Build a background values array using the same dataType of the input {@link SampleModel} (if available). 
 	     * 

Modified: trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/properties/numeric/NumericFileNameExtractor.java
===================================================================
--- trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/properties/numeric/NumericFileNameExtractor.java	2011-01-31 16:32:48 UTC (rev 36504)
+++ trunk/modules/plugin/imagemosaic/src/main/java/org/geotools/gce/imagemosaic/properties/numeric/NumericFileNameExtractor.java	2011-01-31 16:34:22 UTC (rev 36505)
@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -26,12 +25,14 @@
 import org.geotools.gce.imagemosaic.properties.PropertiesCollectorSPI;
 import org.geotools.gce.imagemosaic.properties.RegExPropertiesCollector;
 import org.geotools.util.Converter;
-import org.geotools.util.ConverterFactory;
-import org.geotools.util.Converters;
+import org.geotools.util.NumericConverterFactory;
 import org.geotools.util.logging.Logging;
 import org.opengis.feature.simple.SimpleFeature;
 
 abstract class NumericFileNameExtractor <N extends Number & Comparable<N>> extends RegExPropertiesCollector {
+    
+    final static NumericConverterFactory factory = new NumericConverterFactory();
+    
     static class IntegerFileNameExtractor extends NumericFileNameExtractor<Integer>{
 
         public IntegerFileNameExtractor(PropertiesCollectorSPI spi, List<String> propertyNames,
@@ -101,17 +102,16 @@
 		super(spi,  propertyNames,regex);
 		
                 this.targetClasse = targetClass;
-                if (targetClasse != null) {
-                    // look up a converter
-                    final Set<ConverterFactory> converters = Converters.getConverterFactories(String.class,
-                            targetClasse);
-                    if (!converters.isEmpty()) {
-                        this.converter = converters.iterator().next().createConverter(String.class, targetClasse, GeoTools.getDefaultHints());
-                        return;
-                    }
-                    throw new IllegalArgumentException(
-                            "Unable to find a proper converter from String to the class:" + targetClasse);
-                }
+                this.converter = factory.createConverter(String.class, targetClasse, GeoTools.getDefaultHints());
+//                if (targetClasse != null) {
+//                    // look up a converter
+//                    final Set<ConverterFactory> converters = Converters.getConverterFactories(String.class, targetClasse);
+//                    if (!converters.isEmpty()) {
+//                        this.converter = converters.iterator().next().createConverter(String.class, targetClasse, GeoTools.getDefaultHints());
+//                        return;
+//                    }
+//                    throw new IllegalArgumentException("Unable to find a proper converter from String to the class:" + targetClasse);
+//                }
 
 	}