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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	RDFGraph.java RDFNode.java RDFEdge.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance

Index: RDFEdge.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFEdge.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RDFEdge.java	30 Nov 2004 09:38:34 -0000	1.4
--- RDFEdge.java	18 Dec 2005 11:11:41 -0000	1.5
***************
*** 23,38 ****
  	 * @param to The Node this Edge leads to.
  	 */
! 	public RDFEdge(Node from, Node to) {
  		super(from, to);
  	}

  	/**
- 	 * @return The primary value of this Edge.
- 	 */
- 	public String getLabel() {
- 		return getType();
- 	}
- 
- 	/**
  	 * @return The id of this Edge.
  	 */
--- 23,31 ----
  	 * @param to The Node this Edge leads to.
  	 */
! 	RDFEdge(Node from, Node to) {
  		super(from, to);
  	}

  	/**
  	 * @return The id of this Edge.
  	 */

Index: RDFNode.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFNode.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RDFNode.java	7 Sep 2005 12:29:55 -0000	1.11
--- RDFNode.java	18 Dec 2005 11:11:41 -0000	1.12
***************
*** 11,14 ****
--- 11,15 ----

  import org.mediavirus.graphl.graph.DefaultNode;
+ import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Node;
  import org.mediavirus.graphl.vocabulary.NS;
***************
*** 28,32 ****
  	}

! 	public RDFNode(RDFGraph graph){
  		super();

--- 29,33 ----
  	}

! 	RDFNode(RDFGraph graph){
  		super();

***************
*** 35,39 ****
  	}

! 	public RDFNode(RDFGraph graph, String id) {
  		super();

--- 36,40 ----
  	}

! 	RDFNode(RDFGraph graph, String id) {
  		super();

***************
*** 60,63 ****
--- 61,65 ----
  		}
  		super.setId(id);
+         setProperty(NS.rdf + "id", id);
  	}

***************
*** 88,92 ****
  				// TODO (3) this should probably not be hardcoded to USER
  				typeEdge.setSource(NS.graphl + "USER");
