[Mulgara-svn] r2032 - in trunk/src/jar: content-mbox/java/org/mulgara/content/mbox/parser/model content-mbox/java/org/mulgara/content/mbox/parser/model/impl content-mp3/java/org/mulgara/content/mp3 content-mp3/java/org/mulgara/content/mp3/parser content-mp3/java/org/mulgara/content/mp3/parser/api content-rdfa/java/org/mulgara/content/rdfa content-rlog/java/org/mulgara/content/rlog content-rlog/java/org/mulgara/krule/rlog/parser descriptor/src/java/org/mulgara/descriptor dtd/java/org/mulgara/xml resolver-distributed/java/org/mulgara/resolver/distributed resolver-distributed/java/org/mulgara/resolver/distributed/remote resolver-file/java/org/mulgara/resolver/file resolver-filesystem/java/org/mulgara/resolver/filesystem resolver-filesystem/java/org/mulgara/resolver/filesystem/exception resolver-filesystem/java/org/mulgara/resolver/filesystem/util resolver-gis/java/org/mulgara/resolver/gis resolver-http/java/org/mulgara/resolver/http resolver-jar/java/org/mulgara/resolver/jar
alexhall at mulgara.org
alexhall at mulgara.org
Fri Sep 16 13:52:57 UTC 2011
Author: alexhall
Date: 2011-09-16 13:52:57 +0000 (Fri, 16 Sep 2011)
New Revision: 2032
Modified:
trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/ModelFactory.java
trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/impl/MBoxImpl.java
trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/impl/MBoxManagerImpl.java
trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/MP3ContentHandler.java
trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/MP3Statements.java
trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3ParserImpl.java
trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3v1ParserImpl.java
trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3v2ParserImpl.java
trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/IdentifierProcessor.java
trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ParserFactory.java
trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/api/MP3Conversion.java
trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/BasedResolver.java
trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaContentHandler.java
trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogContentHandler.java
trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/parser/NSUtils.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/Descriptor.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorContext.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorElement.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorFactory.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtil.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtility.java
trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java
trunk/src/jar/dtd/java/org/mulgara/xml/DocumentBuilderFactoryWrapper.java
trunk/src/jar/dtd/java/org/mulgara/xml/ResourceDocumentBuilderFactory.java
trunk/src/jar/dtd/java/org/mulgara/xml/ResourceEntityResolver.java
trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/DistributedResolver.java
trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/DistributedResolverFactory.java
trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/ForeignBlankNode.java
trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/MultiXAResource.java
trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/NetworkDelegator.java
trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/SessionCache.java
trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/remote/RemotePagerImpl.java
trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/remote/SetProxy.java
trunk/src/jar/resolver-file/java/org/mulgara/resolver/file/FileResolver.java
trunk/src/jar/resolver-file/java/org/mulgara/resolver/file/FileResolverFactory.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileManagerUnitTest.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolver.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemStatements.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemStatementsUnitTest.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemVocab.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/MetaFile.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/MetaFileManager.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/FileManagerException.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/MetaDataException.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/MetaIOException.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/VocabularyException.java
trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/util/GraphUtil.java
trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/GISResolverFactory.java
trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContent.java
trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContentUnitTest.java
trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpResolver.java
trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpResolverFactory.java
trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarContentUnitTest.java
trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarResolver.java
trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarResolverFactory.java
Log:
More fixes for Fortify compliance and cleaning up Java warnings
Modified: trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/ModelFactory.java
===================================================================
--- trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/ModelFactory.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/ModelFactory.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -60,7 +60,7 @@
public class ModelFactory {
/** The logger */
- private static Logger log = Logger.getLogger(ModelFactory.class);
+ private static final Logger log = Logger.getLogger(ModelFactory.class);
/** The singleton instance of this class */
private static ModelFactory instance = null;
Modified: trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/impl/MBoxImpl.java
===================================================================
--- trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/impl/MBoxImpl.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/impl/MBoxImpl.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -74,7 +74,7 @@
public class MBoxImpl implements MBox {
/** Logger */
- private static Logger log = Logger.getLogger(MBoxImpl.class);
+ private static final Logger log = Logger.getLogger(MBoxImpl.class);
/** The graph we will be using to store triples retrieved from messages */
private Graph graph;
@@ -121,7 +121,7 @@
InputStream contentStream = mBoxContent.newInputStream();
// Mark the beginning for resetting
- contentStream.mark(contentStream.available());
+ if (contentStream != null) contentStream.mark(contentStream.available());
return contentStream;
}
@@ -275,7 +275,15 @@
}
// Validate the file
- validate(contentStream);
+ try {
+ validate(contentStream);
+ } finally {
+ try {
+ if (contentStream != null) contentStream.close();
+ } catch (IOException e) {
+ log.warn("Ignoring exception closing MBox input stream", e);
+ }
+ }
try {
Modified: trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/impl/MBoxManagerImpl.java
===================================================================
--- trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/impl/MBoxManagerImpl.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mbox/java/org/mulgara/content/mbox/parser/model/impl/MBoxManagerImpl.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -55,7 +55,7 @@
public class MBoxManagerImpl implements MBoxManager {
/** Logger */
- private static Logger logger = Logger.getLogger(MBoxManagerImpl.class);
+ private static final Logger logger = Logger.getLogger(MBoxManagerImpl.class);
/** The current mbox we are dealing with */
private MBox currentMBox;
Modified: trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/MP3ContentHandler.java
===================================================================
--- trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/MP3ContentHandler.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/MP3ContentHandler.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -69,7 +69,7 @@
/** Logger. */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(MP3ContentHandler.class.getName());
+ private static final Logger logger = Logger.getLogger(MP3ContentHandler.class.getName());
/** Supported content types */
private static final Collection<MimeType> mimeTypes =
Modified: trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/MP3Statements.java
===================================================================
--- trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/MP3Statements.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/MP3Statements.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -80,7 +80,7 @@
public class MP3Statements extends AbstractTuples implements Statements {
/** Logger. */
- private static Logger logger =
+ private static final Logger logger =
Logger.getLogger(MP3Statements.class.getName());
/** Column index for subjects */
Modified: trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3ParserImpl.java
===================================================================
--- trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3ParserImpl.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3ParserImpl.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -67,7 +67,7 @@
public final class ID3ParserImpl implements ID3Parser {
/** The category to log to. */
- private static Logger log = Logger.getLogger(ID3ParserImpl.class);
+ private static final Logger log = Logger.getLogger(ID3ParserImpl.class);
/**
* Constructor.
Modified: trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3v1ParserImpl.java
===================================================================
--- trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3v1ParserImpl.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3v1ParserImpl.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -63,7 +63,7 @@
public final class ID3v1ParserImpl implements ID3v1Parser {
/** The category to log to. */
- private static Logger log = Logger.getLogger(ID3v1ParserImpl.class);
+ private static final Logger log = Logger.getLogger(ID3v1ParserImpl.class);
/**
* Constructor.
Modified: trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3v2ParserImpl.java
===================================================================
--- trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3v2ParserImpl.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ID3v2ParserImpl.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -64,7 +64,7 @@
public final class ID3v2ParserImpl implements ID3v2Parser {
/** The category to log to. */
- private static Logger log = Logger.getLogger(ID3v2ParserImpl.class);
+ private static final Logger log = Logger.getLogger(ID3v2ParserImpl.class);
/**
* Constructor.
Modified: trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/IdentifierProcessor.java
===================================================================
--- trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/IdentifierProcessor.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/IdentifierProcessor.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -68,7 +68,7 @@
/** The category to log to. */
@SuppressWarnings("unused")
- private static Logger log = Logger.getLogger(IdentifierProcessor.class);
+ private static final Logger log = Logger.getLogger(IdentifierProcessor.class);
/** The identifiers we expect to come across in ID3 tags */
public static final String AENC = AENCID3V2Frame.class.toString();
Modified: trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ParserFactory.java
===================================================================
--- trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ParserFactory.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/ParserFactory.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -62,7 +62,7 @@
public class ParserFactory {
/** The logger */
- private static Logger log = Logger.getLogger(ParserFactory.class);
+ private static final Logger log = Logger.getLogger(ParserFactory.class);
/** The singleton instance of this class */
private static ParserFactory instance = null;
Modified: trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/api/MP3Conversion.java
===================================================================
--- trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/api/MP3Conversion.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-mp3/java/org/mulgara/content/mp3/parser/api/MP3Conversion.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -70,7 +70,7 @@
/** The category to log to. */
@SuppressWarnings("unused")
- private static Logger log = Logger.getLogger(MP3Conversion.class);
+ private static final Logger log = Logger.getLogger(MP3Conversion.class);
/** The RDF conversion path */
private String rdfConversionPath;
Modified: trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/BasedResolver.java
===================================================================
--- trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/BasedResolver.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/BasedResolver.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -87,10 +87,8 @@
public String resolve(String baseStr, String rel) {
IRI bIri = base;
// test if a different base string to the one we expect is being used
- if (baseStr != null) {
- if (this.baseStr != baseStr && !baseStr.equals(this.baseStr)) {
- bIri = iriFactory.construct(baseStr);
- }
+ if (baseStr != null && !baseStr.equals(this.baseStr)) {
+ bIri = iriFactory.construct(baseStr);
}
IRI resolved = bIri.resolve(rel);
return resolved.toString();
Modified: trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaContentHandler.java
===================================================================
--- trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaContentHandler.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-rdfa/java/org/mulgara/content/rdfa/RdfaContentHandler.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -44,7 +44,7 @@
public class RdfaContentHandler implements ContentHandler {
/** Logger. */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(RdfaContentHandler.class);
+ private static final Logger logger = Logger.getLogger(RdfaContentHandler.class);
/** The filename extension for XHTML documents */
static final String XHTML_EXT = ".xhtml";
Modified: trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogContentHandler.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogContentHandler.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-rlog/java/org/mulgara/content/rlog/RlogContentHandler.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -47,7 +47,7 @@
*/
public class RlogContentHandler implements ContentHandler {
/** Logger. */
- private static Logger logger = Logger.getLogger(RlogContentHandler.class);
+ private static final Logger logger = Logger.getLogger(RlogContentHandler.class);
/** Supported content types */
private static final Collection<MimeType> mimeTypes =
Modified: trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/parser/NSUtils.java
===================================================================
--- trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/parser/NSUtils.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/content-rlog/java/org/mulgara/krule/rlog/parser/NSUtils.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -36,9 +36,9 @@
public class NSUtils {
/** The default domain to use when no other is set. */
- public static String defaultDomain = RDF.KRULE_NS;
+ private static String defaultDomain = RDF.KRULE_NS;
- public static String defaultPrefix = RDF.KRULE_PREFIX;
+ private static String defaultPrefix = RDF.KRULE_PREFIX;
/** A mapping of prefixes to namespaces. */
private static Map<String,String> registeredDomains = new HashMap<String,String>();
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/Descriptor.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/Descriptor.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/Descriptor.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -135,7 +135,7 @@
/**
* Description of the Field
*/
- private static Logger log = Logger.getLogger(Descriptor.class);
+ private static final Logger log = Logger.getLogger(Descriptor.class);
/**
* Description of the Field
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorContext.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorContext.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorContext.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -57,7 +57,7 @@
/**
* log4j
*/
- private static Logger log = Logger.getLogger(DescriptorContext.class);
+ private static final Logger log = Logger.getLogger(DescriptorContext.class);
/**
* Description of the Field
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorElement.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorElement.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorElement.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -86,7 +86,7 @@
/**
* log4j
*/
- private static Logger log = Logger.getLogger(DescriptorElement.class);
+ private static final Logger log = Logger.getLogger(DescriptorElement.class);
/**
* used in Vector.toArray(p)
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorFactory.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorFactory.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorFactory.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -59,7 +59,7 @@
/**
* Description of the Field
*/
- private static Logger log = Logger.getLogger(DescriptorFactory.class);
+ private static final Logger log = Logger.getLogger(DescriptorFactory.class);
/**
* Description of the Field
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtil.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtil.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtil.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -268,7 +268,7 @@
// return the descriptor
factory.releaseDescriptor(des);
} catch (DescriptorException de) {
- de.printStackTrace();
+ log.warn("Error invoking descriptor", de);
throw new Exception("Descriptor Problem: " + de.getCause(), de);
}
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtility.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtility.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/DescriptorUtility.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -278,7 +278,7 @@
// return the descriptor
factory.releaseDescriptor(des);
} catch (DescriptorException de) {
- de.printStackTrace();
+ log.warn("Error invoking descriptor.", de);
throw new Exception("Descriptor Problem: " + de.getCause(), de);
}
Modified: trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java
===================================================================
--- trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/descriptor/src/java/org/mulgara/descriptor/PIErrorHandler.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -369,7 +369,7 @@
if (null != locator) {
String id =
- (locator.getPublicId() != locator.getPublicId())
+ (locator.getPublicId() != null)
? locator.getPublicId()
: ( (null != locator.getSystemId()) ? locator.getSystemId()
: "SystemId Unknown");
Modified: trunk/src/jar/dtd/java/org/mulgara/xml/DocumentBuilderFactoryWrapper.java
===================================================================
--- trunk/src/jar/dtd/java/org/mulgara/xml/DocumentBuilderFactoryWrapper.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/dtd/java/org/mulgara/xml/DocumentBuilderFactoryWrapper.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -170,7 +170,7 @@
* Uses reflection to allow it to compile with JDK1.4.
*/
public boolean getFeature(String name) throws ParserConfigurationException {
- Class c = wrapped.getClass();
+ Class<?> c = wrapped.getClass();
try {
java.lang.reflect.Method getFeature = c.getMethod("getFeature", new Class[] { String.class });
return ((Boolean)getFeature.invoke(wrapped, new Object[] { name })).booleanValue();
@@ -188,7 +188,7 @@
* Uses reflection to allow it to compile with JDK1.4.
*/
public void setFeature(String name, boolean value) throws ParserConfigurationException {
- Class c = wrapped.getClass();
+ Class<?> c = wrapped.getClass();
try {
java.lang.reflect.Method setFeature = c.getMethod("setFeature", new Class[] { String.class, Boolean.TYPE });
setFeature.invoke(wrapped, new Object[] { name, new Boolean(value) });
Modified: trunk/src/jar/dtd/java/org/mulgara/xml/ResourceDocumentBuilderFactory.java
===================================================================
--- trunk/src/jar/dtd/java/org/mulgara/xml/ResourceDocumentBuilderFactory.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/dtd/java/org/mulgara/xml/ResourceDocumentBuilderFactory.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -29,14 +29,10 @@
// Java 2 standard packages
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
/**
* A {@link DocumentBuilderFactory} that sets the entity resolver of all the
* {@link DocumentBuilder}s it creates to use the {@link
Modified: trunk/src/jar/dtd/java/org/mulgara/xml/ResourceEntityResolver.java
===================================================================
--- trunk/src/jar/dtd/java/org/mulgara/xml/ResourceEntityResolver.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/dtd/java/org/mulgara/xml/ResourceEntityResolver.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -29,9 +29,14 @@
// Java 2 standard packages
import java.io.IOException;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
-import org.xml.sax.*;
+import org.apache.log4j.Logger;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
* An {@link EntityResolver} that knows about the public identifiers of the
@@ -77,6 +82,8 @@
*/
public class ResourceEntityResolver implements EntityResolver {
+ private static final Logger logger = Logger.getLogger(ResourceEntityResolver.class);
+
/**
* Cached entities. The map is keyed on the public ID {@link String} and
* contains the paths to the corresponding resources within the classpath,
@@ -183,7 +190,7 @@
if (s != null) {
- System.err.print("Resolving " + entityName + " from classpath...");
+ logger.info("Resolving " + entityName + " from classpath...");
source = new InputSource(getClass().getResourceAsStream(s));
source.setPublicId(publicId);
source.setSystemId(systemId);
@@ -191,14 +198,14 @@
else {
// Fallback to either the system, or the chained resolver.
- System.err.println("Resolving " + entityName + " from system...");
+ logger.info("Resolving " + entityName + " from system...");
source =
(entityResolver == null) ? null
: entityResolver.resolveEntity(publicId,
systemId);
}
- System.err.println( (source == null) ? "failed." : "resolved.");
+ logger.info( (source == null) ? "failed." : "resolved.");
return source;
}
Modified: trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/DistributedResolver.java
===================================================================
--- trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/DistributedResolver.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/DistributedResolver.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -46,7 +46,7 @@
*/
public class DistributedResolver implements Resolver, TransactionCoordinator {
/** Logger. */
- private static Logger logger = Logger.getLogger(DistributedResolver.class);
+ private static final Logger logger = Logger.getLogger(DistributedResolver.class);
/** The delegator that resolves the constraint on another server. */
private final Delegator delegator;
Modified: trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/DistributedResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/DistributedResolverFactory.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/DistributedResolverFactory.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -44,7 +44,7 @@
*/
public class DistributedResolverFactory implements ResolverFactory {
/** Logger. */
- private static Logger logger = Logger.getLogger(DistributedResolverFactory.class);
+ private static final Logger logger = Logger.getLogger(DistributedResolverFactory.class);
/** Protocols which are handled by the served resolver. */
private static final Set<String> protocols = new HashSet<String>(Arrays.asList("rmi"));
Modified: trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/ForeignBlankNode.java
===================================================================
--- trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/ForeignBlankNode.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/ForeignBlankNode.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -76,4 +76,14 @@
return super.equals(obj);
}
+ /**
+ * Compute a hash code based on the server URI and nodeId. Need to override the default hash code
+ * because that's based on the hash code of the server URI string, and equality is determined
+ * based on URI.equals which does case normalization.
+ * @return the hash code.
+ */
+ public int hashCode() {
+ return 41 * serverUri.hashCode() + (int)(nodeId ^ (nodeId >>> 32));
+ }
+
}
Modified: trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/MultiXAResource.java
===================================================================
--- trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/MultiXAResource.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/MultiXAResource.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -64,7 +64,6 @@
* @copyright ©2008 <a href="http://www.topazproject.org/">Topaz Project</a>
* @licence Apache License v2.0
*/
- at SuppressWarnings("unused")
public class MultiXAResource
extends AbstractXAResource<RMInfo<MultiXAResource.MultiTxInfo>,MultiXAResource.MultiTxInfo> {
Modified: trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/NetworkDelegator.java
===================================================================
--- trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/NetworkDelegator.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/NetworkDelegator.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -61,7 +61,7 @@
public class NetworkDelegator implements Delegator {
/** Logger. */
- private static Logger logger = Logger.getLogger(NetworkDelegator.class.getName());
+ private static final Logger logger = Logger.getLogger(NetworkDelegator.class.getName());
/** The session to delegate resolutions through. */
private final ResolverSession session;
Modified: trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/SessionCache.java
===================================================================
--- trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/SessionCache.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/SessionCache.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -46,7 +46,7 @@
* @licence Apache License v2.0
*/
public class SessionCache {
- private static Logger logger = Logger.getLogger(SessionCache.class);
+ private static final Logger logger = Logger.getLogger(SessionCache.class);
private final Map<URI,SessionFactory> factoryCache = new HashMap<URI,SessionFactory>();
private final ConcurrentMap<URI,List<Session>> sessionCache = new ConcurrentHashMap<URI,List<Session>>();
Modified: trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/remote/RemotePagerImpl.java
===================================================================
--- trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/remote/RemotePagerImpl.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/remote/RemotePagerImpl.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -16,12 +16,13 @@
package org.mulgara.resolver.distributed.remote;
-import java.util.*;
-import java.rmi.*;
+import java.io.Serializable;
import java.lang.reflect.Array;
-import java.io.Serializable;
-import java.util.logging.*;
+import java.rmi.RemoteException;
+import java.util.Collection;
+import java.util.Iterator;
+import org.apache.log4j.Logger;
import org.mulgara.util.Rmi;
/**
@@ -104,7 +105,7 @@
* @return The current page.
*/
private E[] fillPage() {
- logger.finest("Filling page");
+ logger.trace("Filling page");
for (int i = 0; i < pageSize; i++) {
if (!iter.hasNext()) return truncatePage(i);
currentPage[i] = iter.next();
@@ -121,7 +122,7 @@
@SuppressWarnings("unchecked")
private E[] truncatePage(int offset) {
if (offset == 0) return null;
- logger.finest("Building array of type: " + type +", with length: " + offset);
+ logger.trace("Building array of type: " + type +", with length: " + offset);
E[] result = (E[])Array.newInstance(type, offset);
System.arraycopy(currentPage, 0, result, 0, offset);
return result;
Modified: trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/remote/SetProxy.java
===================================================================
--- trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/remote/SetProxy.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/remote/SetProxy.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -16,11 +16,16 @@
package org.mulgara.resolver.distributed.remote;
-import java.util.*;
-import java.util.logging.*;
+import java.io.Serializable;
import java.rmi.RemoteException;
-import java.io.Serializable;
+import java.util.AbstractSet;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Queue;
+import org.apache.log4j.Logger;
+
/**
* Represents an iterable object on a remote system as a local Set.
* Created at the server side, and sent across the network.
@@ -32,7 +37,7 @@
private static final long serialVersionUID = -8343698708605937025L;
/** Logger. */
- protected static final Logger logger = Logger.getLogger(RemotePagerImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(RemotePagerImpl.class.getName());
/** Stores the currently running iterator. */
private static Object currentIterator = null;
@@ -222,6 +227,7 @@
* Checks if the thread is active. Main thread.
* @return <code>false</code> if the thread is still running, <code>true</code> when complete.
*/
+ @SuppressWarnings("unused")
public boolean isComplete() {
if (lastException != null) throw lastException;
return complete;
@@ -258,7 +264,7 @@
}
}
} catch (RemoteException re) {
- logger.severe("Error retrieving remote data: " + re.getMessage());
+ logger.error("Error retrieving remote data", re);
lastException = new PagerException("Unable to retrieve page", re);
}
complete = true;
Modified: trunk/src/jar/resolver-file/java/org/mulgara/resolver/file/FileResolver.java
===================================================================
--- trunk/src/jar/resolver-file/java/org/mulgara/resolver/file/FileResolver.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-file/java/org/mulgara/resolver/file/FileResolver.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -28,21 +28,20 @@
package org.mulgara.resolver.file;
// Java 2 standard packages
-import java.io.*;
+import java.io.File;
import java.net.URI;
-import java.util.*;
-// Third party packages
import org.apache.log4j.Logger;
import org.jrdf.graph.Node;
import org.jrdf.graph.URIReference;
-
-// Locally written packages
import org.mulgara.content.Content;
import org.mulgara.content.ContentHandler;
import org.mulgara.content.ContentHandlerManager;
import org.mulgara.content.ContentResolver;
-import org.mulgara.resolver.spi.*;
+import org.mulgara.resolver.spi.GlobalizeException;
+import org.mulgara.resolver.spi.Resolver;
+import org.mulgara.resolver.spi.ResolverException;
+import org.mulgara.resolver.spi.ResolverSession;
/**
* Resolves constraints in models defined by static RDF documents.
@@ -61,7 +60,8 @@
/**
* Logger.
*/
- private static Logger logger = Logger.getLogger(FileResolver.class.getName());
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(FileResolver.class.getName());
//
// Constructors
Modified: trunk/src/jar/resolver-file/java/org/mulgara/resolver/file/FileResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-file/java/org/mulgara/resolver/file/FileResolverFactory.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-file/java/org/mulgara/resolver/file/FileResolverFactory.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -51,7 +51,8 @@
/**
* Logger.
*/
- private static Logger logger =
+ @SuppressWarnings("unused")
+ private static final Logger logger =
Logger.getLogger(FileResolverFactory.class.getName());
private final ContentHandlerManager contentHandlers;
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileManagerUnitTest.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileManagerUnitTest.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileManagerUnitTest.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -29,7 +29,6 @@
// Java 2 standard packages
import java.io.File;
-import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
@@ -484,7 +483,7 @@
*
* @return The list of files to exclude
*/
- public ArrayList createExclusionList() {
+ public ArrayList<File> createExclusionList() {
// Create a file which represents the filesystem to exclude
File fileSystem = new File(System.getProperty("java.io.tmpdir") +
@@ -492,7 +491,7 @@
File.separator + "mp3");
// Create a list for the exclusion files
- ArrayList excludeList = new ArrayList();
+ ArrayList<File> excludeList = new ArrayList<File>();
// Add the file to the list
excludeList.add(fileSystem);
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolver.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolver.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolver.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -32,14 +32,12 @@
// Java 2 standard packages
import java.io.*;
import java.net.*;
-import java.util.*;
import javax.transaction.xa.XAResource;
// Third party packages
import org.apache.log4j.Logger;
import org.jrdf.graph.URIReference;
import org.jrdf.graph.Node;
-import gnu.trove.TLongArrayList;
import gnu.trove.TLongObjectHashMap;
// Locally written packages
@@ -72,7 +70,7 @@
public class FileSystemResolver implements Resolver {
/** Logger */
- private static Logger log = Logger.getLogger(FileSystemResolver.class);
+ private static final Logger log = Logger.getLogger(FileSystemResolver.class);
/** System model's type URI */
private URI systemModelTypeURI;
@@ -81,9 +79,11 @@
private URI modelTypeURI;
/** Node id for the file system model */
+ @SuppressWarnings("unused")
private long fileSystemNode;
/** Node ID for the rdf:type node */
+ @SuppressWarnings("unused")
private long rdfType;
/** Node ID for the inclusion predicate */
@@ -96,9 +96,10 @@
private Resolver systemResolver;
/** Cache for the file system */
- private TLongObjectHashMap fileSystemCache;
+ private TLongObjectHashMap<Resolution> fileSystemCache;
/** Node id for the system model */
+ @SuppressWarnings("unused")
private long systemModel;
/** Resolver session for node resolution */
@@ -141,7 +142,7 @@
this.resolverSession = resolverSession;
// Initialise the cache
- this.fileSystemCache = new TLongObjectHashMap();
+ this.fileSystemCache = new TLongObjectHashMap<Resolution>();
// Container for our system model's type node
Node systemModelTypeURIRef = null;
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemStatements.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemStatements.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemStatements.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -72,7 +72,7 @@
public class FileSystemStatements extends AbstractTuples implements Statements {
/** Logger. */
- private static Logger log = Logger.getLogger(FileSystemStatements.class);
+ private static final Logger log = Logger.getLogger(FileSystemStatements.class);
/** Column index for subjects */
public static final int SUBJECT = 0;
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemStatementsUnitTest.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemStatementsUnitTest.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemStatementsUnitTest.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -302,11 +302,11 @@
log.debug("Globalized values of first entry: [" +
resolverSession.globalize(statements.getColumnValue(
- statements.SUBJECT)) + ", " +
+ FileSystemStatements.SUBJECT)) + ", " +
resolverSession.globalize(statements.getColumnValue(
- statements.PREDICATE)) + ", " +
+ FileSystemStatements.PREDICATE)) + ", " +
resolverSession.globalize(statements.getColumnValue(
- statements.OBJECT)) + "]");
+ FileSystemStatements.OBJECT)) + "]");
} catch (TuplesException tuplesException) {
// Ignore the exception as we are debugging
@@ -316,15 +316,9 @@
}
}
- // Containers for our node ids
- long subject = 0;
- long predicate = 0;
- long object = 0;
-
try {
- // Get the subject node id
- subject = statements.getColumnValue(statements.SUBJECT);
+ statements.getColumnValue(FileSystemStatements.SUBJECT);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -339,8 +333,7 @@
try {
- // Get the predicate node id
- predicate = statements.getColumnValue(statements.PREDICATE);
+ statements.getColumnValue(FileSystemStatements.PREDICATE);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -355,8 +348,7 @@
try {
- // Get the object node id
- object = statements.getColumnValue(statements.OBJECT);
+ statements.getColumnValue(FileSystemStatements.OBJECT);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -385,9 +377,7 @@
// Node id containers
long dataDirNode = 0;
- long fileSystemNode = 0;
long includeNode = 0;
- long excludeNode = 0;
long subjectNode = 0;
// Obtain a resolver session
@@ -421,8 +411,7 @@
try {
- // Set the file system type node
- fileSystemNode = resolverSession.localize(new URIReferenceImpl(new URI(
+ resolverSession.localize(new URIReferenceImpl(new URI(
"http://mulgara.org/mulgara/filesystem")));
} catch (LocalizeException localiseException) {
@@ -473,8 +462,7 @@
try {
- // Define the exclusion node
- excludeNode = resolverSession.localize(new URIReferenceImpl(new URI(
+ resolverSession.localize(new URIReferenceImpl(new URI(
"http://mulgara.org/mulgara/filesystem#Exclude")));
} catch (LocalizeException localiseException) {
@@ -607,11 +595,11 @@
log.debug("Globalized values of first entry: [" +
resolverSession.globalize(statements.getColumnValue(
- statements.SUBJECT)) + ", " +
+ FileSystemStatements.SUBJECT)) + ", " +
resolverSession.globalize(statements.getColumnValue(
- statements.PREDICATE)) + ", " +
+ FileSystemStatements.PREDICATE)) + ", " +
resolverSession.globalize(statements.getColumnValue(
- statements.OBJECT)) + "]");
+ FileSystemStatements.OBJECT)) + "]");
} catch (TuplesException tuplesException) {
// Ignore the exception as we are debugging
@@ -629,7 +617,7 @@
try {
// Get the subject node id
- subject = statements.getColumnValue(statements.SUBJECT);
+ subject = statements.getColumnValue(FileSystemStatements.SUBJECT);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -645,7 +633,7 @@
try {
// Get the predicate node id
- predicate = statements.getColumnValue(statements.PREDICATE);
+ predicate = statements.getColumnValue(FileSystemStatements.PREDICATE);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -661,7 +649,7 @@
try {
// Get the object node id
- object = statements.getColumnValue(statements.OBJECT);
+ object = statements.getColumnValue(FileSystemStatements.OBJECT);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -762,9 +750,7 @@
// Node id containers
long dataDirNode = 0;
- long fileSystemNode = 0;
long includeNode = 0;
- long excludeNode = 0;
long subjectNode = 0;
// Obtain a resolver session
@@ -791,8 +777,7 @@
try {
- // Set the file system type node
- fileSystemNode = resolverSession.localize(new URIReferenceImpl(new URI(
+ resolverSession.localize(new URIReferenceImpl(new URI(
"http://mulgara.org/mulgara/filesystem")));
} catch (LocalizeException localiseException) {
@@ -843,8 +828,7 @@
try {
- // Define the exclusion node
- excludeNode = resolverSession.localize(new URIReferenceImpl(new URI(
+ resolverSession.localize(new URIReferenceImpl(new URI(
"http://mulgara.org/mulgara/filesystem#Exclude")));
} catch (LocalizeException localiseException) {
@@ -950,9 +934,7 @@
// Node id containers
long dataDirNode = 0;
- long fileSystemNode = 0;
long includeNode = 0;
- long excludeNode = 0;
long subjectNode = 0;
// Obtain a resolver session
@@ -980,8 +962,7 @@
try {
- // Set the file system type node
- fileSystemNode = resolverSession.localize(new URIReferenceImpl(new URI(
+ resolverSession.localize(new URIReferenceImpl(new URI(
"http://mulgara.org/mulgara/filesystem")));
} catch (LocalizeException localiseException) {
@@ -1032,8 +1013,7 @@
try {
- // Define the exclusion node
- excludeNode = resolverSession.localize(new URIReferenceImpl(new URI(
+ resolverSession.localize(new URIReferenceImpl(new URI(
"http://mulgara.org/mulgara/filesystem#Exclude")));
} catch (LocalizeException localiseException) {
@@ -1166,11 +1146,11 @@
log.debug("Globalized values of first entry: [" +
resolverSession.globalize(statements.getColumnValue(
- statements.SUBJECT)) + ", " +
+ FileSystemStatements.SUBJECT)) + ", " +
resolverSession.globalize(statements.getColumnValue(
- statements.PREDICATE)) + ", " +
+ FileSystemStatements.PREDICATE)) + ", " +
resolverSession.globalize(statements.getColumnValue(
- statements.OBJECT)) + "]");
+ FileSystemStatements.OBJECT)) + "]");
} catch (TuplesException tuplesException) {
// Ignore the exception as we are debugging
@@ -1188,7 +1168,7 @@
try {
// Get the subject node id
- subject = statements.getColumnValue(statements.SUBJECT);
+ subject = statements.getColumnValue(FileSystemStatements.SUBJECT);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -1204,7 +1184,7 @@
try {
// Get the predicate node id
- predicate = statements.getColumnValue(statements.PREDICATE);
+ predicate = statements.getColumnValue(FileSystemStatements.PREDICATE);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -1220,7 +1200,7 @@
try {
// Get the object node id
- object = statements.getColumnValue(statements.OBJECT);
+ object = statements.getColumnValue(FileSystemStatements.OBJECT);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -1320,9 +1300,7 @@
// Node id containers
long dataDirNode = 0;
- long fileSystemNode = 0;
long includeNode = 0;
- long excludeNode = 0;
long subjectNode = 0;
// Obtain a resolver session
@@ -1348,8 +1326,7 @@
try {
- // Set the file system type node
- fileSystemNode = resolverSession.localize(new URIReferenceImpl(new URI(
+ resolverSession.localize(new URIReferenceImpl(new URI(
"http://mulgara.org/mulgara/filesystem")));
} catch (LocalizeException localiseException) {
@@ -1400,8 +1377,7 @@
try {
- // Define the exclusion node
- excludeNode = resolverSession.localize(new URIReferenceImpl(new URI(
+ resolverSession.localize(new URIReferenceImpl(new URI(
"http://mulgara.org/mulgara/filesystem#Exclude")));
} catch (LocalizeException localiseException) {
@@ -1534,11 +1510,11 @@
log.debug("Globalized values of first entry: [" +
resolverSession.globalize(statements.getColumnValue(
- statements.SUBJECT)) + ", " +
+ FileSystemStatements.SUBJECT)) + ", " +
resolverSession.globalize(statements.getColumnValue(
- statements.PREDICATE)) + ", " +
+ FileSystemStatements.PREDICATE)) + ", " +
resolverSession.globalize(statements.getColumnValue(
- statements.OBJECT)) + "]");
+ FileSystemStatements.OBJECT)) + "]");
} catch (TuplesException tuplesException) {
// Ignore the exception as we are debugging
@@ -1556,7 +1532,7 @@
try {
// Get the subject node id
- subject = statements.getColumnValue(statements.SUBJECT);
+ subject = statements.getColumnValue(FileSystemStatements.SUBJECT);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -1572,7 +1548,7 @@
try {
// Get the predicate node id
- predicate = statements.getColumnValue(statements.PREDICATE);
+ predicate = statements.getColumnValue(FileSystemStatements.PREDICATE);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -1588,7 +1564,7 @@
try {
// Get the object node id
- object = statements.getColumnValue(statements.OBJECT);
+ object = statements.getColumnValue(FileSystemStatements.OBJECT);
} catch (TuplesException tuplesException) {
// Log the exception
@@ -1686,7 +1662,6 @@
}
// Node id containers
long dataDirNode = 0;
- long fileSystemNode = 0;
long includeNode = 0;
long excludeNode = 0;
long subjectNode = 0;
@@ -1714,8 +1689,7 @@
try {
- // Set the file system type node
- fileSystemNode = resolverSession.localize(new URIReferenceImpl(new URI(
+ resolverSession.localize(new URIReferenceImpl(new URI(
"http://mulgara.org/mulgara/filesystem")));
} catch (LocalizeException localiseException) {
@@ -2026,7 +2000,6 @@
// Node id containers
long dataDirNode = 0;
long mboxDirNode = 0;
- long fileSystemNode = 0;
long includeNode = 0;
long excludeNode = 0;
long subjectNode = 0;
@@ -2076,8 +2049,7 @@
try {
- // Set the file system type node
- fileSystemNode = resolverSession.localize(new URIReferenceImpl(new URI(
+ resolverSession.localize(new URIReferenceImpl(new URI(
"http://mulgara.org/mulgara/filesystem")));
} catch (LocalizeException localiseException) {
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemVocab.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemVocab.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemVocab.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -74,7 +74,7 @@
public static final String CAN_WRITE = "canWrite";
public static final String CAN_EXECUTE = "canExecute";
- private static HashMap dictionary;
+ private static HashMap<String,URI> dictionary;
/**
* Does a lookup of the key against the hash map to find the required
@@ -95,7 +95,7 @@
}
// Retrieve the predicate by key
- URI predicateURI = (URI) dictionary.get(key);
+ URI predicateURI = dictionary.get(key);
if (predicateURI == null) {
@@ -116,7 +116,7 @@
private static void initialise() throws VocabularyException {
// Initialise the has map
- dictionary = new HashMap();
+ dictionary = new HashMap<String,URI>();
// Create a base URI
String baseURI = "http://mulgara.org/mulgara#";
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/MetaFile.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/MetaFile.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/MetaFile.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -38,8 +38,6 @@
import org.jrdf.graph.mem.*;
import org.jrdf.vocabulary.RDF;
import org.apache.log4j.Logger; // Apache Log4J
-import org.jrdf.util.ClosableIterator; // JRDF
-import org.jrdf.graph.*; // JRDF
import org.mulgara.resolver.filesystem.exception.MetaDataException;
import org.mulgara.resolver.filesystem.exception.MetaIOException;
@@ -67,12 +65,11 @@
*/
public class MetaFile extends File {
+ private static final long serialVersionUID = -6912916007828365901L;
+
/** Logger. */
- private static Logger log = Logger.getLogger(MetaFile.class);
+ private static final Logger log = Logger.getLogger(MetaFile.class);
- /** An interator into triples positioned at the next triple. */
- private ClosableIterator nextTriple;
-
/** A graph containing the metadata for the file data */
private Graph graph;
@@ -161,13 +158,8 @@
File[] children = this.listFiles();
// Sort the array of child files by name
- Arrays.sort(children, new Comparator() {
- public int compare(Object object1, Object object2) {
-
- // Convert the objects to files
- File file1 = (File) object1;
- File file2 = (File) object2;
-
+ Arrays.sort(children, new Comparator<File>() {
+ public int compare(File file1, File file2) {
// Return the natural comparison of the file names
return file1.getName().compareTo(file2.getName());
}
@@ -222,13 +214,8 @@
// filter
// Sort the array of filtered child files by name
- Arrays.sort(children, new Comparator() {
- public int compare(Object object1, Object object2) {
-
- // Convert the objects to files
- File file1 = (File) object1;
- File file2 = (File) object2;
-
+ Arrays.sort(children, new Comparator<File>() {
+ public int compare(File file1, File file2) {
// Return the natural comparison of the file names
return file1.getName().compareTo(file2.getName());
}
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/MetaFileManager.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/MetaFileManager.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/MetaFileManager.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -31,11 +31,7 @@
import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.MalformedURLException;
import java.util.*;
-import java.text.SimpleDateFormat;
-import org.xml.sax.*;
// Third party packages
import org.jrdf.graph.*;
@@ -43,7 +39,6 @@
import org.jrdf.vocabulary.RDF;
import org.apache.log4j.Logger; // Apache Log4J
import org.jrdf.util.ClosableIterator; // JRDF
-import org.jrdf.graph.*; // JRDF
// Locally written packages
import org.mulgara.resolver.filesystem.exception.*;
@@ -71,10 +66,10 @@
public class MetaFileManager {
/** Logger. */
- private static Logger log = Logger.getLogger(MetaFileManager.class);
+ private static final Logger log = Logger.getLogger(MetaFileManager.class);
/** An interator into triples positioned at the next triple. */
- private ClosableIterator nextTriple;
+ private ClosableIterator<Triple> nextTriple;
/** The model which will store the content of the current file metadata */
private Graph currentEntry;
@@ -92,10 +87,10 @@
private int currentFileSystem;
/** The list of excluded filesystems */
- private ArrayList exclusionList;
+ private ArrayList<File> exclusionList;
/** The list of included filesystems */
- private ArrayList inclusionList;
+ private ArrayList<URI> inclusionList;
/**
* Flag to state whether we have completed our run of the inclusion list
@@ -108,19 +103,19 @@
*
* @param exclusions The list of excluded URIs from the included filesystems
*/
- MetaFileManager(ArrayList exclusions) {
+ MetaFileManager(ArrayList<File> exclusions) {
if (exclusions == null) {
// If the exclusions list was null then use an empty list
- exclusions = new ArrayList();
+ exclusions = new ArrayList<File>();
}
// Store the excluded URIs
exclusionList = exclusions;
// Initialise the included file system list
- inclusionList = new ArrayList();
+ inclusionList = new ArrayList<URI>();
}
/**
@@ -202,7 +197,7 @@
try {
// Retrieve the next filesystem URI from the inclusion list
- nextURI = (URI) inclusionList.get(currentFileSystem);
+ nextURI = inclusionList.get(currentFileSystem);
} catch (IndexOutOfBoundsException outOfBoundsException) {
// An invalid index means we have no more entries
@@ -223,7 +218,7 @@
try {
// Retrieve the next filesystem URI from the inclusion list
- nextURI = (URI) inclusionList.get(currentFileSystem);
+ nextURI = inclusionList.get(currentFileSystem);
} catch (IndexOutOfBoundsException outOfBoundsException) {
// An invalid index means we have no more entries
@@ -560,7 +555,7 @@
}
}
- return (Triple) nextTriple.next();
+ return nextTriple.next();
}
return null;
@@ -779,10 +774,10 @@
}
// Convert the array to a list
- List directoryList = Arrays.asList(directories);
+ List<MetaFile> directoryList = Arrays.asList(directories);
// Obtain the ordered and linked parent metafile from the list
- parent = (MetaFile) directoryList.get(directoryList.indexOf(parent));
+ parent = directoryList.get(directoryList.indexOf(parent));
// Set the current directory to be the parent
currentDirectory = parent;
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/FileManagerException.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/FileManagerException.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/FileManagerException.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -27,8 +27,6 @@
package org.mulgara.resolver.filesystem.exception;
-import java.io.*;
-
/**
* Exception thrown when a problem occurs within the file manager.
*
@@ -51,6 +49,8 @@
*/
public class FileManagerException extends Exception {
+ private static final long serialVersionUID = -163043997545136086L;
+
/**
* Constructor.
*
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/MetaDataException.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/MetaDataException.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/MetaDataException.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -27,8 +27,6 @@
package org.mulgara.resolver.filesystem.exception;
-import java.io.*;
-
/**
* Exception thrown when a problem occurs managing the metadata for a file.
*
@@ -51,6 +49,8 @@
*/
public class MetaDataException extends Exception {
+ private static final long serialVersionUID = 1319340409384733821L;
+
/**
* Constructor.
*
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/MetaIOException.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/MetaIOException.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/MetaIOException.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -27,8 +27,6 @@
package org.mulgara.resolver.filesystem.exception;
-import java.io.*;
-
/**
* Exception thrown when a problem occurs managing the IO for a metafile.
*
@@ -51,6 +49,8 @@
*/
public class MetaIOException extends Exception {
+ private static final long serialVersionUID = 1622731209655908133L;
+
/**
* Constructor.
*
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/VocabularyException.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/VocabularyException.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/exception/VocabularyException.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -27,8 +27,6 @@
package org.mulgara.resolver.filesystem.exception;
-import java.io.*;
-
/**
* Exception thrown when a problem occurs within the vocabulary object.
*
@@ -51,6 +49,8 @@
*/
public class VocabularyException extends Exception {
+ private static final long serialVersionUID = 6881974505350546716L;
+
/**
* Constructor.
*
Modified: trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/util/GraphUtil.java
===================================================================
--- trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/util/GraphUtil.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/util/GraphUtil.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -29,14 +29,10 @@
// Java 2 standard packages
import java.net.URI;
-import java.util.*;
-import java.text.SimpleDateFormat;
// Third party packages
import org.jrdf.graph.*;
-import org.jrdf.graph.mem.*;
import org.jrdf.vocabulary.RDF;
-import org.jrdf.graph.*; // JRDF
import org.mulgara.resolver.filesystem.exception.MetaDataException;
Modified: trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/GISResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/GISResolverFactory.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-gis/java/org/mulgara/resolver/gis/GISResolverFactory.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -62,7 +62,8 @@
/**
* Logger.
*/
- private static Logger logger =
+ @SuppressWarnings("unused")
+ private static final Logger logger =
Logger.getLogger(GISResolverFactory.class.getName());
/** Used by resolver instances */
Modified: trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContent.java
===================================================================
--- trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContent.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContent.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -224,10 +224,10 @@
if (logger.isDebugEnabled()) logger.debug("Establishing connection");
HttpMethod method = getConnectionMethod(methodType);
+ assert method != null;
Header header = null;
- if (method != null) {
- /*
+ /*
// Add cache validation headers to the request
if (lastModifiedMap.containsKey(httpUri)) {
String lastModified = (String) lastModifiedMap.get(httpUri);
@@ -240,66 +240,61 @@
assert eTag != null;
method.addRequestHeader("If-None-Match", eTag);
}
- */
-
- // Make the request
- if (logger.isDebugEnabled()) logger.debug("Executing HTTP request");
- connection.open();
- method.execute(state, connection);
- if (logger.isDebugEnabled()) {
- logger.debug("Executed HTTP request, response code " + method.getStatusCode());
- }
+ */
- // Interpret the response header
- if (method.getStatusCode() == HttpStatus.SC_NOT_MODIFIED) {
- // cache has been validated
- throw new NotModifiedException(httpUri);
- } else if (!isValidStatusCode(method.getStatusCode())) {
- throw new UnknownHostException("Unable to obtain connection to "
- + httpUri + ". Returned status code " + method.getStatusCode());
- } else {
- // has a redirection been issued
- int numberOfRedirection = 0;
- while (isRedirected(method.getStatusCode()) && numberOfRedirection <= MAX_NO_REDIRECTS) {
-
- // release the existing connection
- method.releaseConnection();
-
- //attempt to follow the redirects
- numberOfRedirection++;
+ // Make the request
+ if (logger.isDebugEnabled()) logger.debug("Executing HTTP request");
+ connection.open();
+ method.execute(state, connection);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Executed HTTP request, response code " + method.getStatusCode());
+ }
- // obtain the new location
- header = method.getResponseHeader("location");
- if (header != null) {
- try {
- initialiseSettings(new URL(header.getValue()));
- if (logger.isInfoEnabled()) {
- logger.info("Redirecting to " + header.getValue());
- }
+ // Interpret the response header
+ if (method.getStatusCode() == HttpStatus.SC_NOT_MODIFIED) {
+ // cache has been validated
+ throw new NotModifiedException(httpUri);
+ } else if (!isValidStatusCode(method.getStatusCode())) {
+ throw new UnknownHostException("Unable to obtain connection to "
+ + httpUri + ". Returned status code " + method.getStatusCode());
+ } else {
+ // has a redirection been issued
+ int numberOfRedirection = 0;
+ while (isRedirected(method.getStatusCode()) && numberOfRedirection <= MAX_NO_REDIRECTS) {
- // attempt a new connection to this location
- method = getConnectionMethod(methodType);
- connection.open();
- method.execute(state, connection);
- if (!isValidStatusCode(method.getStatusCode())) {
- throw new UnknownHostException(
- "Unable to obtain connection to " + " the redirected site "
- + httpUri + ". Returned status code "
- + method.getStatusCode());
- }
- } catch (URISyntaxException ex) {
- throw new IOException("Unable to follow redirection to "
- + header.getValue() + " Not a valid URI");
+ // release the existing connection
+ method.releaseConnection();
+
+ //attempt to follow the redirects
+ numberOfRedirection++;
+
+ // obtain the new location
+ header = method.getResponseHeader("location");
+ if (header != null) {
+ try {
+ initialiseSettings(new URL(header.getValue()));
+ if (logger.isInfoEnabled()) {
+ logger.info("Redirecting to " + header.getValue());
}
- } else {
- throw new IOException("Unable to obtain redirecting detaild from " + httpUri);
+
+ // attempt a new connection to this location
+ method = getConnectionMethod(methodType);
+ connection.open();
+ method.execute(state, connection);
+ if (!isValidStatusCode(method.getStatusCode())) {
+ throw new UnknownHostException(
+ "Unable to obtain connection to " + " the redirected site "
+ + httpUri + ". Returned status code "
+ + method.getStatusCode());
+ }
+ } catch (URISyntaxException ex) {
+ throw new IOException("Unable to follow redirection to "
+ + header.getValue() + " Not a valid URI");
}
+ } else {
+ throw new IOException("Unable to obtain redirecting detaild from " + httpUri);
}
}
- } else {
- if (logger.isDebugEnabled()) {
- logger.debug("Establish connection returned a null method");
- }
}
// Update metadata about the cached document
Modified: trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContentUnitTest.java
===================================================================
--- trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContentUnitTest.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpContentUnitTest.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -104,7 +104,7 @@
public void testValidContentType() throws Exception {
// obtain a valid content type
- HttpContent content = new HttpContent(new URL("http://www.mulgara.org"));
+ HttpContent content = new HttpContent(new URL("http://google.com/"));
MimeType mimeType = content.getContentType();
assertTrue("Expecting mime type of text/html but found " + mimeType,
mimeType != null && mimeType.getPrimaryType().equals("text")
@@ -155,7 +155,7 @@
public void testValidInputStream() throws Exception {
// obtain a valid content type
- HttpContent content = new HttpContent(new URL("http://mulgara.org/"));
+ HttpContent content = new HttpContent(new URL("http://google.com/"));
InputStream stream = content.newInputStream();
assertTrue("Expecting an input stream ", stream != null);
Modified: trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpResolver.java
===================================================================
--- trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpResolver.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpResolver.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -65,7 +65,7 @@
* Logger.
*/
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(HttpResolver.class.getName());
+ private static final Logger logger = Logger.getLogger(HttpResolver.class.getName());
/**
* Construct a resolver.
Modified: trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpResolverFactory.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-http/java/org/mulgara/resolver/http/HttpResolverFactory.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -57,7 +57,7 @@
* Logger.
*/
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(HttpResolverFactory.class.getName());
+ private static final Logger logger = Logger.getLogger(HttpResolverFactory.class.getName());
private final ContentHandlerManager contentHandlers;
Modified: trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarContentUnitTest.java
===================================================================
--- trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarContentUnitTest.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarContentUnitTest.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -32,7 +32,6 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
-import java.net.URI;
import java.net.URL;
import javax.activation.MimeType;
Modified: trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarResolver.java
===================================================================
--- trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarResolver.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarResolver.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -70,7 +70,8 @@
/**
* Logger.
*/
- private static Logger logger = Logger.getLogger(JarResolver.class.getName());
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(JarResolver.class.getName());
/**
* Construct a resolver.
Modified: trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarResolverFactory.java
===================================================================
--- trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarResolverFactory.java 2011-09-16 13:35:31 UTC (rev 2031)
+++ trunk/src/jar/resolver-jar/java/org/mulgara/resolver/jar/JarResolverFactory.java 2011-09-16 13:52:57 UTC (rev 2032)
@@ -54,7 +54,8 @@
/**
* Logger.
*/
- private static Logger logger =
+ @SuppressWarnings("unused")
+ private static final Logger logger =
Logger.getLogger(JarResolverFactory.class.getName());
More information about the Mulgara-svn
mailing list