[Mulgara-svn] r1780 - in trunk/src/jar: resolver-lucene/java/org/mulgara/resolver/lucene resolver-spi/java/org/mulgara/resolver/spi

[pag at mulgara.org]

Author: pag
Date: 2009-08-19 22:11:03 -0700 (Wed, 19 Aug 2009)
New Revision: 1780

Modified:
   trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexException.java
   trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexUnitTest.java
   trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneConstraint.java
   trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneIndexerCache.java
   trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverUnitTest.java
   trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverException.java
Log:
Removed warnings by adding serialization IDs and removing unused variables. Also fixed some TODO Javadocs and cleaned up some of the formatting

Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexException.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexException.java	2009-08-20 05:09:53 UTC (rev 1779)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexException.java	2009-08-20 05:11:03 UTC (rev 1780)
@@ -50,29 +50,29 @@
  */
 public class FullTextStringIndexException extends Exception {
 
+  /** Generated serialization ID */
+  private static final long serialVersionUID = 787298465503301231L;
+
   /**
-   * CONSTRUCTOR FullTextStringIndexException TO DO
-   *
-   * @param message PARAMETER TO DO
+   * Create a new exception for the full text string index.
+   * @param message The error message
    */
   public FullTextStringIndexException(String message) {
     super(message);
   }
 
   /**
-   * CONSTRUCTOR FullTextStringIndexException TO DO
-   *
-   * @param message PARAMETER TO DO
-   * @param cause PARAMETER TO DO
+   * Create a new exception with chaining for the full text string index.
+   * @param message The eror message
+   * @param cause The exception to be chained
    */
   public FullTextStringIndexException(String message, Throwable cause) {
     super(message, cause);
   }
 
   /**
-   * CONSTRUCTOR FullTextStringIndexException TO DO
-   *
-   * @param cause PARAMETER TO DO
+   * Create a new exception with chaining for the full text string index.
+   * @param cause The exception to be chained
    */
   public FullTextStringIndexException(Throwable cause) {
     super(cause);

Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexUnitTest.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexUnitTest.java	2009-08-20 05:09:53 UTC (rev 1779)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexUnitTest.java	2009-08-20 05:11:03 UTC (rev 1780)
@@ -71,10 +71,6 @@
   private final static String indexDirectory =
       TempDir.getTempDir().getPath() + File.separator + "fulltextsp";
 
-  /** Directory for the indexes * */
-  private final static String indexDirectory2 =
-      TempDir.getTempDir().getPath() + File.separator + "fulltextsp2";
-
   /** The directory containing the text documents */
   private final static String textDirectory =
       System.getProperty("cvs.root") + File.separator + "data" + File.separator +

Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneConstraint.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneConstraint.java	2009-08-20 05:09:53 UTC (rev 1779)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneConstraint.java	2009-08-20 05:11:03 UTC (rev 1780)
@@ -44,8 +44,9 @@
   private static final Logger logger = Logger.getLogger(LuceneConstraint.class);
   private static final long serialVersionUID = 1L;
 
-  private final URIReference searchPred;
-  private final URIReference scorePred;
+  // Leaving these unused fields as comment in case we ever want them after all
+  // private final URIReference searchPred;
+  // private final URIReference scorePred;
 
   private ConstraintElement model;
   private ConstraintElement subject;
@@ -58,8 +59,8 @@
    * Empty constructor. Used internally during constraint rewriting.
    */
   private LuceneConstraint() {
-    searchPred = null;
-    scorePred = null;
+    // searchPred = null;
+    // scorePred = null;
   }
 
   /**
@@ -86,8 +87,8 @@
    */
   LuceneConstraint(Constraint constraint, URIReference searchPred, URIReference scorePred)
       throws SymbolicTransformationException {
-    this.searchPred = searchPred;
-    this.scorePred = scorePred;
+    // this.searchPred = searchPred;
+    // this.scorePred = scorePred;
 
     // extract model
     model = constraint.getModel();

Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneIndexerCache.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneIndexerCache.java	2009-08-20 05:09:53 UTC (rev 1779)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneIndexerCache.java	2009-08-20 05:11:03 UTC (rev 1780)
@@ -320,6 +320,9 @@
   }
 
   private static class Stack<T> extends ArrayList<T> {
+    /** Serialization ID */
+    private static final long serialVersionUID = -8597253123267228667L;
+
     public void push(T obj) {
       add(obj);
     }

Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverUnitTest.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverUnitTest.java	2009-08-20 05:09:53 UTC (rev 1779)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverUnitTest.java	2009-08-20 05:11:03 UTC (rev 1780)
@@ -145,7 +145,6 @@
                    null,                            // no dir for temp strings
                    tempResolverFactoryClassName,    // temporary models
                    null,                            // no dir for temp models
-                   "",                              // no rule loader
                    "org.mulgara.content.rdfxml.RDFXMLContentHandler");
 
       database.addContentHandler("org.mulgara.content.n3.N3ContentHandler");

Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverException.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverException.java	2009-08-20 05:09:53 UTC (rev 1779)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverException.java	2009-08-20 05:11:03 UTC (rev 1780)
@@ -40,13 +40,14 @@
  * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
  */
 
-public class ResolverException extends Exception
-{
+public class ResolverException extends Exception {
+  /** Serialization ID */
+  private static final long serialVersionUID = -2032778680010965039L;
+
   /**
    * @param message  diagnostic text
    */
-  public ResolverException(String message)
-  {
+  public ResolverException(String message) {
     super(message);
   }
 
@@ -54,8 +55,7 @@
    * @param message  diagnostic text
    * @param cause  an exception to be chained as the reason for this one
    */
-  public ResolverException(String message, Throwable cause)
-  {
+  public ResolverException(String message, Throwable cause) {
     super(message, cause);
   }
 }