[Mulgara-svn] r1739 - trunk/src/jar/server-rmi/java/org/mulgara/server/rmi
pag at mulgara.org
pag at mulgara.org
Fri Jun 26 20:16:27 UTC 2009
Author: pag
Date: 2009-06-26 13:16:26 -0700 (Fri, 26 Jun 2009)
New Revision: 1739
Modified:
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/JRDFSessionWrapperRemoteJRDFSession.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/JenaSessionWrapperRemoteJenaSession.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJRDFSessionImpl.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSessionImpl.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionImpl.java
Log:
Cleaned up some formatting, and removed warnings through added generics, annotating unused loggers, and removing unused imports
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/JRDFSessionWrapperRemoteJRDFSession.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/JRDFSessionWrapperRemoteJRDFSession.java 2009-06-26 18:49:07 UTC (rev 1738)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/JRDFSessionWrapperRemoteJRDFSession.java 2009-06-26 20:16:26 UTC (rev 1739)
@@ -34,13 +34,10 @@
// JRDF
import org.jrdf.graph.*;
-import org.jrdf.graph.mem.*;
// Locally written packages
import org.mulgara.jrdf.*;
import org.mulgara.query.*;
-import org.mulgara.query.rdf.*;
-import org.mulgara.resolver.spi.LocalizeException;
import org.mulgara.server.JRDFSession;
/**
@@ -74,7 +71,7 @@
* Contains a reference of in memory blank nodes to internal node ids. Reset
* every transaction.
*/
- private HashMap bNodeMap = new HashMap();
+ private HashMap<org.jrdf.graph.mem.BlankNodeImpl,BlankNode> bNodeMap = new HashMap<org.jrdf.graph.mem.BlankNodeImpl,BlankNode>();
//
// Constructor
@@ -225,16 +222,16 @@
}
- public void insert(URI modelURI, Set statements)
+ public void insert(URI modelURI, Set<? extends Triple> statements)
throws QueryException, RemoteException {
try {
JRDFGraph graph = new JRDFGraph((JRDFSession) jrdfSession, modelURI);
- HashSet newStatements = new HashSet();
+ HashSet<Triple> newStatements = new HashSet<Triple>();
// Iterator through the statements replacing JRDF memory blank nodes with
// server specific blank nodes from the map.
- Iterator iter = statements.iterator();
+ Iterator<? extends Triple> iter = statements.iterator();
while (iter.hasNext()) {
Triple tmpTriple = (Triple) iter.next();
SubjectNode subjectNode = tmpTriple.getSubject();
@@ -267,16 +264,16 @@
}
}
- public void delete(URI modelURI, Set statements) throws QueryException,
+ public void delete(URI modelURI, Set<? extends Triple> statements) throws QueryException,
RemoteException {
try {
JRDFGraph graph = new JRDFGraph((JRDFSession) jrdfSession, modelURI);
- HashSet newStatements = new HashSet();
+ HashSet<Triple> newStatements = new HashSet<Triple>();
// Iterator through the statements replacing JRDF memory blank nodes with
// server specific blank nodes from the map.
- Iterator iter = statements.iterator();
+ Iterator<? extends Triple> iter = statements.iterator();
while (iter.hasNext()) {
Triple tmpTriple = (Triple) iter.next();
SubjectNode subjectNode = tmpTriple.getSubject();
@@ -323,8 +320,7 @@
GraphElementFactory factory) throws GraphElementFactoryException {
if (bNodeMap.containsKey(existingNode)) {
return (BlankNode) bNodeMap.get(existingNode);
- }
- else {
+ } else {
BlankNode bNode = factory.createResource();
bNodeMap.put(existingNode, bNode);
return bNode;
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/JenaSessionWrapperRemoteJenaSession.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/JenaSessionWrapperRemoteJenaSession.java 2009-06-26 18:49:07 UTC (rev 1738)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/JenaSessionWrapperRemoteJenaSession.java 2009-06-26 20:16:26 UTC (rev 1739)
@@ -34,7 +34,6 @@
import org.apache.log4j.Logger;
// Jena packages
-import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.Node_Variable;
// Locally written packages
@@ -65,11 +64,9 @@
class JenaSessionWrapperRemoteJenaSession extends SessionWrapperRemoteSession
implements RemoteJenaSession {
- /**
- * Logger. This is named after the classname.
- */
- private final static Logger logger =
- Logger.getLogger(JenaSessionWrapperRemoteJenaSession.class.getName());
+ /** Logger. */
+ @SuppressWarnings("unused")
+ private final static Logger logger = Logger.getLogger(JenaSessionWrapperRemoteJenaSession.class.getName());
/**
* The wrapped {@link JenaSession}
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJRDFSessionImpl.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJRDFSessionImpl.java 2009-06-26 18:49:07 UTC (rev 1738)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJRDFSessionImpl.java 2009-06-26 20:16:26 UTC (rev 1739)
@@ -36,7 +36,6 @@
// Locally written packages
import org.mulgara.jrdf.*;
import org.mulgara.query.QueryException;
-import org.mulgara.server.*;
/**
* {@link RemoteJRDFSession} which generates unpaged answers.
@@ -61,14 +60,11 @@
* @see <a href="http://developer.java.sun.com/developer/JDCTechTips/2001/tt0327.html#jndi"/>
* <cite>JNDI lookup in distributed systems</cite> </a>
*/
-class RemoteJRDFSessionImpl extends JRDFSessionWrapperRemoteJRDFSession
- implements RemoteJRDFSession {
+class RemoteJRDFSessionImpl extends JRDFSessionWrapperRemoteJRDFSession implements RemoteJRDFSession {
- /**
- * Logger. This is named after the classname.
- */
- private final static Logger logger =
- Logger.getLogger(RemoteJRDFSessionImpl.class.getName());
+ /** Logger. */
+ @SuppressWarnings("unused")
+ private final static Logger logger = Logger.getLogger(RemoteJRDFSessionImpl.class.getName());
/**
* Reference to the RemoteSessionFactory
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSessionImpl.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSessionImpl.java 2009-06-26 18:49:07 UTC (rev 1738)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteJenaSessionImpl.java 2009-06-26 20:16:26 UTC (rev 1739)
@@ -27,22 +27,13 @@
package org.mulgara.server.rmi;
// Java 2 standard packages
-import java.net.URI;
import java.rmi.RemoteException;
// Log4j
import org.apache.log4j.Logger;
-// Jena
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node_Variable;
-
// Locally written packages
-import org.mulgara.query.Answer;
-import org.mulgara.query.ArrayAnswer;
-import org.mulgara.query.Query;
import org.mulgara.query.QueryException;
-import org.mulgara.query.TuplesException;
import org.mulgara.server.*;
/**
@@ -68,11 +59,9 @@
class RemoteJenaSessionImpl extends JenaSessionWrapperRemoteJenaSession
implements RemoteJenaSession {
- /**
- * Logger. This is named after the classname.
- */
- private final static Logger logger =
- Logger.getLogger(RemoteJenaSessionImpl.class.getName());
+ /** Logger. */
+ @SuppressWarnings("unused")
+ private final static Logger logger = Logger.getLogger(RemoteJenaSessionImpl.class.getName());
/**
* Reference to the RemoteSessionFactory
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionImpl.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionImpl.java 2009-06-26 18:49:07 UTC (rev 1738)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionImpl.java 2009-06-26 20:16:26 UTC (rev 1739)
@@ -66,8 +66,8 @@
/**
* Logger. This is named after the classname.
*/
- private final static Logger logger =
- Logger.getLogger(RemoteSessionImpl.class.getName());
+ @SuppressWarnings("unused")
+ private final static Logger logger = Logger.getLogger(RemoteSessionImpl.class.getName());
/**
* Reference to the RemoteSessionFactory
More information about the Mulgara-svn
mailing list