! 				graph.addElements(null, Collections.singleton(typeEdge));
  			} catch (Exception e) {
  				e.printStackTrace();
--- 90,94 ----
  				// TODO (3) this should probably not be hardcoded to USER
  				typeEdge.setSource(NS.graphl + "USER");
! 				graph.addElements(null, Collections.singleton((Edge)typeEdge));
  			} catch (Exception e) {
  				e.printStackTrace();
***************
*** 94,102 ****
  		}
  		else {
! 			Iterator edges = new ArrayList(getEdgesFrom()).iterator();
  			while (edges.hasNext()) {
! 				RDFEdge e = (RDFEdge)edges.next();
! 				if (e.getType() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
! 					graph.deleteElements(null,Collections.singleton(e));
  			}			
  		}
--- 96,104 ----
  		}
  		else {
! 			Iterator<Edge> edges = new ArrayList<Edge>(getEdgesFrom()).iterator();
  			while (edges.hasNext()) {
! 				RDFEdge edge = (RDFEdge)edges.next();
! 				if (edge.getType() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
! 					graph.deleteElements(null,Collections.singleton((Edge)edge));
  			}			
  		}

Index: RDFGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFGraph.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** RDFGraph.java	14 Dec 2005 12:45:08 -0000	1.13
--- RDFGraph.java	18 Dec 2005 11:11:41 -0000	1.14
***************
*** 8,12 ****

  import java.io.File;
- import java.io.FileReader;
  import java.io.IOException;
  import java.io.OutputStream;
--- 8,11 ----
***************
*** 19,23 ****
--- 18,24 ----
  import java.util.Hashtable;
  import java.util.List;
+ import java.util.Map;

+ import org.mediavirus.graphl.GraphlRegistry;
  import org.mediavirus.graphl.graph.DefaultGraph;
  import org.mediavirus.graphl.graph.Edge;
***************
*** 42,46 ****
      boolean dirty = false;

!     Hashtable allNodes = new Hashtable();

      URL loadingURL = null;
--- 43,47 ----
      boolean dirty = false;

!     Hashtable<String, Node> allNodes = new Hashtable<String, Node>();

      URL loadingURL = null;
***************
*** 63,92 ****
          RDFWriter writer = new RDFWriter();

          // TODO (2) use vocabularies from config for prefix resolution
!         writer.addNamespacePrefix("graphl", NS.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.addNamespacePrefix("dc", "http://purl.org/dc/elements/1.1/");
!         writer.addNamespacePrefix("foo", "http://www.mediavirus.org/foo#");
!         writer.addNamespacePrefix("vs", "http://www.w3.org/2003/06/sw-vocab-status/ns#");
!         writer.addNamespacePrefix("wot", "http://xmlns.com/wot/0.1/");

          writer.prepareNamespaceCollection();

!         writer.collectNamespace(NS.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#");
!         writer.collectNamespace("http://purl.org/dc/elements/1.1/");
!         writer.collectNamespace("http://www.mediavirus.org/foo#");
!         writer.collectNamespace("http://www.w3.org/2003/06/sw-vocab-status/ns#");
!         writer.collectNamespace("http://xmlns.com/wot/0.1/");

          OutputStreamWriter owriter = new OutputStreamWriter(out);
--- 64,103 ----
          RDFWriter writer = new RDFWriter();

+         Map<String, String> namespaceMap = GraphlRegistry.instance().getVocabularyRegistry().getNamespaces();
+         for (Iterator prefixes = namespaceMap.keySet().iterator(); prefixes.hasNext();) {
+             String prefix = (String)prefixes.next();
+             writer.addNamespacePrefix(prefix, namespaceMap.get(prefix));            
+         }
          // TODO (2) use vocabularies from config for prefix resolution
! //        writer.addNamespacePrefix("graphl", NS.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.addNamespacePrefix("dc", "http://purl.org/dc/elements/1.1/");
! //        writer.addNamespacePrefix("foo", "http://www.mediavirus.org/foo#");
! //        writer.addNamespacePrefix("vs", "http://www.w3.org/2003/06/sw-vocab-status/ns#");
! //        writer.addNamespacePrefix("wot", "http://xmlns.com/wot/0.1/");

          writer.prepareNamespaceCollection();

!         for (Iterator namespaces = namespaceMap.values().iterator(); namespaces.hasNext();) {
!             String ns = (String)namespaces.next();
!             writer.collectNamespace(ns);            
!         }
!         
! //        writer.collectNamespace(NS.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#");
! //        writer.collectNamespace("http://purl.org/dc/elements/1.1/");
! //        writer.collectNamespace("http://www.mediavirus.org/foo#");
! //        writer.collectNamespace("http://www.w3.org/2003/06/sw-vocab-status/ns#");
! //        writer.collectNamespace("http://xmlns.com/wot/0.1/");

          OutputStreamWriter owriter = new OutputStreamWriter(out);
***************
*** 178,181 ****
--- 189,193 ----
                  edge.setSource(NS.graphl + "SYSTEM");
                  edge.setType(NS.graphl + "definedIn");
+                 addElements(null, Collections.singleton(edge));
              }

***************
*** 270,274 ****
                  edge.setType(predicate);
                  edge.setSource(loadingURL.toString());
!                 addElements(null, Collections.singleton(edge));
                  if (DEBUG) System.out.println("created edge " + subject + ", " + predicate + ", " + object);

--- 282,286 ----
                  edge.setType(predicate);
                  edge.setSource(loadingURL.toString());
!                 addElements(null, Collections.singleton((Edge)edge));
                  if (DEBUG) System.out.println("created edge " + subject + ", " + predicate + ", " + object);

***************
*** 309,313 ****
              node.setCenter(r * Math.sin(loadAlpha), r * Math.cos(loadAlpha));
              loadCount++;
!             addElements(Collections.singleton(node), null);
              if (DEBUG) System.out.println("created node " + uri);
          }
--- 321,325 ----
              node.setCenter(r * Math.sin(loadAlpha), r * Math.cos(loadAlpha));
              loadCount++;
!             addElements(Collections.singleton((Node)node), null);
              if (DEBUG) System.out.println("created node " + uri);
          }
