[Mulgara-svn] r2046 - trunk/src/jar/resolver/java/org/mulgara/resolver

[pag at mulgara.org]

Author: pag
Date: 2011-09-27 17:52:24 +0000 (Tue, 27 Sep 2011)
New Revision: 2046

Modified:
   trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseResolverFactoryInitializer.java
Log:
Cleaned up some generics and removed some dead code

Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseResolverFactoryInitializer.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseResolverFactoryInitializer.java	2011-09-27 16:39:58 UTC (rev 2045)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseResolverFactoryInitializer.java	2011-09-27 17:52:24 UTC (rev 2046)
@@ -88,7 +88,6 @@
     // Validate parameters
     if (cachedResolverFactorySet == null) throw new IllegalArgumentException("Null \"cachedResolverFactorySet\" parameter");
     if (database == null) throw new IllegalArgumentException("database null");
-    if (metadata == null) throw new IllegalArgumentException("metadata null");
     if (contentHandlerManager == null) throw new IllegalArgumentException("contentHandlerManager null");
 
     // Initialize fields
@@ -195,13 +194,13 @@
     Class<? extends Constraint> constraintClass = descriptor.getConstraintClass();
     if (!ConstraintOperations.constraintRegistered(constraintClass)) {
       // FIXME: This needs refactoring.  With the constraint registration in place, ConstraintOperations can be simplifed.
-      ConstraintOperations.addConstraintResolutionHandlers(new NVPair[] { new NVPair(constraintClass, descriptor), });
-      ConstraintOperations.addConstraintModelRewrites(new NVPair[] { new NVPair(constraintClass, descriptor) });
+      ConstraintOperations.addConstraintResolutionHandlers(new NVPair[] { new NVPair<Class<? extends Constraint>,ConstraintDescriptor>(constraintClass, descriptor), });
+      ConstraintOperations.addConstraintModelRewrites(new NVPair[] { new NVPair<Class<? extends Constraint>,ConstraintDescriptor>(constraintClass, descriptor) });
       if (descriptor instanceof ConstraintLocalization) {
-        ConstraintOperations.addConstraintLocalizations(new NVPair[] { new NVPair(constraintClass, descriptor) });
+        ConstraintOperations.addConstraintLocalizations(new NVPair[] { new NVPair<Class<? extends Constraint>,ConstraintDescriptor>(constraintClass, descriptor) });
       }
       if (descriptor instanceof ConstraintBindingHandler) {
-        ConstraintOperations.addConstraintBindingHandlers(new NVPair[] { new NVPair(constraintClass, descriptor) });
+        ConstraintOperations.addConstraintBindingHandlers(new NVPair[] { new NVPair<Class<? extends Constraint>,ConstraintDescriptor>(constraintClass, descriptor) });
       }
     } else {
       // FIXME: We need to eliminate the use of static variables (as opposed to constants).