Author: [email protected]
Date: Tue Nov 22 16:14:21 2011
New Revision: 1746
Log:
Removed Java 6 @Override annotations, we're still on Java 5 here.
Added:
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/namespaces/
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/namespaces/RDF.java
Modified:
trunk/amdatu-semanticweb/semantic-shell/src/main/java/org/amdatu/semantic/shell/SemanticQueryCommand.java
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/impl/RDF2GOSemanticServiceImpl.java
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/Query.java
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/typed/EntityConstraint.java
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/typed/Query.java
Modified:
trunk/amdatu-semanticweb/semantic-shell/src/main/java/org/amdatu/semantic/shell/SemanticQueryCommand.java
==============================================================================
---
trunk/amdatu-semanticweb/semantic-shell/src/main/java/org/amdatu/semantic/shell/SemanticQueryCommand.java
(original)
+++
trunk/amdatu-semanticweb/semantic-shell/src/main/java/org/amdatu/semantic/shell/SemanticQueryCommand.java
Tue Nov 22 16:14:21 2011
@@ -35,7 +35,6 @@
public void query(final String query) throws Exception {
m_service.read(new Reader<Void>() {
- @Override
public Void read(Model model) {
RowSet<Row> result = model.select(query.toString());
for (Row row : result) {
@@ -50,12 +49,10 @@
public void add(final String subject, final String predicate, final String
object) throws Exception {
m_service.update(new Updater<Void>() {
- @Override
public Void update(Model model) {
model.add(subject, predicate, object);
return null;
}
}).get();
}
-
}
Modified:
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/impl/RDF2GOSemanticServiceImpl.java
==============================================================================
---
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/impl/RDF2GOSemanticServiceImpl.java
(original)
+++
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/impl/RDF2GOSemanticServiceImpl.java
Tue Nov 22 16:14:21 2011
@@ -43,20 +43,17 @@
private ExecutorService m_executor = Executors.newCachedThreadPool(new
ThreadFactory() {
private int m_nr = 0;
- @Override
public Thread newThread(Runnable r) {
return new Thread(r, "Semantic service executor " + m_nr++);
}
});
private final ReadWriteLock m_lock = new ReentrantReadWriteLock(true);
- @Override
public <T> Future<T> read(Reader<T> reader) {
Callable<T> callable = new ReaderTask<T>(reader);
return m_executor.submit(callable);
}
- @Override
public <T> Future<T> update(Updater<T> updater) {
Callable<T> callable = new UpdaterTask<T>(updater);
return m_executor.submit(callable);
@@ -69,7 +66,6 @@
m_reader = reader;
}
- @Override
public T call() throws Exception {
m_lock.readLock().lock();
try {
@@ -92,7 +88,6 @@
m_updater = updater;
}
- @Override
public T call() throws Exception {
m_lock.writeLock().lock();
try {
@@ -117,25 +112,21 @@
m_allowWrite = allowWrite;
}
- @Override
public RowSet<Row> select(String query) {
checkState(false);
return new RDF2GOBasedRowSet(m_rdf2goModel.sparqlSelect(query));
}
- @Override
public boolean ask(String query) {
checkState(false);
return m_rdf2goModel.sparqlAsk(query);
}
- @Override
public void add(String subject, String predicate, String object) {
checkState(true);
m_rdf2goModel.addStatement(createStatement(subject, predicate,
object));
}
- @Override
public void remove(String subject, String predicate, String object) {
checkState(true);
if (!m_allowWrite) {
@@ -190,12 +181,10 @@
m_resultTable = resultTable;
}
- @Override
public Iterator<Row> iterator() {
return new RDF2GOBasedRowIterator(m_resultTable,
m_resultTable.iterator());
}
- @Override
public List<String> getVariables() {
return m_resultTable.getVariables();
}
@@ -210,17 +199,14 @@
m_rowIterator = rowIterator;
}
- @Override
public boolean hasNext() {
return m_rowIterator.hasNext();
}
- @Override
public Row next() {
return new RDF2GOBasedRow(m_table, m_rowIterator.next());
}
- @Override
public void remove() {
m_rowIterator.remove();
}
@@ -235,7 +221,6 @@
m_row = row;
}
- @Override
public String get(String variableName) {
validateBound(variableName);
Node value = m_row.getValue(variableName);
@@ -258,5 +243,4 @@
}
}
}
-
}
Added:
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/namespaces/RDF.java
==============================================================================
--- (empty file)
+++
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/namespaces/RDF.java
Tue Nov 22 16:14:21 2011
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2010, 2011 The Amdatu Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.amdatu.semantic.namespaces;
+
+import static org.amdatu.semantic.query.Constraint.predicate;
+
+import org.amdatu.semantic.query.Constraint.Predicate;
+
+public class RDF {
+ private static final String PREFIX =
"http://www.w3.org/1999/02/22-rdf-syntax-ns#";;
+ public static final Predicate TYPE = predicate(PREFIX + "type");
+}
Modified:
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/Query.java
==============================================================================
---
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/Query.java
(original)
+++
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/Query.java
Tue Nov 22 16:14:21 2011
@@ -121,7 +121,6 @@
return Constraint.variable(m_name);
}
- @Override
public Class<T> getSelectorClass() {
return m_selectorClass;
}
Modified:
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/typed/EntityConstraint.java
==============================================================================
---
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/typed/EntityConstraint.java
(original)
+++
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/typed/EntityConstraint.java
Tue Nov 22 16:14:21 2011
@@ -65,12 +65,10 @@
return (EntityConstraint<TYPE>) this;
}
- @Override
public Constraint.Variable getVariable() {
return m_variable;
}
- @Override
public Class<T> getSelectorClass() {
return m_selectorClass;
}
Modified:
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/typed/Query.java
==============================================================================
---
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/typed/Query.java
(original)
+++
trunk/amdatu-semanticweb/semanticservice-rdf2go/src/main/java/org/amdatu/semantic/query/typed/Query.java
Tue Nov 22 16:14:21 2011
@@ -60,12 +60,10 @@
m_model = model;
}
- @Override
public Iterator<Row> iterator() {
return new TypedRowSetIterator(m_set.iterator(), m_model);
}
- @Override
public List<String> getVariables() {
return m_set.getVariables();
}
@@ -81,17 +79,14 @@
m_model = model;
}
- @Override
public boolean hasNext() {
return m_iterator.hasNext();
}
- @Override
public Row next() {
return new TypedRow(m_iterator.next(), m_model);
}
- @Override
public void remove() {
m_iterator.remove();
}
@@ -107,16 +102,12 @@
m_model = model;
}
- @Override
public String get(String variableName) {
return m_row.get(variableName);
}
- @Override
public <T> T get(Selector<T> selector) {
return (T) Util.makeNew(selector.getSelectorClass(),
get(selector.getVariable().getValue()), m_model);
}
}
-
-
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