***************
*** 325,328 ****
--- 337,341 ----
                  edge.setSource(NS.graphl + "SYSTEM");
                  edge.setType(NS.graphl + "definedIn");
+                 addElements(null, Collections.singleton(edge));
              }
          }
***************
*** 333,337 ****

          RDFNode node = new RDFNode(this);
!         addElements(Collections.singleton(node), null);
          return node;
      }
--- 346,350 ----

          RDFNode node = new RDFNode(this);
!         //addElements(Collections.singleton(node), null);
          return node;
      }
***************
*** 346,350 ****
              edge.setSource(NS.graphl + "USER");
          }
!         addElements(null, Collections.singleton(edge));
          return edge;
      }
--- 359,363 ----
              edge.setSource(NS.graphl + "USER");
          }
!         //addElements(null, Collections.singleton(edge));
          return edge;
      }
***************
*** 381,385 ****
      public void logicalURI(String logicalURI) throws SAXException {

!         if (DEBUG) System.out.println("RDF: logicalURI: " + logicalURI);
      }

--- 394,399 ----
      public void logicalURI(String logicalURI) throws SAXException {

!         if (DEBUG)
!             System.out.println("RDF: logicalURI: " + logicalURI);
      }

***************
*** 389,393 ****
      public void includeModel(String logicalURI, String physicalURI) throws SAXException {

!         if (DEBUG) System.out.println("RDF: includeModel: " + logicalURI + ", " + physicalURI);
      }

--- 403,408 ----
      public void includeModel(String logicalURI, String physicalURI) throws SAXException {

!         if (DEBUG)
!             System.out.println("RDF: includeModel: " + logicalURI + ", " + physicalURI);
      }

***************
*** 397,401 ****
      public void addModelAttribte(String key, String value) throws SAXException {

!         if (DEBUG) System.out.println("RDF: addModelAttribte" + key + ", " + value);
      }

--- 412,417 ----
      public void addModelAttribte(String key, String value) throws SAXException {

!         if (DEBUG)
!             System.out.println("RDF: addModelAttribte" + key + ", " + value);
      }

***************
*** 429,433 ****
       * Overrides @see de.fzi.wim.guibase.graphview.graph.DefaultGraph#addElements(java.util.Collection, java.util.Collection)
       */
!     public synchronized void addElements(Collection nodes, Collection edges) {

          setDirty();
--- 445,449 ----
       * Overrides @see de.fzi.wim.guibase.graphview.graph.DefaultGraph#addElements(java.util.Collection, java.util.Collection)
       */
!     public synchronized void addElements(Collection<Node> nodes, Collection<Edge> edges) {

          setDirty();
***************
*** 435,439 ****

          if (nodes != null) {
!             for (Iterator iter = nodes.iterator(); iter.hasNext();) {
                  RDFNode node = (RDFNode) iter.next();
                  allNodes.put(node.getId(), node);
--- 451,455 ----

          if (nodes != null) {
!             for (Iterator<Node> iter = nodes.iterator(); iter.hasNext();) {
                  RDFNode node = (RDFNode) iter.next();
                  allNodes.put(node.getId(), node);
***************
*** 456,460 ****
       * Overrides @see de.fzi.wim.guibase.graphview.graph.DefaultGraph#deleteElements(java.util.Collection, java.util.Collection)
       */
!     public synchronized void deleteElements(Collection nodes, Collection edges) {

          setDirty();
--- 472,476 ----
       * Overrides @see de.fzi.wim.guibase.graphview.graph.DefaultGraph#deleteElements(java.util.Collection, java.util.Collection)
       */
!     public synchronized void deleteElements(Collection<Node> nodes, Collection<Edge> edges) {

          setDirty();