[Mulgara-svn] r1363 - trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene
ronald at mulgara.org
ronald at mulgara.org
Mon Oct 27 12:38:28 UTC 2008
Author: ronald
Date: 2008-10-27 05:38:27 -0700 (Mon, 27 Oct 2008)
New Revision: 1363
Modified:
trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndex.java
trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java
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:
Replaced wildcard imports with explicit ones, made some code formatting fixes,
and made loggers final.
Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndex.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndex.java 2008-10-23 13:42:39 UTC (rev 1362)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndex.java 2008-10-27 12:38:27 UTC (rev 1363)
@@ -418,7 +418,7 @@
/**
* Add a document into the fulltext string pool. The constants {@link
* #SUBJECT_KEY}, {@link #PREDICATE_KEY}, {@link #LITERAL_KEY} should be used
- * in the query to reference the relevant index fields if the index is to read
+ * in the query to reference the relevant index fields if the index is to read
* by queries.
*
* @param indexDocument The document to be indexed.
Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java 2008-10-23 13:42:39 UTC (rev 1362)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java 2008-10-27 12:38:27 UTC (rev 1363)
@@ -42,8 +42,14 @@
import org.jrdf.graph.URIReference;
// local packages
-import org.mulgara.query.*;
-import org.mulgara.query.rdf.*;
+import org.mulgara.query.Constraint;
+import org.mulgara.query.ConstraintElement;
+import org.mulgara.query.LocalNode;
+import org.mulgara.query.QueryException;
+import org.mulgara.query.TuplesException;
+import org.mulgara.query.Variable;
+import org.mulgara.query.rdf.LiteralImpl;
+import org.mulgara.query.rdf.URIReferenceImpl;
import org.mulgara.resolver.spi.GlobalizeException;
import org.mulgara.resolver.spi.LocalizeException;
import org.mulgara.resolver.spi.Resolution;
@@ -71,9 +77,7 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-class FullTextStringIndexTuples extends AbstractTuples implements Resolution,
- Cloneable {
-
+class FullTextStringIndexTuples extends AbstractTuples implements Resolution, Cloneable {
/** Logger. */
private final static Logger logger = Logger.getLogger(FullTextStringIndexTuples.class);
@@ -254,8 +258,7 @@
Float.toString(hits.score(nextDocumentIndex - 1)), XSD.DOUBLE_URI,
"", true);
*/
- return session.localize(new LiteralImpl(hits.score(nextDocumentIndex -
- 1)));
+ return session.localize(new LiteralImpl(hits.score(nextDocumentIndex - 1)));
} else {
throw new TuplesException("Column " + column + " does not exist");
}
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-23 13:42:39 UTC (rev 1362)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java 2008-10-27 12:38:27 UTC (rev 1363)
@@ -98,9 +98,8 @@
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
public class LuceneResolver implements Resolver {
-
/** Logger. */
- private static Logger logger = Logger.getLogger(LuceneResolver.class.getName());
+ private static final Logger logger = Logger.getLogger(LuceneResolver.class);
/**
* The preallocated node identifying the type of temporary model to create
@@ -360,8 +359,7 @@
if (modelElement instanceof Variable) {
if (logger.isDebugEnabled()) logger.debug("Ignoring solutions for " + constraint);
return new EmptyResolution(constraint, false);
- }
- else if (!(modelElement instanceof LocalNode)) {
+ } else if (!(modelElement instanceof LocalNode)) {
throw new QueryException("Failed to localize Lucene Model before resolution " + constraint);
}
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-23 13:42:39 UTC (rev 1362)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverFactory.java 2008-10-27 12:38:27 UTC (rev 1363)
@@ -28,16 +28,20 @@
package org.mulgara.resolver.lucene;
// Java 2 standard packages
-import java.net.*;
+import java.net.URI;
// Third party packages
import org.apache.log4j.Logger;
-import org.jrdf.vocabulary.RDF;
// Locally written packages
import org.mulgara.query.rdf.Mulgara;
-import org.mulgara.query.rdf.URIReferenceImpl;
-import org.mulgara.resolver.spi.*;
+import org.mulgara.resolver.spi.InitializerException;
+import org.mulgara.resolver.spi.NoSystemResolverFactoryException;
+import org.mulgara.resolver.spi.Resolver;
+import org.mulgara.resolver.spi.ResolverFactory;
+import org.mulgara.resolver.spi.ResolverFactoryException;
+import org.mulgara.resolver.spi.ResolverFactoryInitializer;
+import org.mulgara.resolver.spi.ResolverSession;
/**
* Resolves constraints in models defined by static RDF documents.
@@ -60,9 +64,8 @@
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
public class LuceneResolverFactory implements ResolverFactory {
-
/** Logger. */
- private static Logger logger = Logger.getLogger(LuceneResolverFactory.class.getName());
+ private static final Logger logger = Logger.getLogger(LuceneResolverFactory.class);
private String directory;
private URI modelTypeURI;
@@ -125,7 +128,7 @@
* @return <code>null</code> - no default graphs for this resolver
*/
public Graph[] getDefaultGraphs() { return null; }
-
+
/**
* {@inheritDoc}
* @return <code>false</code> - this graph does not support exports.
@@ -142,9 +145,8 @@
* @throws InitializerException if the XML Schema resources
* can't be found or created
*/
- public static ResolverFactory newInstance(
- ResolverFactoryInitializer resolverFactoryInitializer
- ) throws InitializerException {
+ public static ResolverFactory newInstance(ResolverFactoryInitializer resolverFactoryInitializer)
+ throws InitializerException {
if (logger.isDebugEnabled()) logger.debug("Creating Lucene resolver factory");
return new LuceneResolverFactory(resolverFactoryInitializer);
}
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-23 13:42:39 UTC (rev 1362)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/ReadOnlyLuceneResolver.java 2008-10-27 12:38:27 UTC (rev 1363)
@@ -28,13 +28,18 @@
package org.mulgara.resolver.lucene;
// Java 2 standard packages
-import java.net.*;
+import java.net.URI;
// Third party packages
import org.apache.log4j.Logger;
// Locally written packages
-import org.mulgara.resolver.spi.*;
+import org.mulgara.resolver.spi.LocalizeException;
+import org.mulgara.resolver.spi.ResolverException;
+import org.mulgara.resolver.spi.ResolverFactory;
+import org.mulgara.resolver.spi.ResolverFactoryException;
+import org.mulgara.resolver.spi.ResolverSession;
+import org.mulgara.resolver.spi.Statements;
/**
* Resolves constraints in models defined by static RDF documents.
@@ -58,7 +63,8 @@
*/
public class ReadOnlyLuceneResolver extends LuceneResolver {
/** Logger. */
- private static Logger logger = Logger.getLogger(ReadOnlyLuceneResolver.class.getName());
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(ReadOnlyLuceneResolver.class);
//
// Constructors
More information about the Mulgara-svn
mailing list