[Mulgara-svn] r1997 - trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3
pag at mulgara.org
pag at mulgara.org
Mon Jul 18 20:41:21 UTC 2011
Author: pag
Date: 2011-07-18 20:41:20 +0000 (Mon, 18 Jul 2011)
New Revision: 1997
Modified:
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/AbstractModel.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/AnswerClosableIteratorImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/FileSystemModel.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/FileSystemModelImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Model.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/ModelContextImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ConfigFile.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ConfigImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ContextImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ControllerImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3File.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3FileImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3Iterator.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3IteratorImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3Model.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ModelImpl.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3UnitTest.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/SchemaModel.java
trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/SchemaModelImpl.java
Log:
Added generics and removed other warnings
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/AbstractModel.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/AbstractModel.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/AbstractModel.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -39,17 +39,14 @@
import org.jrdf.util.ClosableIterator;
// Locally written packages
-import java.net.URI;
import java.util.*;
import org.jrdf.graph.*;
import java.net.URLDecoder;
-import org.mulgara.demo.mp3.swing.ExceptionHandler;
import org.mulgara.itql.ItqlInterpreterBean;
import org.mulgara.query.Answer;
import org.mulgara.query.QueryException;
import org.mulgara.query.rdf.Mulgara;
-import org.mulgara.query.rdf.URIReferenceImpl;
import java.net.URLEncoder;
@@ -166,8 +163,8 @@
* @throws QueryException
* @return ClosableIterator
*/
- public ClosableIterator find(Iterator properties,
- Iterator values) throws QueryException {
+ public ClosableIterator<Triple> find(Iterator<PredicateNode> properties,
+ Iterator<ObjectNode> values) throws QueryException {
try {
String query = getFindQuery(properties, values);
return query(query);
@@ -268,7 +265,7 @@
* @param objects Iterator containing ObjectNodes
* @return String
*/
- protected String getFindQuery(Iterator predicates, Iterator objects) {
+ protected String getFindQuery(Iterator<PredicateNode> predicates, Iterator<ObjectNode> objects) {
StringBuffer query = new StringBuffer();
query.append("select $s $p $o " + NEWLINE);
query.append("from <" + getResource() + "> " + NEWLINE);
@@ -281,8 +278,8 @@
String currentValue = null;
while (predicates.hasNext()
&& objects.hasNext()) {
- currentProperty = asString(" $p", (PredicateNode) predicates.next());
- currentValue = asString(" $o", (ObjectNode) objects.next());
+ currentProperty = asString(" $p", predicates.next());
+ currentValue = asString(" $o", objects.next());
query.append("and $s" + currentProperty + currentValue + NEWLINE);
}
}
@@ -355,7 +352,7 @@
* @throws Exception
* @return ClosableIterator
*/
- public ClosableIterator query(String query) throws Exception {
+ public ClosableIterator<Triple> query(String query) throws Exception {
try {
checkInitialized();
Answer answer = getBean().executeQuery(query);
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/AnswerClosableIteratorImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/AnswerClosableIteratorImpl.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/AnswerClosableIteratorImpl.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -64,7 +64,7 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public class AnswerClosableIteratorImpl implements ClosableIterator {
+public class AnswerClosableIteratorImpl implements ClosableIterator<Triple> {
/**
* Logger. This is named after the class.
@@ -153,7 +153,7 @@
*
* @return a {@link org.jrdf.graph.Triple}.
*/
- public Object next() {
+ public Triple next() {
if (!hasNext) {
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/FileSystemModel.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/FileSystemModel.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/FileSystemModel.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -29,9 +29,9 @@
// Java 2 standard packages
import java.net.*;
-import java.util.Iterator;
import org.jrdf.graph.PredicateNode;
import org.jrdf.graph.ObjectNode;
+import org.jrdf.graph.Triple;
// Third party packages
@@ -105,7 +105,7 @@
* @return ClosableIterator
* @throws QueryException
*/
- public ClosableIterator findFiles(PredicateNode property,
+ public ClosableIterator<Triple> findFiles(PredicateNode property,
ObjectNode value) throws QueryException;
}
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/FileSystemModelImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/FileSystemModelImpl.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/FileSystemModelImpl.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -37,13 +37,12 @@
//JRDF
import org.jrdf.util.ClosableIterator;
+import org.jrdf.graph.Triple;
import org.jrdf.graph.URIReference;
import org.jrdf.graph.PredicateNode;
import org.jrdf.graph.ObjectNode;
// Locally written packages
-import org.jrdf.graph.Literal;
-import org.mulgara.query.Answer;
import org.mulgara.query.QueryException;
import org.mulgara.query.rdf.URIReferenceImpl;
@@ -131,7 +130,7 @@
* @return ClosableIterator
* @throws QueryException
*/
- public ClosableIterator findFiles(PredicateNode property,
+ public ClosableIterator<Triple> findFiles(PredicateNode property,
ObjectNode value) throws QueryException {
if (property == null) {
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Model.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Model.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Model.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -30,6 +30,9 @@
// Java 2 standard packages
// JRDF
+import org.jrdf.graph.ObjectNode;
+import org.jrdf.graph.PredicateNode;
+import org.jrdf.graph.Triple;
import org.jrdf.graph.URIReference;
// Local packages
@@ -102,8 +105,8 @@
* @throws QueryException
* @return ClosableIterator
*/
- public ClosableIterator find(Iterator properties,
- Iterator values) throws QueryException;
+ public ClosableIterator<Triple> find(Iterator<PredicateNode> properties,
+ Iterator<ObjectNode> values) throws QueryException;
/**
* Executes the query and returns the results as a ClosableIterator. Query
@@ -113,7 +116,7 @@
* @throws Exception
* @return ClosableIterator
*/
- public ClosableIterator query(String query) throws Exception;
+ public ClosableIterator<Triple> query(String query) throws Exception;
/**
* Creates the Graph with the type set by setType(), or the default Graph
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/ModelContextImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/ModelContextImpl.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/ModelContextImpl.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -61,6 +61,7 @@
/**
* Logger. This is named after the class.
*/
+ @SuppressWarnings("unused")
private final static Logger log = Logger.getLogger(ModelContextImpl.class.
getName());
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ConfigFile.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ConfigFile.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ConfigFile.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -71,6 +71,7 @@
/**
* Logger. This is named after the class.
*/
+ @SuppressWarnings("unused")
private final static Logger log = Logger.getLogger(Mp3ConfigFile.class.
getName());
@@ -78,7 +79,7 @@
private Mp3ConfigXML config = null;
/** List of schema Files to be returned by getSchemaFiles */
- private List schemaFiles = null;
+ private List<URIReference> schemaFiles = null;
/**
* Deafult Constructor.
@@ -86,7 +87,7 @@
* @throws Exception
*/
public Mp3ConfigFile() throws Exception {
- schemaFiles = new ArrayList();
+ schemaFiles = new ArrayList<URIReference>();
}
/**
@@ -244,7 +245,7 @@
* @throws IllegalStateException
* @return List
*/
- public List getSchemaFiles() throws IllegalStateException {
+ public List<URIReference> getSchemaFiles() throws IllegalStateException {
if (schemaFiles == null) {
throw new IllegalStateException("Schema Files do not exist.");
}
@@ -262,7 +263,7 @@
throw new IllegalArgumentException("'resource' is null");
}
if (schemaFiles == null) {
- schemaFiles = new ArrayList();
+ schemaFiles = new ArrayList<URIReference>();
}
schemaFiles.add(resource);
}
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ConfigImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ConfigImpl.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ConfigImpl.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -64,6 +64,7 @@
/**
* Logger. This is named after the class.
*/
+ @SuppressWarnings("unused")
private final static Logger log = Logger.getLogger(Mp3ConfigImpl.class.
getName());
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ContextImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ContextImpl.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ContextImpl.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -61,6 +61,7 @@
/**
* Logger. This is named after the class.
*/
+ @SuppressWarnings("unused")
private final static Logger log = Logger.getLogger(Mp3ContextImpl.class.
getName());
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ControllerImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ControllerImpl.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ControllerImpl.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -35,11 +35,7 @@
// JRDF
import org.jrdf.graph.URIReference;
import org.mulgara.itql.ItqlInterpreterBean;
-import org.mulgara.query.rdf.URIReferenceImpl;
-import java.net.URI;
-import java.net.URISyntaxException;
-
// Local packages
@@ -74,6 +70,7 @@
/**
* Logger. This is named after the class.
*/
+ @SuppressWarnings("unused")
private final static Logger log = Logger.getLogger(Mp3ControllerImpl.class.
getName());
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3File.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3File.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3File.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -60,7 +60,7 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public interface Mp3File extends Comparable {
+public interface Mp3File extends Comparable<URIReference> {
/** Used in queries to represent an Mp3 */
public final static String MULGARA_MP3 = " <" + Mulgara.NAMESPACE + "mp3>";
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3FileImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3FileImpl.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3FileImpl.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -34,6 +34,7 @@
import org.apache.log4j.Logger;
// JRDF
+import org.jrdf.graph.Node;
import org.jrdf.graph.URIReference;
// Local packages
@@ -66,6 +67,7 @@
/**
* Logger. This is named after the class.
*/
+ @SuppressWarnings("unused")
private final static Logger log = Logger.getLogger(Mp3FileImpl.class.getName());
/** Mp3File metadata */
@@ -249,7 +251,8 @@
* @param obj Object
* @return int
*/
- public int compareTo(Object obj) {
+ @SuppressWarnings("unchecked")
+ public int compareTo(URIReference obj) {
URIReference resource = getResource();
if ((obj == null)
|| !(obj instanceof Mp3File)
@@ -257,7 +260,7 @@
return -1;
}
Mp3File mp3File = (Mp3File) obj;
- return ((Comparable) resource).compareTo(mp3File.getResource());
+ return ((Comparable<Node>)resource).compareTo(mp3File.getResource());
}
}
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3Iterator.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3Iterator.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3Iterator.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -51,7 +51,7 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public interface Mp3Iterator extends Iterator {
+public interface Mp3Iterator extends Iterator<Mp3File> {
/**
* Returns the next Mp3File.
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3IteratorImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3IteratorImpl.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3IteratorImpl.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -65,11 +65,12 @@
/**
* Logger. This is named after the class.
*/
+ @SuppressWarnings("unused")
private final static Logger log = Logger.getLogger(Mp3IteratorImpl.class.
getName());
/** Used to generate Mp3Files */
- private ClosableIterator iterator = null;
+ private ClosableIterator<Triple> iterator = null;
/** Used to intialize Mp3Files */
private Mp3Context context = null;
@@ -83,7 +84,7 @@
* @param newIterator ClosableIterator
* @param context Mp3Context
*/
- public Mp3IteratorImpl(ClosableIterator newIterator, Mp3Context context) {
+ public Mp3IteratorImpl(ClosableIterator<Triple> newIterator, Mp3Context context) {
if (newIterator == null) {
throw new IllegalArgumentException("ClosableIterator is null");
}
@@ -94,7 +95,7 @@
this.context = context;
//pre-cache the first Triple
if (iterator.hasNext()) {
- next = (Triple) iterator.next();
+ next = iterator.next();
}
}
@@ -142,7 +143,7 @@
*
* @return Object
*/
- public Object next() {
+ public Mp3File next() {
if (!hasNext()) {
throw new IllegalStateException("hasNext() returns false.");
}
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3Model.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3Model.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3Model.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -34,6 +34,7 @@
//JRDF
import org.jrdf.util.ClosableIterator;
+import org.jrdf.graph.Triple;
import org.jrdf.graph.URIReference;
import org.jrdf.graph.Literal;
@@ -109,8 +110,8 @@
* @return ClosableIterator
* @throws QueryException
*/
- public ClosableIterator getPropertyStatements(URIReference mp3,
- Iterator properties) throws QueryException;
+ public ClosableIterator<Triple> getPropertyStatements(URIReference mp3,
+ Iterator<Triple> properties) throws QueryException;
/**
* Returns an Iterator containing all the Mp3s (as URIReferenece's) that have
@@ -122,8 +123,8 @@
* @return Mp3Iterator
* @throws QueryException
*/
- public Mp3Iterator findMp3s(Iterator properties,
- Iterator values) throws QueryException;
+ public Mp3Iterator findMp3s(Iterator<PredicateNode> properties,
+ Iterator<ObjectNode> values) throws QueryException;
/**
* Sets the listener that is notified of Mp3Model events.
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ModelImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ModelImpl.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3ModelImpl.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -109,7 +109,7 @@
try {
checkInitialized();
//get all files from the filesystem with an extension of mp3
- ClosableIterator files = fsModel.findFiles(
+ ClosableIterator<Triple> files = fsModel.findFiles(
FileSystemModel.FILE_EXT, Mp3Model.MP3_EXT);
Mp3Iterator mp3s = new Mp3IteratorImpl(files, newMp3Context());
loadMp3s(mp3s);
@@ -153,7 +153,7 @@
try {
checkInitialized();
String query = getMp3sQuery();
- ClosableIterator mp3s = query(query);
+ ClosableIterator<Triple> mp3s = query(query);
return new Mp3IteratorImpl(mp3s, newMp3Context());
} catch (Exception exception) {
throw new QueryException("Failed to retrieve Mp3Files.", exception);
@@ -171,8 +171,8 @@
* @return ClosableIterator
* @throws QueryException
*/
- public ClosableIterator getPropertyStatements(URIReference mp3,
- Iterator properties) throws QueryException {
+ public ClosableIterator<Triple> getPropertyStatements(URIReference mp3,
+ Iterator<Triple> properties) throws QueryException {
try {
checkInitialized();
String query = getPropertiesQuery(mp3, properties);
@@ -194,13 +194,13 @@
* @return Mp3Iterator
* @throws QueryException
*/
- public Mp3Iterator findMp3s(Iterator properties, Iterator values)
+ public Mp3Iterator findMp3s(Iterator<PredicateNode> properties, Iterator<ObjectNode> values)
throws QueryException {
try {
checkInitialized();
//query for mp3s with the specified property
String query = getFindMp3Query(properties, values);
- ClosableIterator mp3s = query(query);
+ ClosableIterator<Triple> mp3s = query(query);
return new Mp3IteratorImpl(mp3s, newMp3Context());
} catch (Exception exception) {
throw new QueryException("Failed to retrieve Mp3Files.", exception);
@@ -275,7 +275,7 @@
* Iterator containing ObjectNodes
* @return String
*/
- private String getFindMp3Query(Iterator properties, Iterator values) {
+ private String getFindMp3Query(Iterator<PredicateNode> properties, Iterator<ObjectNode> values) {
//if there are no constraints, return all.
if ((properties == null) || (values == null) || (!properties.hasNext())
@@ -291,8 +291,8 @@
query.append("from <" + getResource() + "> " + NEWLINE);
query.append("where $x" + Id3Tag.ID3_URI + " $s" + NEWLINE);
while (properties.hasNext() && values.hasNext()) {
- currentProperty = asString(" $p", (PredicateNode) properties.next());
- currentValue = asString(" $o", (ObjectNode) values.next());
+ currentProperty = asString(" $p", properties.next());
+ currentValue = asString(" $o", values.next());
query.append("and $x" + currentProperty + currentValue + NEWLINE);
}
query.append("order by $s ;");
@@ -330,14 +330,14 @@
* Iterator of Triples where the SubjectNode's represent the
* schemaProperties.
*/
- private String getPropertiesQuery(URIReference mp3, Iterator properties) {
+ private String getPropertiesQuery(URIReference mp3, Iterator<Triple> properties) {
//if there are no properties, there should be no statements.
if ((properties == null) || !(properties.hasNext())) {
return ";";
}
- Node currentProperty = ((Triple) properties.next()).getPredicate();
+ Node currentProperty = properties.next().getPredicate();
StringBuffer query = new StringBuffer("select $s $p $o" + NEWLINE);
query.append("from <" + getResource().getURI() + ">" + NEWLINE);
query.append("where $s $p $o" + NEWLINE);
@@ -345,7 +345,7 @@
query.append("and ( "
+ getMulgaraIsConstraint("$p", (URIReference) currentProperty));
while (properties.hasNext()) {
- currentProperty = ((Triple) properties.next()).getSubject();
+ currentProperty = properties.next().getSubject();
query.append(" or "
+ getMulgaraIsConstraint("$p", (URIReference) currentProperty));
}
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3UnitTest.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3UnitTest.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/Mp3UnitTest.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -69,6 +69,7 @@
/**
* init the logging class
*/
+ @SuppressWarnings("unused")
private static Logger logger = Logger.getLogger(Mp3UnitTest.class.getName());
/** Default config file location */
@@ -190,10 +191,11 @@
*/
public void testFindMp3s() throws Exception {
try {
- URIReference property = new URIReferenceImpl(new URI(FIND_PROPERTY));
- Literal value = new LiteralImpl(FIND_VALUE);
- Mp3Iterator iter = controller.getMp3Model().findMp3s(Collections.
- singleton(property).iterator(), Collections.singleton(value).iterator());
+ PredicateNode property = new URIReferenceImpl(new URI(FIND_PROPERTY));
+ ObjectNode value = new LiteralImpl(FIND_VALUE);
+ Mp3Iterator iter = controller.getMp3Model().findMp3s(
+ Collections.singleton(property).iterator(),
+ Collections.singleton(value).iterator());
assertTrue("Find returned no mp3s.", iter.hasNext());
iter.close();
}
@@ -231,6 +233,7 @@
*
* @throws Exception if something goes wrong
*/
+ @SuppressWarnings("finally")
public void setUp() throws Exception {
try {
@@ -250,8 +253,7 @@
try {
tearDown();
- }
- finally {
+ } finally {
throw exception;
}
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/SchemaModel.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/SchemaModel.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/SchemaModel.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -30,6 +30,7 @@
// Java 2 standard packages
// JRDF
+import org.jrdf.graph.Triple;
import org.jrdf.graph.URIReference;
import org.jrdf.util.ClosableIterator;
@@ -65,7 +66,7 @@
* @return ClosableIterator
* @throws QueryException
*/
- public ClosableIterator getDomainProperties(URIReference domain) throws
+ public ClosableIterator<Triple> getDomainProperties(URIReference domain) throws
QueryException;
/**
Modified: trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/SchemaModelImpl.java
===================================================================
--- trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/SchemaModelImpl.java 2011-07-15 03:22:27 UTC (rev 1996)
+++ trunk/src/jar/demo-mp3/java/org/mulgara/demo/mp3/SchemaModelImpl.java 2011-07-18 20:41:20 UTC (rev 1997)
@@ -33,6 +33,7 @@
import org.apache.log4j.Logger;
// JRDF
+import org.jrdf.graph.Triple;
import org.jrdf.graph.URIReference;
import org.jrdf.util.ClosableIterator;
import org.jrdf.vocabulary.RDFS;
@@ -65,6 +66,7 @@
/**
* Logger. This is named after the class.
*/
+ @SuppressWarnings("unused")
private final static Logger log = Logger.getLogger(SchemaModelImpl.class.
getName());
@@ -96,7 +98,7 @@
* @return ClosableIterator
* @throws QueryException
*/
- public ClosableIterator getDomainProperties(URIReference domain) throws
+ public ClosableIterator<Triple> getDomainProperties(URIReference domain) throws
QueryException {
if (domain == null) {
More information about the Mulgara-svn
mailing list