[Mulgara-svn] r1923 - in trunk: src/jar/query/java/org/mulgara/connection src/jar/query/java/org/mulgara/query src/jar/query/java/org/mulgara/query/operation tools/src/org/mulgara/tools
alexhall at mulgara.org
alexhall at mulgara.org
Tue Feb 16 17:23:10 UTC 2010
Author: alexhall
Date: 2010-02-16 09:23:09 -0800 (Tue, 16 Feb 2010)
New Revision: 1923
Modified:
trunk/src/jar/query/java/org/mulgara/connection/CommandExecutor.java
trunk/src/jar/query/java/org/mulgara/connection/ConnectionUnitTest.java
trunk/src/jar/query/java/org/mulgara/query/AskQuery.java
trunk/src/jar/query/java/org/mulgara/query/ConstructQuery.java
trunk/src/jar/query/java/org/mulgara/query/Query.java
trunk/src/jar/query/java/org/mulgara/query/operation/ApplyRules.java
trunk/src/jar/query/java/org/mulgara/query/operation/Backup.java
trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java
trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java
trunk/src/jar/query/java/org/mulgara/query/operation/Deletion.java
trunk/src/jar/query/java/org/mulgara/query/operation/DropGraph.java
trunk/src/jar/query/java/org/mulgara/query/operation/Export.java
trunk/src/jar/query/java/org/mulgara/query/operation/Insertion.java
trunk/src/jar/query/java/org/mulgara/query/operation/Load.java
trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java
trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java
trunk/src/jar/query/java/org/mulgara/query/operation/SessionCommand.java
trunk/src/jar/query/java/org/mulgara/query/operation/TransactionCommand.java
trunk/tools/src/org/mulgara/tools/Sparql.java
Log:
Remove @Override annotations auto-inserted by Eclipse that were causing build problems with Java 1.5
Modified: trunk/src/jar/query/java/org/mulgara/connection/CommandExecutor.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/connection/CommandExecutor.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/connection/CommandExecutor.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -116,7 +116,6 @@
/* (non-Javadoc)
* @see org.mulgara.connection.Connection#execute(org.mulgara.connection.Connection.Executable)
*/
- @Override
final public <T,E extends Exception> T execute(SessionOp<T,E> cmd) throws E {
return (this.threadFactory != null) ? executeWithProxy(cmd) : doExecute(cmd);
}
@@ -131,7 +130,6 @@
final Wrapper<Throwable> exception = new Wrapper<Throwable>();
Runnable r = new Runnable() {
- @Override
public void run() {
try {
result.set(doExecute(cmd));
@@ -206,7 +204,6 @@
/* (non-Javadoc)
* @see org.mulgara.connection.Connection#cancel()
*/
- @Override
final public void cancel() {
threadLock.readLock().lock();
try {
Modified: trunk/src/jar/query/java/org/mulgara/connection/ConnectionUnitTest.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/connection/ConnectionUnitTest.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/connection/ConnectionUnitTest.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -33,7 +33,6 @@
public class ConnectionUnitTest extends TestCase {
protected static ThreadFactory threadFactory = new ThreadFactory() {
- @Override
public Thread newThread(Runnable r) {
return new Thread(r);
}
@@ -92,7 +91,6 @@
Connection conn = new DummyConnection(factory);
final int testValue = 123;
int value = conn.execute(new SessionOp<Integer,Exception>() {
- @Override
public Integer fn(Session session) throws Exception {
return testValue;
}
@@ -102,7 +100,6 @@
final String exMsg = "Test Exception Message";
try {
conn.execute(new SessionOp<Object,Exception>() {
- @Override
public Object fn(Session arg) throws Exception {
throw new Exception(exMsg);
}
@@ -119,7 +116,6 @@
try {
conn.execute(new SessionOp<Object,ConnectionTestException>() {
- @Override
public Object fn(Session arg) throws ConnectionTestException {
ConnectionTestException e = new ConnectionTestException("Test Exception Message");
exception.set(e);
@@ -134,7 +130,6 @@
exception.set(null);
try {
conn.execute(new SessionOp<Object,ConnectionTestException>() {
- @Override
public Object fn(Session arg) throws ConnectionTestException {
RuntimeException e = new RuntimeException("Test Exception Message");
exception.set(e);
@@ -149,7 +144,6 @@
exception.set(null);
try {
conn.execute(new SessionOp<Object,ConnectionTestException>() {
- @Override
public Object fn(Session arg) throws ConnectionTestException {
Error e = new Error("Test Exception Message");
exception.set(e);
@@ -171,10 +165,8 @@
final AtomicBoolean t2Error = new AtomicBoolean(false);
Runnable r1 = new Runnable() {
- @Override
public void run() {
conn.execute(new SessionOp<Object,RuntimeException>() {
- @Override
public Object fn(Session session) throws RuntimeException {
synchronized (t1Started) {
t1Started.set(true);
@@ -190,13 +182,11 @@
};
Runnable r2 = new Runnable() {
- @Override
public void run() {
synchronized (t1Started) {
while (!t1Started.get()) safeWait(t1Started);
}
conn.execute(new SessionOp<Object,RuntimeException>(){
- @Override
public Object fn(Session session) throws RuntimeException {
if (!t1Complete.get()) t2Error.set(true);
return null;
@@ -215,10 +205,8 @@
final AtomicBoolean interrupted = new AtomicBoolean(false);
final Runnable r = new Runnable() {
- @Override
public void run() {
boolean result = conn.execute(new SessionOp<Boolean,RuntimeException>() {
- @Override
public Boolean fn(Session session) throws RuntimeException {
try {
Thread.sleep(5000);
Modified: trunk/src/jar/query/java/org/mulgara/query/AskQuery.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/AskQuery.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/AskQuery.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -62,7 +62,6 @@
*/
public BooleanAnswer execute(Connection conn) throws QueryException, TuplesException {
boolean answer = conn.execute(new SessionOp<Boolean,QueryException>() {
- @Override
public Boolean fn(Session session) throws QueryException {
return session.query(AskQuery.this);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/ConstructQuery.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/ConstructQuery.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/ConstructQuery.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -59,7 +59,6 @@
public GraphAnswer execute(Connection conn) throws QueryException, TuplesException {
// pipe all the query types through the one Session method
GraphAnswer answer = conn.execute(new SessionOp<GraphAnswer,QueryException>(){
- @Override
public GraphAnswer fn(Session session) throws QueryException {
return session.query(ConstructQuery.this);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/Query.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/Query.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/Query.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -594,7 +594,6 @@
public Answer execute(Connection conn) throws QueryException, TuplesException {
if (logger.isDebugEnabled()) logger.debug("Executing query " + toString());
Answer answer = conn.execute(new SessionOp<Answer,QueryException>() {
- @Override
public Answer fn(Session session) throws QueryException {
return session.query(Query.this);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/ApplyRules.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/ApplyRules.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/ApplyRules.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -119,7 +119,6 @@
final RulesRef rules;
try {
rules = ruleConn.execute(new SessionOp<RulesRef,Exception>() {
- @Override
public RulesRef fn(Session session) throws Exception {
return session.buildRules(ruleGraph, baseGraph, destGraph);
}
@@ -133,7 +132,6 @@
}
// create apply the rules to the model
conn.execute(new SessionOp<Object,QueryException>() {
- @Override
public Object fn(Session session) throws QueryException {
session.applyRules(rules);
return null;
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Backup.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Backup.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Backup.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -148,7 +148,6 @@
@Override
protected SessionOp<Object,QueryException> getOp(final OutputStream outputStream) {
return new SessionOp<Object,QueryException>() {
- @Override
public Object fn(Session session) throws QueryException {
session.backup(outputStream);
return null;
@@ -163,7 +162,6 @@
@Override
protected SessionOp<Object,QueryException> getOp(final URI destUri) {
return new SessionOp<Object,QueryException>() {
- @Override
public Object fn(Session session) throws QueryException {
session.backup(destUri);
return null;
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Commit.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -45,7 +45,6 @@
*/
public TxExecutable getExecutable(final Connection conn) {
return new TxExecutable() {
- @Override
public Object fn(Session session) throws QueryException {
if (session != null) {
session.commit();
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/CreateGraph.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -86,7 +86,6 @@
*/
public SessionOp<String,QueryException> getExecutable() {
return new SessionOp<String,QueryException>() {
- @Override
public String fn(Session session) throws QueryException {
if (logger.isDebugEnabled()) logger.debug("Creating new graph " + graphUri);
session.createModel(graphUri, type);
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Deletion.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Deletion.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Deletion.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -58,7 +58,6 @@
@Override
protected SessionOp<String,QueryException> getExecutable() {
return new SessionOp<String,QueryException>() {
- @Override
public String fn(Session session) throws QueryException {
if (isSelectBased()) session.delete(graph, getSelectQuery());
else session.delete(graph, getStatements());
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/DropGraph.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/DropGraph.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/DropGraph.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -53,7 +53,6 @@
@Override
protected SessionOp<String,QueryException> getExecutable() {
return new SessionOp<String,QueryException>() {
- @Override
public String fn(Session session) throws QueryException {
session.removeModel(graphUri);
return setResultMessage("Successfully dropped graph " + graphUri);
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Export.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Export.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Export.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -124,7 +124,6 @@
@Override
protected SessionOp<Object,QueryException> getOp(final OutputStream outputStream) {
return new SessionOp<Object,QueryException>() {
- @Override
public Object fn(Session session) throws QueryException {
session.export(getSource(), outputStream, namespacePrefixes);
return null;
@@ -139,7 +138,6 @@
@Override
protected SessionOp<Object,QueryException> getOp(final URI destUri) {
return new SessionOp<Object,QueryException>() {
- @Override
public Object fn(Session session) throws QueryException {
session.export(getSource(), destUri, namespacePrefixes);
return null;
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Insertion.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Insertion.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Insertion.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -68,7 +68,6 @@
@Override
protected SessionOp<String,QueryException> getExecutable() {
return new SessionOp<String,QueryException>() {
- @Override
public String fn(Session session) throws QueryException {
if (isSelectBased()) session.insert(graph, getSelectQuery());
else session.insert(graph, getStatements());
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Load.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Load.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Load.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -130,7 +130,6 @@
@Override
protected SessionOp<Long,QueryException> getExecutable(final InputStream inputStream) {
return new SessionOp<Long,QueryException>() {
- @Override
public Long fn(Session session) throws QueryException {
return session.setModel(inputStream, getDestination(), srcRsc, contentType);
}
@@ -144,7 +143,6 @@
@Override
protected SessionOp<Long,QueryException> getExecutable(final GraphResource src) {
return new SessionOp<Long,QueryException>() {
- @Override
public Long fn(Session session) throws QueryException {
return session.setModel(getDestination(), src);
}
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Restore.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -126,7 +126,6 @@
@Override
protected SessionOp<Long,QueryException> getExecutable(final InputStream inputStream) {
return new SessionOp<Long,QueryException>() {
- @Override
public Long fn(Session session) throws QueryException {
session.restore(inputStream, getSource());
return 0L;
@@ -140,7 +139,6 @@
@Override
protected SessionOp<Long,QueryException> getExecutable(final URI srcUri) {
return new SessionOp<Long,QueryException>() {
- @Override
public Long fn(Session session) throws QueryException {
session.restore(srcUri);
return 0L;
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/Rollback.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -45,7 +45,6 @@
*/
public TxExecutable getExecutable(final Connection conn) {
return new TxExecutable() {
- @Override
public Object fn(Session session) throws QueryException {
if (session != null) {
session.rollback();
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/SessionCommand.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/SessionCommand.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/SessionCommand.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -37,8 +37,7 @@
/* (non-Javadoc)
* @see org.mulgara.query.operation.Command#execute(org.mulgara.connection.Connection)
*/
- @Override
- final public Object execute(Connection conn) throws QueryException {
+ final public Object execute(Connection conn) throws QueryException {
return conn.execute(getExecutable());
}
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/TransactionCommand.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/TransactionCommand.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/TransactionCommand.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -79,7 +79,6 @@
/* (non-Javadoc)
* @see org.mulgara.query.operation.Command#execute(org.mulgara.connection.Connection)
*/
- @Override
final public Object execute(Connection conn) throws QueryException {
return conn.execute(getExecutable(conn));
}
Modified: trunk/tools/src/org/mulgara/tools/Sparql.java
===================================================================
--- trunk/tools/src/org/mulgara/tools/Sparql.java 2010-02-16 17:20:13 UTC (rev 1922)
+++ trunk/tools/src/org/mulgara/tools/Sparql.java 2010-02-16 17:23:09 UTC (rev 1923)
@@ -100,7 +100,6 @@
final Sparql sparql = new Sparql(queryStrings);
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
- @Override
public void run() {
try {
sparql.cancel();
More information about the Mulgara-svn
mailing list