[graphl-cvs] graphl/src/org/mediavirus/graphl/graph/rdf RDFNode.java RDFGraph.java

[Flo L. <fl...@us...>]

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25738/src/org/mediavirus/graphl/graph/rdf

Modified Files:
	RDFNode.java RDFGraph.java 
Log Message:
- FEATURE: implemented generic type menu that reads from RDF vocabs
- FEATURE: RDFGraph now imports files referenced with owl:imports statements
- BUG: fixed saving of literal properties
- BUG: fixed Swing look and feel for JDK 1.5
- CODE: GraphlPane now stores vocabularies
- CODE: added first (dummy) implementation of node mainpulator
- CODE: added getProperties() mehtod to PropertySet interface


Index: RDFNode.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RDFNode.java	21 Oct 2004 16:00:48 -0000	1.6
--- RDFNode.java	11 Jan 2005 13:26:40 -0000	1.7
***************
*** 6,9 ****
--- 6,10 ----
  
  
+ import java.util.ArrayList;
  import java.util.Collections;
  import java.util.Iterator;
***************
*** 93,97 ****
  		}
  		else {
! 			Iterator edges = getEdgesFrom().iterator();
  			while (edges.hasNext()) {
  				RDFEdge e = (RDFEdge)edges.next();
--- 94,98 ----
  		}
  		else {
! 			Iterator edges = new ArrayList(getEdgesFrom()).iterator();
  			while (edges.hasNext()) {
  				RDFEdge e = (RDFEdge)edges.next();

Index: RDFGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFGraph.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RDFGraph.java	30 Nov 2004 09:38:34 -0000	1.7
--- RDFGraph.java	11 Jan 2005 13:26:41 -0000	1.8
***************
*** 17,20 ****
--- 17,21 ----
  import java.util.Hashtable;
  import java.util.List;
+ import java.util.Map;
  
  import org.mediavirus.graphl.graph.DefaultGraph;
***************
*** 53,60 ****
--- 54,75 ----
  		RDFWriter writer = new RDFWriter();
  		
+ 		// TODO (2) use vocabularies from config for prefix resolution
  		writer.addNamespacePrefix("graphl","http://www.mediavirus.org/graphl#");
+ 		writer.addNamespacePrefix("foaf","http://xmlns.com/foaf/0.1/");
+ 		writer.addNamespacePrefix("rdf","http://www.w3.org/1999/02/22-rdf-syntax-ns#");
+ 		writer.addNamespacePrefix("rdfs","http://www.w3.org/2000/01/rdf-schema#");
+ 		writer.addNamespacePrefix("owl","http://www.w3.org/2002/07/owl#");
+ 		writer.addNamespacePrefix("map","http://fabl.net/vocabularies/geography/map/1.1/");
+ 		writer.addNamespacePrefix("geo","http://www.w3.org/2003/01/geo/wgs84_pos#");
  
  		writer.prepareNamespaceCollection();
+ 		
  		writer.collectNamespace("http://www.mediavirus.org/graphl#");
+ 		writer.collectNamespace("http://xmlns.com/foaf/0.1/");
+ 		writer.collectNamespace("http://www.w3.org/1999/02/22-rdf-syntax-ns#");
+ 		writer.collectNamespace("http://www.w3.org/2000/01/rdf-schema#");
+ 		writer.collectNamespace("http://www.w3.org/2002/07/owl#");
+ 		writer.collectNamespace("http://fabl.net/vocabularies/geography/map/1.1/");
+ 		writer.collectNamespace("http://www.w3.org/2003/01/geo/wgs84_pos#");
  
  		OutputStreamWriter owriter = new OutputStreamWriter(out);
***************
*** 65,69 ****
  		for (Iterator iter = allNodes.iterator(); iter.hasNext();) {
  			RDFNode node = (RDFNode) iter.next();
! 			writer.writeStatement(node.getId(), "http://www.mediavirus.org/graphl#canvasPosition", node.getCenterX() + ":" + node.getCenterY(), null, null, true);
  			List nodeEdges = node.getEdgesFrom();
  			for (Iterator edgeIter = nodeEdges.iterator(); edgeIter.hasNext();) {
--- 80,88 ----
  		for (Iterator iter = allNodes.iterator(); iter.hasNext();) {
  			RDFNode node = (RDFNode) iter.next();
! 			for (Iterator attrs = node.getProperties().keySet().iterator(); attrs.hasNext();) {
! 				String attr = (String) attrs.next();
! 				writer.writeStatement(node.getId(), attr, node.getProperty(attr), null, null, true);
! 			}
! 			//writer.writeStatement(node.getId(), "http://www.mediavirus.org/graphl#canvasPosition", node.getCenterX() + ":" + node.getCenterY(), null, null, true);
  			List nodeEdges = node.getEdgesFrom();
  			for (Iterator edgeIter = nodeEdges.iterator(); edgeIter.hasNext();) {
***************
*** 161,164 ****
--- 180,198 ----
  				addElements(null, Collections.singleton(edge));
  				if (DEBUG) System.out.println("created edge " + subject + ", " + predicate + ", " + object);
+ 				
+ 				if (predicate.equals("http://www.w3.org/2002/07/owl#imports")) {
+ 					System.out.println("#### " + object);
+ 					try {
+ 						URL oldBase = baseURL;
+ 						URL importURL = new URL(baseURL, object);
+ 						System.out.println("importing " + importURL.toString() + " ... ");
+ 						readFromURL(importURL);
+ 						// restore original base url
+ 						baseURL = oldBase;
+ 					}
+ 					catch (MalformedURLException muex) {
+ 						System.out.println("Error importing " + object);
+ 					}
+ 				}
  			}
  		}