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

[ronald at mulgara.org]

Author: ronald
Date: 2008-10-14 06:52:55 -0700 (Tue, 14 Oct 2008)
New Revision: 1309

Modified:
   trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java
   trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverFactory.java
   trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/ReadOnlyLuceneResolver.java
Log:
Remove unused arguments to LuceneResolver constructor, and fixed javadocs.

Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java	2008-10-14 13:52:46 UTC (rev 1308)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java	2008-10-14 13:52:55 UTC (rev 1309)
@@ -114,14 +114,12 @@
   /**
    * Construct a resolver.
    *
+   * @param modelTypeURI     the URI of the lucene model type
    * @param resolverSession  the session this resolver is associated with
-   * @throws IllegalArgumentException  if <var>session</var> is
-   *   <code>null</code>
+   * @param directory        the directory to use for the lucene indexes
+   * @throws IllegalArgumentException  if <var>directory</var> is <code>null</code>
    */
-  LuceneResolver(Resolver systemResolver, long rdfType, long systemModel,
-                 URI modelTypeURI, ResolverSession resolverSession, String directory)
-      throws ResolverFactoryException {
-
+  LuceneResolver(URI modelTypeURI, ResolverSession resolverSession, String directory) {
     if (directory == null) {
       throw new IllegalArgumentException("Null directory in LuceneResolver");
     }

Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverFactory.java	2008-10-14 13:52:46 UTC (rev 1308)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverFactory.java	2008-10-14 13:52:55 UTC (rev 1309)
@@ -66,8 +66,6 @@
 
   private String directory;
   private URI modelTypeURI;
-  private long rdfType;
-  private long systemModel;
 
   //
   // Constructors
@@ -90,10 +88,6 @@
       // Initialize fields
       directory = initializer.getDirectory().toString();
 
-      rdfType = initializer.preallocate(new URIReferenceImpl(RDF.TYPE));
-
-      systemModel = initializer.getSystemModel();
-
       // Claim mulgara:LuceneModel
       initializer.addModelType(modelTypeURI, this);
 
@@ -168,7 +162,7 @@
       throws ResolverFactoryException {
     if (logger.isDebugEnabled()) logger.debug("Creating Lucene resolver");
     return canWrite
-      ? new LuceneResolver(systemResolver, rdfType, systemModel, modelTypeURI, resolverSession, directory)
-      : new ReadOnlyLuceneResolver(systemResolver, rdfType, systemModel, modelTypeURI, resolverSession, directory);
+      ? new LuceneResolver(modelTypeURI, resolverSession, directory)
+      : new ReadOnlyLuceneResolver(modelTypeURI, resolverSession, directory);
   }
 }

Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/ReadOnlyLuceneResolver.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/ReadOnlyLuceneResolver.java	2008-10-14 13:52:46 UTC (rev 1308)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/ReadOnlyLuceneResolver.java	2008-10-14 13:52:55 UTC (rev 1309)
@@ -67,14 +67,14 @@
   /**
    * Construct a resolver.
    *
+   * @param modelTypeURI     the URI of the lucene model type
    * @param resolverSession  the session this resolver is associated with
-   * @throws IllegalArgumentException  if <var>session</var> is
-   *   <code>null</code>
+   * @param directory        the directory to use for the lucene indexes
+   * @throws IllegalArgumentException  if <var>directory</var> is <code>null</code>
    */
-  ReadOnlyLuceneResolver(Resolver systemResolver, long rdfType, long systemModel,
-                 URI modelTypeURI, ResolverSession resolverSession, String directory)
+  ReadOnlyLuceneResolver(URI modelTypeURI, ResolverSession resolverSession, String directory)
       throws ResolverFactoryException {
-    super(systemResolver, rdfType, systemModel, modelTypeURI, resolverSession, directory);
+    super(modelTypeURI, resolverSession, directory);
   }
 
   //