[Mulgara-svn] r2056 - in trunk/src/jar: content-n3/java/org/mulgara/content/n3 content-rdfxml/java/org/mulgara/content/rdfxml query/java/org/mulgara/jena query/java/org/mulgara/query query/java/org/mulgara/query/filter/value query/java/org/mulgara/server querylang/java/org/mulgara/itql resolver/java/org/mulgara/resolver resolver-memory/java/org/mulgara/resolver/memory resolver-nodetype/java/org/mulgara/resolver/nodetype resolver-null/java/org/mulgara/resolver/nullres resolver-prefix/java/org/mulgara/resolver/prefix resolver-spi/java/org/mulgara/resolver/spi resolver-store/java/org/mulgara/resolver/store resolver-view/java/org/mulgara/resolver/view resolver-xsd/java/org/mulgara/resolver/xsd server/java/org/mulgara/server server-http/java/org/mulgara/server/http server-local/java/org/mulgara/server/local server-rmi/java/org/mulgara/server/rmi tuples/java/org/mulgara/store/tuples util/java/org/mulgara/util
pag at mulgara.org
pag at mulgara.org
Wed Sep 28 19:12:01 UTC 2011
Author: pag
Date: 2011-09-28 19:12:01 +0000 (Wed, 28 Sep 2011)
New Revision: 2056
Modified:
trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3ContentHandler.java
trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/RDFXMLContentHandler.java
trunk/src/jar/query/java/org/mulgara/jena/TransactionMulgara.java
trunk/src/jar/query/java/org/mulgara/query/Query.java
trunk/src/jar/query/java/org/mulgara/query/filter/value/Var.java
trunk/src/jar/query/java/org/mulgara/server/JenaFactory.java
trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java
trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java
trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolver.java
trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolverFactory.java
trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolution.java
trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolver.java
trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolverFactory.java
trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolver.java
trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolverFactory.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/EmptyResolution.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/LocalizedTuples.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/PersistTuplesWrapperStatements.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/StatementsWrapperResolution.java
trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/StatementsWrapperTuples.java
trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolver.java
trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolverFactory.java
trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinition.java
trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinitionIntersection.java
trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinitionUnion.java
trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolution.java
trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolver.java
trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverUnitTest.java
trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java
trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraintDescriptor.java
trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolution.java
trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolver.java
trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolverFactory.java
trunk/src/jar/resolver/java/org/mulgara/resolver/DirectTransitiveFunction.java
trunk/src/jar/resolver/java/org/mulgara/resolver/JenaFactoryImpl.java
trunk/src/jar/resolver/java/org/mulgara/resolver/MockResolver.java
trunk/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java
trunk/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactory.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswer.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/XAResourceWrapperRemoteXAResource.java
trunk/src/jar/server/java/org/mulgara/server/HttpServices.java
trunk/src/jar/server/java/org/mulgara/server/MulgaraUserConfig.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/Assignment.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/Difference.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/JoinTuples.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftFiltered.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/LetTuples.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/LiteralTuples.java
trunk/src/jar/tuples/java/org/mulgara/store/tuples/SimpleTuplesFormat.java
trunk/src/jar/util/java/org/mulgara/util/Bootstrap.java
trunk/src/jar/util/java/org/mulgara/util/ExplicitIntFile.java
trunk/src/jar/util/java/org/mulgara/util/FileUtil.java
trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java
trunk/src/jar/util/java/org/mulgara/util/QueryParams.java
trunk/src/jar/util/java/org/mulgara/util/ResultSetRow.java
Log:
Added final to all loggers, plus some other cleanups. Added generics to a couple of classes, and converted JenaFactory to return a string on dumpAnonNodes instead of printing to stdout
Modified: trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3ContentHandler.java
===================================================================
--- trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3ContentHandler.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/content-n3/java/org/mulgara/content/n3/N3ContentHandler.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -63,7 +63,7 @@
*/
public class N3ContentHandler implements ContentHandler {
/** Logger. */
- private static Logger logger = Logger.getLogger(N3ContentHandler.class);
+ private static final Logger logger = Logger.getLogger(N3ContentHandler.class);
private static final Collection<MimeType> mimeTypes =
Collections.unmodifiableList(Arrays.asList(MimeTypes.APPLICATION_N3, MimeTypes.TEXT_RDF_N3, MimeTypes.TEXT_TURTLE));
Modified: trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/RDFXMLContentHandler.java
===================================================================
--- trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/RDFXMLContentHandler.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/RDFXMLContentHandler.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -63,12 +63,9 @@
*/
public class RDFXMLContentHandler implements ContentHandler
{
- /**
- * Logger.
- */
+ /** Logger. */
@SuppressWarnings("unused")
- private static Logger logger =
- Logger.getLogger(RDFXMLContentHandler.class.getName());
+ private static final Logger logger = Logger.getLogger(RDFXMLContentHandler.class.getName());
/** Supported content types */
private static final Collection<MimeType> mimeTypes =
Modified: trunk/src/jar/query/java/org/mulgara/jena/TransactionMulgara.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/jena/TransactionMulgara.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/query/java/org/mulgara/jena/TransactionMulgara.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -22,7 +22,7 @@
class TransactionMulgara extends TransactionHandlerBase {
@SuppressWarnings("unused")
- private static Logger log = Logger.getLogger(TransactionMulgara.class.getName()) ;
+ private static final Logger log = Logger.getLogger(TransactionMulgara.class.getName()) ;
GraphMulgara mGraph ;
Session session ;
Modified: trunk/src/jar/query/java/org/mulgara/query/Query.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/Query.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/query/java/org/mulgara/query/Query.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -72,7 +72,7 @@
private static final long serialVersionUID = 5165341858790210479L;
/** Logger. */
- private static Logger logger = Logger.getLogger(Query.class.getName());
+ private static final Logger logger = Logger.getLogger(Query.class.getName());
/**
* The variable list. This may only contain {@link Variable}s. It corresponds
Modified: trunk/src/jar/query/java/org/mulgara/query/filter/value/Var.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/filter/value/Var.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/query/java/org/mulgara/query/filter/value/Var.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -43,10 +43,10 @@
private static final long serialVersionUID = 7024038517344320135L;
/** Logger */
- private static Logger logger = Logger.getLogger(Var.class.getName());
+ private static final Logger logger = Logger.getLogger(Var.class.getName());
/** The name of this variable */
- private String name;
+ private final String name;
/** An invalid index to indicate that a variable is not initialized */
private static final int NOT_INITIALIZED = -2;
Modified: trunk/src/jar/query/java/org/mulgara/server/JenaFactory.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/server/JenaFactory.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/query/java/org/mulgara/server/JenaFactory.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -124,7 +124,7 @@
/**
* Debug method to see the contents of the internal anonymous node mapping.
*/
- public void dumpAnonNodes();
+ public String dumpAnonNodes();
/**
* Returns the JRDF factory.
Modified: trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/TqlSession.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -532,8 +532,8 @@
retValue.add(a.getObject(0).toString());
}
}
- } catch(Throwable t) {
- t.printStackTrace();
+ } catch (Throwable t) {
+ log.error("Unable to retrieve graphs", t);
}
return retValue;
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DirectTransitiveFunction.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DirectTransitiveFunction.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DirectTransitiveFunction.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -78,11 +78,8 @@
*/
public abstract class DirectTransitiveFunction extends TransitiveFunction {
- /**
- * Logger.
- */
- private static Logger logger = Logger.getLogger(
- DirectTransitiveFunction.class.getName());
+ /** Logger. */
+ private static final Logger logger = Logger.getLogger(DirectTransitiveFunction.class.getName());
/**
* Resolves an unanchored transitive constraint. This means finding all statements matching
@@ -197,7 +194,7 @@
LiteralTuples given = new LiteralTuples(new Variable[] {tmpVariable});
// remember that the current value has been visited
- Set visited = new HashSet();
+ Set<Long> visited = new HashSet<Long>();
visited.add(value);
long[] tupleRow = new long[1];
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/JenaFactoryImpl.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/JenaFactoryImpl.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/JenaFactoryImpl.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -27,6 +27,9 @@
package org.mulgara.resolver;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.*;
// Third party packages
@@ -74,7 +77,7 @@
private final static Logger logger =
Logger.getLogger(JenaFactoryImpl.class.getName());
- private Hashtable anonMap = new Hashtable();
+ private Hashtable<BlankNode,com.hp.hpl.jena.graph.Node> anonMap = new Hashtable<BlankNode,com.hp.hpl.jena.graph.Node>();
/**
* A link to the JRDFFactory peer.
@@ -274,7 +277,7 @@
*/
private com.hp.hpl.jena.graph.Node getAnon(BlankNode value) {
- com.hp.hpl.jena.graph.Node n = (com.hp.hpl.jena.graph.Node)anonMap.get(value);
+ com.hp.hpl.jena.graph.Node n = anonMap.get(value);
if (n == null) {
String nodeId = ((BlankNode)value).toString();
@@ -301,11 +304,21 @@
/**
* Debug method to see the contents of the internal anonymous node mapping.
*/
- public void dumpAnonNodes() {
- Iterator it = anonMap.entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry e = (Map.Entry)it.next();
- System.out.println(e.getKey().toString() + " -> " + e.getValue().toString());
+ public String dumpAnonNodes() {
+ StringWriter s = new StringWriter();
+ PrintWriter out = new PrintWriter(s);
+ try {
+ for (Map.Entry<BlankNode,com.hp.hpl.jena.graph.Node> e: anonMap.entrySet()) {
+ out.println(e.getKey().toString() + " -> " + e.getValue().toString());
+ }
+ return s.toString();
+ } finally {
+ out.close();
+ try {
+ s.close();
+ } catch (IOException e) {
+ logger.error("Error dumping anonymous nodes", e);
+ }
}
}
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/MockResolver.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/MockResolver.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/MockResolver.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -70,7 +70,7 @@
*/
public class MockResolver implements Resolver {
/** Logger */
- private static Logger logger = Logger.getLogger(MockResolver.class);
+ private static final Logger logger = Logger.getLogger(MockResolver.class);
/** the next XAResource to return */
private static XAResource nextXARes = null;
Modified: trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java
===================================================================
--- trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -66,11 +66,8 @@
*/
public class MemoryResolver implements SystemResolver {
- /**
- * Logger.
- */
- private static Logger logger =
- Logger.getLogger(MemoryResolver.class.getName());
+ /** Logger. */
+ private static final Logger logger = Logger.getLogger(MemoryResolver.class.getName());
/**
* The preallocated local node representing models stored on the Java heap.
Modified: trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolver.java
===================================================================
--- trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolver.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolver.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -60,7 +60,7 @@
public class NodeTypeResolver implements Resolver
{
/** Logger. */
- private static Logger logger = Logger.getLogger(NodeTypeResolver.class.getName());
+ private static final Logger logger = Logger.getLogger(NodeTypeResolver.class.getName());
/** The session that this resolver is associated with. */
private final ResolverSession resolverSession;
Modified: trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolverFactory.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolverFactory.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -53,7 +53,7 @@
*/
public class NodeTypeResolverFactory implements ResolverFactory {
/** Logger. */
- private static Logger logger = Logger.getLogger(NodeTypeResolverFactory.class.getName());
+ private static final Logger logger = Logger.getLogger(NodeTypeResolverFactory.class.getName());
/** The preallocated local node representing the <code>rdf:type</code> property. */
private long rdfType;
Modified: trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolution.java
===================================================================
--- trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolution.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolution.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -39,7 +39,7 @@
public class NullResolution implements Resolution {
/** Logger. */
- private static Logger logger = Logger.getLogger(NullResolver.class.getName());
+ private static final Logger logger = Logger.getLogger(NullResolver.class.getName());
/** The constraint. */
private final Constraint constraint;
Modified: trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolver.java
===================================================================
--- trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolver.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolver.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -39,7 +39,7 @@
*/
public class NullResolver implements Resolver {
/** Logger. */
- private static Logger logger = Logger.getLogger(NullResolver.class.getName());
+ private static final Logger logger = Logger.getLogger(NullResolver.class.getName());
/** The URI of the type describing null type graphs. */
private URI graphTypeUri;
Modified: trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolverFactory.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-null/java/org/mulgara/resolver/nullres/NullResolverFactory.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -35,7 +35,7 @@
public class NullResolverFactory implements ResolverFactory {
/** Logger. */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(NullResolverFactory.class.getName());
+ private static final Logger logger = Logger.getLogger(NullResolverFactory.class.getName());
/** The URI to be used for a null graph */
public final static URI DEFAULT_GRAPH = URI.create(Mulgara.NULL_GRAPH);
Modified: trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolver.java
===================================================================
--- trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolver.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolver.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -47,7 +47,7 @@
public class PrefixResolver implements Resolver
{
/** Logger. */
- private static Logger logger = Logger.getLogger(PrefixResolver.class.getName());
+ private static final Logger logger = Logger.getLogger(PrefixResolver.class.getName());
/** The session that this resolver is associated with. */
private final ResolverSession resolverSession;
Modified: trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolverFactory.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolverFactory.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -36,7 +36,7 @@
*/
public class PrefixResolverFactory implements ResolverFactory {
/** Logger. */
- private static Logger logger = Logger.getLogger(PrefixResolverFactory.class.getName());
+ private static final Logger logger = Logger.getLogger(PrefixResolverFactory.class.getName());
/** The URI for the default graph. */
private static final URI DEFAULT_GRAPH = URI.create(Mulgara.PREFIX_GRAPH);
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/EmptyResolution.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/EmptyResolution.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/EmptyResolution.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -52,8 +52,7 @@
public class EmptyResolution extends EmptyTuples implements Resolution {
/** Logger. */
@SuppressWarnings("unused")
- private static Logger logger =
- Logger.getLogger(EmptyResolution.class.getName());
+ private static final Logger logger = Logger.getLogger(EmptyResolution.class.getName());
/** The constraint this instance resolves. */
private final Constraint constraint;
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/LocalizedTuples.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/LocalizedTuples.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/LocalizedTuples.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -69,11 +69,9 @@
*/
public class LocalizedTuples extends AbstractTuples {
- /**
- * Logger.
- */
+ /** Logger. */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(LocalizedTuples.class.getName());
+ private static final Logger logger = Logger.getLogger(LocalizedTuples.class.getName());
/** The session to localize into. */
protected final ResolverSession session;
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/PersistTuplesWrapperStatements.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/PersistTuplesWrapperStatements.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/PersistTuplesWrapperStatements.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -36,7 +36,6 @@
import org.mulgara.query.TuplesException;
import org.mulgara.query.Variable;
import org.mulgara.store.tuples.Tuples;
-import org.mulgara.store.tuples.WrappedTuples;
/**
* A wrapper around {@link Tuples} to turn them into {@link Statements}.
@@ -55,8 +54,8 @@
public class PersistTuplesWrapperStatements extends TuplesWrapperStatements
{
/** Logger. */
- private final Logger logger =
- Logger.getLogger(PersistTuplesWrapperStatements.class.getName());
+ @SuppressWarnings("unused")
+ private final Logger logger = Logger.getLogger(PersistTuplesWrapperStatements.class.getName());
ResolverSession resolverSession;
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/StatementsWrapperResolution.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/StatementsWrapperResolution.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/StatementsWrapperResolution.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -54,8 +54,7 @@
public class StatementsWrapperResolution extends AbstractTuples implements
Resolution {
/** Logger. */
- private static Logger logger =
- Logger.getLogger(StatementsWrapperResolution.class.getName());
+ private static final Logger logger = Logger.getLogger(StatementsWrapperResolution.class.getName());
/** The constraint this instance resolves. */
private final Constraint constraint;
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/StatementsWrapperTuples.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/StatementsWrapperTuples.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/resolver/spi/StatementsWrapperTuples.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -70,8 +70,7 @@
implements Statements {
/** Logger. */
- private static Logger logger =
- Logger.getLogger(StatementsWrapperTuples.class.getName());
+ private static final Logger logger = Logger.getLogger(StatementsWrapperTuples.class.getName());
/** The statements to wrap. */
private Statements statements;
Modified: trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolver.java
===================================================================
--- trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolver.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolver.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -72,7 +72,7 @@
public class StatementStoreResolver implements SystemResolver {
/** Logger. */
- private static Logger logger = Logger.getLogger(StatementStoreResolver.class.getName());
+ private static final Logger logger = Logger.getLogger(StatementStoreResolver.class.getName());
/**
* A (non) constraint that selects every statement from every model.
Modified: trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolverFactory.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolverFactory.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -60,8 +60,7 @@
public class StatementStoreResolverFactory implements SystemResolverFactory {
/** Logger. */
- private static Logger logger =
- Logger.getLogger(StatementStoreResolverFactory.class.getName());
+ private static final Logger logger = Logger.getLogger(StatementStoreResolverFactory.class.getName());
// Generate the XA store model type URI
private static final URI modelTypeURI = URI.create(Mulgara.NAMESPACE + "Model");
Modified: trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinition.java
===================================================================
--- trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinition.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinition.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -57,15 +57,15 @@
public abstract class ViewDefinition
{
TLongArrayList models;
- List exprs;
+ List<ViewDefinition> exprs;
- public ViewDefinition(TLongArrayList models, List exprs) {
+ public ViewDefinition(TLongArrayList models, List<ViewDefinition> exprs) {
this.models = models;
this.exprs = exprs;
}
- public abstract Tuples consolidate(List args) throws TuplesException;
+ public abstract Tuples consolidate(List<Tuples> args) throws TuplesException;
public Resolution resolve(Constraint constraint, final SessionView session) throws QueryException {
@@ -73,7 +73,7 @@
final ConstraintElement predicate = constraint.getElement(1);
final ConstraintElement object = constraint.getElement(2);
- final List args = new ArrayList();
+ final List<Tuples> args = new ArrayList<Tuples>();
try {
models.forEach(new TLongProcedure() {
@@ -91,18 +91,15 @@
throw new QueryException("Failed to resolve view constraint", er.getCause());
}
- Iterator i = exprs.iterator();
+ Iterator<ViewDefinition> i = exprs.iterator();
while (i.hasNext()) {
- args.add(((ViewDefinition)i.next()).resolve(constraint, session));
+ args.add(i.next().resolve(constraint, session));
}
try {
Tuples result = consolidate(args);
- i = args.iterator();
- while (i.hasNext()) {
- ((Tuples)i.next()).close();
- }
+ for (Tuples t: args) t.close();
return new ViewResolution(constraint, result);
} catch (TuplesException et) {
Modified: trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinitionIntersection.java
===================================================================
--- trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinitionIntersection.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinitionIntersection.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -28,14 +28,12 @@
package org.mulgara.resolver.view;
// Standard Java packages
-import java.util.ArrayList;
import java.util.List;
// Third party packages;
import gnu.trove.TLongArrayList;
// Locally written packages
-import org.mulgara.query.Constraint;
import org.mulgara.query.TuplesException;
import org.mulgara.store.tuples.Tuples;
import org.mulgara.store.tuples.TuplesOperations;
@@ -54,11 +52,11 @@
*/
public class ViewDefinitionIntersection extends ViewDefinition
{
- public ViewDefinitionIntersection(TLongArrayList models, List exprs) {
+ public ViewDefinitionIntersection(TLongArrayList models, List<ViewDefinition> exprs) {
super(models, exprs);
}
- public Tuples consolidate(List args) throws TuplesException {
+ public Tuples consolidate(List<Tuples> args) throws TuplesException {
return TuplesOperations.join(args);
}
}
Modified: trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinitionUnion.java
===================================================================
--- trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinitionUnion.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewDefinitionUnion.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -28,14 +28,12 @@
package org.mulgara.resolver.view;
// Standard Java packages
-import java.util.ArrayList;
import java.util.List;
// Third party packages;
import gnu.trove.TLongArrayList;
// Locally written packages
-import org.mulgara.query.Constraint;
import org.mulgara.query.TuplesException;
import org.mulgara.store.tuples.Tuples;
import org.mulgara.store.tuples.TuplesOperations;
@@ -54,11 +52,11 @@
*/
public class ViewDefinitionUnion extends ViewDefinition
{
- public ViewDefinitionUnion(TLongArrayList models, List exprs) {
+ public ViewDefinitionUnion(TLongArrayList models, List<ViewDefinition> exprs) {
super(models, exprs);
}
- public Tuples consolidate(List args) throws TuplesException {
+ public Tuples consolidate(List<Tuples> args) throws TuplesException {
return TuplesOperations.append(args);
}
}
Modified: trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolution.java
===================================================================
--- trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolution.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolution.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -27,16 +27,12 @@
package org.mulgara.resolver.view;
-// Java 2 standard packages
-import java.util.*;
-
// Third party packages
import org.apache.log4j.Logger; // Apache Log4J
// Locally written packages
import org.mulgara.query.*;
import org.mulgara.resolver.spi.Resolution;
-import org.mulgara.resolver.spi.Resolver;
import org.mulgara.store.tuples.Tuples;
import org.mulgara.store.tuples.WrappedTuples;
@@ -54,11 +50,9 @@
*/
public class ViewResolution extends WrappedTuples implements Resolution
{
- /**
- * Logger.
- */
- private static Logger logger =
- Logger.getLogger(ViewResolution.class.getName());
+ /** Logger. */
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(ViewResolution.class.getName());
/**
* The constraint this instance resolves.
Modified: trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolver.java
===================================================================
--- trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolver.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolver.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -68,7 +68,7 @@
/**
* Logger.
*/
- private static Logger logger =
+ private static final Logger logger =
Logger.getLogger(ViewResolver.class.getName());
private URI systemModelTypeURI;
@@ -86,7 +86,7 @@
private Resolver systemResolver;
private SessionView session;
- private TLongObjectHashMap viewCache;
+ private TLongObjectHashMap<ViewDefinition> viewCache;
//
// Constructors
@@ -122,7 +122,7 @@
this.modelNode = modelNode;
this.unionNode = unionNode;
this.intersectNode = intersectNode;
- this.viewCache = new TLongObjectHashMap();
+ this.viewCache = new TLongObjectHashMap<ViewDefinition>();
try {
Node systemModelTypeURIRef = resolverSession.globalize(systemModelType);
if (systemModelTypeURIRef instanceof URIReference) {
@@ -253,7 +253,7 @@
if (!viewCache.containsKey(defModel)) {
viewCache.put(defModel, fetchView(defModel));
}
- ViewDefinition definition = (ViewDefinition)viewCache.get(defModel);
+ ViewDefinition definition = viewCache.get(defModel);
return definition.resolve(constraint, session);
} catch (LocalizeException el) {
@@ -299,14 +299,14 @@
private ViewDefinition fetchViewUnion(long defModel, long modelExpr) throws QueryException {
TLongArrayList models = fetchViewModels(defModel, modelExpr);
- List exprs = fetchViewExprs(defModel, modelExpr);
+ List<ViewDefinition> exprs = fetchViewExprs(defModel, modelExpr);
return new ViewDefinitionUnion(models, exprs);
}
private ViewDefinition fetchViewIntersection(long defModel, long modelExpr) throws QueryException {
TLongArrayList models = fetchViewModels(defModel, modelExpr);
- List exprs = fetchViewExprs(defModel, modelExpr);
+ List<ViewDefinition> exprs = fetchViewExprs(defModel, modelExpr);
return new ViewDefinitionIntersection(models, exprs);
}
@@ -333,9 +333,9 @@
}
}
- private List fetchViewExprs(long defModel, long modelExpr) throws QueryException {
+ private List<ViewDefinition> fetchViewExprs(long defModel, long modelExpr) throws QueryException {
try {
- List exprs = new ArrayList();
+ List<ViewDefinition> exprs = new ArrayList<ViewDefinition>();
Tuples exprTuples = systemResolver.resolve(new ConstraintImpl(new LocalNode(modelExpr),
new LocalNode(exprNode),
new Variable("exprNode"),
Modified: trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverUnitTest.java
===================================================================
--- trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverUnitTest.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverUnitTest.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -511,6 +511,7 @@
/**
* Create test objects.
*/
+ @SuppressWarnings("deprecation")
public void setUp() throws Exception {
// Create the persistence directory
File persistenceDirectory =
Modified: trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java
===================================================================
--- trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraint.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -43,7 +43,7 @@
import java.util.Set;
// Third party packages
-// import org.apache.log4j.Logger; // Apache Log4J
+import org.apache.log4j.Logger; // Apache Log4J
// Local classes
import org.mulgara.query.Constraint;
@@ -73,8 +73,9 @@
*/
public class IntervalConstraint implements Constraint {
- // /** Logger */
- // private static Logger logger = Logger.getLogger(IntervalConstraint.class.getName());
+ /** Logger */
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(IntervalConstraint.class.getName());
/**
* Allow newer compiled version of the stub to operate when changes
Modified: trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraintDescriptor.java
===================================================================
--- trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraintDescriptor.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/IntervalConstraintDescriptor.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -60,7 +60,7 @@
public class IntervalConstraintDescriptor implements ConstraintDescriptor {
/** Logger */
- private static Logger logger = Logger.getLogger(IntervalConstraintDescriptor.class.getName());
+ private static final Logger logger = Logger.getLogger(IntervalConstraintDescriptor.class.getName());
/**
* Sole constructor.
Modified: trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolution.java
===================================================================
--- trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolution.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolution.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -27,9 +27,6 @@
package org.mulgara.resolver.xsd;
-// Java 2 standard packages
-import java.util.*;
-
// Third party packages
import org.apache.log4j.Logger; // Apache Log4J
@@ -60,7 +57,8 @@
public class XSDResolution extends WrappedTuples implements Resolution {
/** Logger */
- private static Logger logger = Logger.getLogger(XSDResolution.class.getName());
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(XSDResolution.class.getName());
/** The constraint this instance resolves */
private final Constraint constraint;
Modified: trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolver.java
===================================================================
--- trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolver.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolver.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -72,7 +72,7 @@
public class XSDResolver implements Resolver {
/** Logger */
- private static Logger logger = Logger.getLogger(XSDResolver.class);
+ private static final Logger logger = Logger.getLogger(XSDResolver.class);
/**
* This flag indicates that we should reinterpret literals that appear as
Modified: trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolverFactory.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/resolver-xsd/java/org/mulgara/resolver/xsd/XSDResolverFactory.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -66,7 +66,7 @@
public class XSDResolverFactory implements ResolverFactory {
/** Logger. */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(XSDResolverFactory.class.getName());
+ private static final Logger logger = Logger.getLogger(XSDResolverFactory.class.getName());
/** The URI for the default graph. */
private static final URI DEFAULT_GRAPH = URI.create(Mulgara.XSD_GRAPH);
Modified: trunk/src/jar/server/java/org/mulgara/server/HttpServices.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/HttpServices.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/server/java/org/mulgara/server/HttpServices.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -70,7 +70,7 @@
private class Service extends Pair<String,String> { Service(String f, String s) { super(f,s); } }
/** The logging category to log to. */
- protected static Logger logger = Logger.getLogger(HttpServices.class.getName());
+ protected static final Logger logger = Logger.getLogger(HttpServices.class.getName());
/** The web application file path. */
private final static String WEBAPP_PATH = "webapps";
Modified: trunk/src/jar/server/java/org/mulgara/server/MulgaraUserConfig.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/MulgaraUserConfig.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/server/java/org/mulgara/server/MulgaraUserConfig.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -57,7 +57,7 @@
/** Generated serialization ID */
private static final long serialVersionUID = -4722202287520168362L;
- protected static Logger log = Logger.getLogger(MulgaraUserConfig.class.getName());
+ protected static final Logger log = Logger.getLogger(MulgaraUserConfig.class.getName());
/** The embedded configuration file path */
protected static final String CONFIG_PATH = "conf/mulgara-x-config.xml";
Modified: trunk/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java
===================================================================
--- trunk/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/server-http/java/org/mulgara/server/http/HttpSessionFactory.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -64,10 +64,9 @@
*/
public class HttpSessionFactory implements SessionFactory {
- /**
- * Logger.
- */
- Logger logger = Logger.getLogger(HttpSessionFactory.class.getName());
+ /** Logger. */
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(HttpSessionFactory.class.getName());
/**
* Description of the Field
Modified: trunk/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactory.java
===================================================================
--- trunk/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactory.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/server-local/java/org/mulgara/server/local/LocalSessionFactory.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -29,19 +29,12 @@
// Java 2 standard packages
import java.io.File;
-import java.io.IOException;
import java.net.*;
-// Third party packages
-import javax.xml.transform.*;
-import javax.xml.transform.stream.StreamSource;
-
// Log4J
import org.apache.log4j.*;
// Locally written packages
-import java.lang.reflect.*;
-import org.mulgara.query.GraphLiteral;
import org.mulgara.query.QueryException;
import org.mulgara.server.Session;
import org.mulgara.server.SessionFactory;
@@ -72,10 +65,9 @@
public class LocalSessionFactory
implements SessionFactory {
- /**
- * Logger.
- */
- Logger logger = Logger.getLogger(LocalSessionFactory.class.getName());
+ /** Logger. */
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(LocalSessionFactory.class.getName());
/**
* The local database.
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswer.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswer.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswer.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -62,7 +62,7 @@
public class AnswerWrapperRemoteAnswer extends Rmi implements RemoteAnswer, Cloneable {
/** logger */
- private static Logger logger = Logger.getLogger(AnswerWrapperRemoteAnswer.class.getName());
+ private static final Logger logger = Logger.getLogger(AnswerWrapperRemoteAnswer.class.getName());
/**
* Allow newer compiled version of the stub to operate when changes
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -66,9 +66,7 @@
*/
public class RmiSessionFactory implements SessionFactory {
- /**
- * Logger.
- */
+ /** Logger. */
private static final Logger logger = Logger.getLogger(RmiSessionFactory.class.getName());
/**
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/XAResourceWrapperRemoteXAResource.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/XAResourceWrapperRemoteXAResource.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/XAResourceWrapperRemoteXAResource.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -45,7 +45,7 @@
/** logger */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(XAResourceWrapperRemoteXAResource.class.getName());
+ private static final Logger logger = Logger.getLogger(XAResourceWrapperRemoteXAResource.class.getName());
protected final XAResource resource;
protected final ResourceManagerInstanceAdaptor adaptor;
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -63,7 +63,7 @@
public abstract class AbstractTuples implements Tuples {
/** Logger. */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(AbstractTuples.class.getName());
+ private static final Logger logger = Logger.getLogger(AbstractTuples.class.getName());
/** Empty variable array. */
private final static Variable[] emptyVariables = new Variable[] {};
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/Assignment.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/Assignment.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/Assignment.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -63,7 +63,7 @@
/** Logger. */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(Assignment.class.getName());
+ private static final Logger logger = Logger.getLogger(Assignment.class.getName());
/**
* The value the variable is assigned.
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/Difference.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/Difference.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/Difference.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -47,7 +47,7 @@
public class Difference extends AbstractTuples {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(Difference.class.getName());
+ private static final Logger logger = Logger.getLogger(Difference.class.getName());
/** The set of tuples to subtract from. */
protected Tuples minuend;
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -43,7 +43,7 @@
public class FilteredTuples extends AbstractTuples implements ContextOwner {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(FilteredTuples.class.getName());
+ private static final Logger logger = Logger.getLogger(FilteredTuples.class.getName());
/** The inner tuples to filter. */
protected Tuples unfiltered;
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/JoinTuples.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/JoinTuples.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/JoinTuples.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -54,10 +54,8 @@
*/
public abstract class JoinTuples extends AbstractTuples {
- /**
- * Logger.
- */
- protected static Logger logger;
+ /** Logger. */
+ protected static final Logger logger = Logger.getLogger(JoinTuples.class.getName());
/**
* Version of {@link #operandBinding}} including only columns to the left of
@@ -180,11 +178,11 @@
// Calculate the variables present and their mappings from operand
// columns to result columns
- List variableList = new ArrayList();
- List mapOperandList = new ArrayList();
- List mapColumnList = new ArrayList();
- List fooOperandList = new ArrayList();
- List fooColumnList = new ArrayList();
+ List<Variable> variableList = new ArrayList<Variable>();
+ List<Integer> mapOperandList = new ArrayList<Integer>();
+ List<Integer> mapColumnList = new ArrayList<Integer>();
+ List<Integer> fooOperandList = new ArrayList<Integer>();
+ List<Integer> fooColumnList = new ArrayList<Integer>();
for (int i = 0; i < operands.length; i++) {
fooOperandList.clear();
@@ -217,8 +215,8 @@
fooColumn[i] = new int[fooColumnList.size()];
for (int j = 0; j < fooOperand[i].length; j++) {
- fooOperand[i][j] = ((Integer) fooOperandList.get(j)).intValue();
- fooColumn[i][j] = ((Integer) fooColumnList.get(j)).intValue();
+ fooOperand[i][j] = fooOperandList.get(j).intValue();
+ fooColumn[i][j] = fooColumnList.get(j).intValue();
}
}
@@ -266,7 +264,7 @@
return true;
}
- public List getOperands() {
+ public List<Tuples> getOperands() {
return Arrays.asList(operands);
}
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftFiltered.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftFiltered.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftFiltered.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -58,7 +58,7 @@
*/
public class LeftFiltered extends AbstractTuples implements ContextOwner {
- private static Logger logger = Logger.getLogger(LeftFiltered.class.getName());
+ private static final Logger logger = Logger.getLogger(LeftFiltered.class.getName());
/** The set of tuples to return all row from. */
protected Tuples lhs;
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -53,7 +53,7 @@
*/
public class LeftJoin extends AbstractTuples implements ContextOwner {
- private static Logger logger = Logger.getLogger(LeftJoin.class.getName());
+ private static final Logger logger = Logger.getLogger(LeftJoin.class.getName());
/** The set of tuples to return all row from. */
protected Tuples lhs;
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/LetTuples.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/LetTuples.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/LetTuples.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -47,7 +47,7 @@
public class LetTuples extends AbstractTuples implements ContextOwner {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(LetTuples.class.getName());
+ private static final Logger logger = Logger.getLogger(LetTuples.class.getName());
/** The inner tuples to filter. */
protected Tuples innerTuples;
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/LiteralTuples.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/LiteralTuples.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/LiteralTuples.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -58,11 +58,9 @@
*/
public class LiteralTuples extends AbstractTuples {
- /**
- * Logger.
- */
+ /** Logger. */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(LiteralTuples.class.getName());
+ private static final Logger logger = Logger.getLogger(LiteralTuples.class.getName());
private List<long[]> tuples;
Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/SimpleTuplesFormat.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/SimpleTuplesFormat.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/SimpleTuplesFormat.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -59,11 +59,8 @@
*/
public abstract class SimpleTuplesFormat {
- /**
- * Logger.
- */
- private static Logger logger =
- Logger.getLogger(SimpleTuplesFormat.class.getName());
+ /** Logger. */
+ private static final Logger logger = Logger.getLogger(SimpleTuplesFormat.class.getName());
/**
* Line separator.
Modified: trunk/src/jar/util/java/org/mulgara/util/Bootstrap.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/Bootstrap.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/util/java/org/mulgara/util/Bootstrap.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -366,31 +366,39 @@
try {
// get the embedded jar as a stream
- InputStream jarIn =ClassLoader.getSystemResourceAsStream(embeddedJARFilename);
+ InputStream jarIn = ClassLoader.getSystemResourceAsStream(embeddedJARFilename);
// check that the embedded filename is valid
if (jarIn == null) {
throw new IOException("Embedded JAR: " + embeddedJARFilename + " does not exist in enclosing JAR.");
}
- // create a temporary file to write the jar to (we may need to keep the
- // class on disk for windows weenies...)
- File tmpJarFile = File.createTempFile("mulgara", ".jar");
- tmpJarFile.deleteOnExit();
+ try {
- // get a stream so we can write to it
- FileOutputStream out = new FileOutputStream(tmpJarFile);
+ // create a temporary file to write the jar to (we may need to keep the
+ // class on disk for windows weenies...)
+ File tmpJarFile = File.createTempFile("mulgara", ".jar");
+ tmpJarFile.deleteOnExit();
+
+ // set the embedded JAR's URL
+ embeddedJarURL = tmpJarFile.toURI().toURL();
- // write the embedded jar to disk
- int n;
+ // get a stream so we can write to it
+ FileOutputStream out = new FileOutputStream(tmpJarFile);
+
+ try {
+ // write the embedded jar to disk
+ int n;
+ while ((n = jarIn.read(buf)) != -1) out.write(buf, 0, n);
- while ((n = jarIn.read(buf)) != -1) {
- out.write(buf, 0, n);
+ } finally {
+ out.close();
+ }
+
+ } finally {
+ jarIn.close();
}
- // set the embedded JAR's URL
- embeddedJarURL = tmpJarFile.toURI().toURL();
-
} catch (IOException ioe) {
System.err.println(ioe);
}
Modified: trunk/src/jar/util/java/org/mulgara/util/ExplicitIntFile.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/ExplicitIntFile.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/util/java/org/mulgara/util/ExplicitIntFile.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -57,8 +57,7 @@
public final class ExplicitIntFile extends IntFile {
@SuppressWarnings("unused")
- private static Logger logger =
- Logger.getLogger(ExplicitIntFile.class.getName());
+ private static final Logger logger = Logger.getLogger(ExplicitIntFile.class.getName());
private ByteBuffer byteBuffer;
private IntBuffer intBuffer;
Modified: trunk/src/jar/util/java/org/mulgara/util/FileUtil.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/FileUtil.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/util/java/org/mulgara/util/FileUtil.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -50,7 +50,7 @@
public abstract class FileUtil {
/** Logger. */
- private static Logger logger = Logger.getLogger(FileUtil.class.getName());
+ private static final Logger logger = Logger.getLogger(FileUtil.class.getName());
/** The size of the buffer used to read and write to files. 0.25MB. */
private static final int BUFFER_SIZE = 1024 * 256;
Modified: trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -31,7 +31,7 @@
public class JettyLogger implements Logger {
/** The Log4J logger this class can proxy for. */
- protected static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(JettyLogger.class.getName());
+ protected static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(JettyLogger.class.getName());
/**
* The property that has to be set to this class in order for this class to be loaded
@@ -202,7 +202,7 @@
try {
return String.format(arg0.replace("%20", "%%20"), arg1);
} catch (Exception e) {
- return "Unformatted log: " + arg0 + " : " + Arrays.asList(arg1);
+ return "Unformatted log: " + arg0 + " : " + (arg1 != null ? Arrays.asList(arg1) : "(null)");
}
}
Modified: trunk/src/jar/util/java/org/mulgara/util/QueryParams.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/QueryParams.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/util/java/org/mulgara/util/QueryParams.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -39,7 +39,7 @@
public class QueryParams {
/** Logger. */
- private static Logger logger = Logger.getLogger(QueryParams.class.getName());
+ private static final Logger logger = Logger.getLogger(QueryParams.class.getName());
/** The encoding to use for a URL */
static final String ENCODING = "UTF-8";
Modified: trunk/src/jar/util/java/org/mulgara/util/ResultSetRow.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/ResultSetRow.java 2011-09-28 17:44:44 UTC (rev 2055)
+++ trunk/src/jar/util/java/org/mulgara/util/ResultSetRow.java 2011-09-28 19:12:01 UTC (rev 2056)
@@ -65,11 +65,8 @@
*/
static final long serialVersionUID = 6269054577611383745L;
- /**
- * Logger.
- */
- private static Logger logger =
- Logger.getLogger(ResultSetRow.class.getName());
+ /** Logger. */
+ private static final Logger logger = Logger.getLogger(ResultSetRow.class.getName());
/**
* The column entries for this row.
More information about the Mulgara-svn
mailing list