[Geotools-commits] CVS: geotools2/geotools-src/cts-coordtrans/src/org/geotools/resources DescriptorNaming.java,1.1,1.2

[Martin D. <des...@us...>]

Update of /cvsroot/geotools/geotools2/geotools-src/cts-coordtrans/src/org/geotools/resources
In directory usw-pr-cvs1:/tmp/cvs-serv29960/geotools-src/cts-coordtrans/src/org/geotools/resources

Modified Files:
	DescriptorNaming.java 
Log Message:
First working implementation of EPSG factory

Index: DescriptorNaming.java
===================================================================
RCS file: /cvsroot/geotools/geotools2/geotools-src/cts-coordtrans/src/org/geotools/resources/DescriptorNaming.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -w -C2 -d -r1.1 -r1.2
*** DescriptorNaming.java	30 May 2002 22:40:18 -0000	1.1
--- DescriptorNaming.java	30 Jul 2002 17:08:56 -0000	1.2
***************
*** 38,41 ****
--- 38,45 ----
  import java.util.Iterator;
  
+ // Reflection
+ import java.lang.reflect.Method;
+ import java.lang.reflect.InvocationTargetException;
+ 
  // Parameters and JAI utilities
  import javax.media.jai.ParameterList;
***************
*** 105,111 ****
      private void bindDefaults(final String method) {
          try {
!             Class.forName(initializer);
          } catch (ClassNotFoundException exception) {
              Utilities.unexpectedException(logger, "DescriptorNaming", method, exception);
          }
      }
--- 109,123 ----
      private void bindDefaults(final String method) {
          try {
!             final  Class c = Class.forName(initializer);
!             final Method m = c.getMethod("getDefault", null);
!             m.invoke(null, null);
          } catch (ClassNotFoundException exception) {
              Utilities.unexpectedException(logger, "DescriptorNaming", method, exception);
+         } catch (NoSuchMethodException exception) {
+             // No "getDefault()" static method. Ignore...
+         } catch (IllegalAccessException exception) {
+             // The method is not public. Treat it as if they were no "getDefault()" method.
+         } catch (InvocationTargetException exception) {
+             Utilities.unexpectedException(logger, "DescriptorNaming", method, exception);
          }
      }