[graphl-cvs] graphl/src/org/mediavirus/graphl/graph/rdf RDFNode.java RDFEdge.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-serv12051/src/org/mediavirus/graphl/graph/rdf

Modified Files:
	RDFNode.java RDFEdge.java RDFGraph.java 
Log Message:
- FEATURE: added z-index support for painting nodes & edges
- FEATURE: BoxNodePainter draws rounded rectangles
- FEATURE: Font for boxnodepainter is configurable
- FEATURE: labelcolor of edgepainter is configurable
- FEATURE: added utility functions for namespace compression/expansion
- REFACTOR: moved layouter to graphpane
- BUG: removed value property from graphelements
- BUG: stopping layouter when displaying contextmenus etc.
- BUG: fixed panning after startup
- removed obsolete commented-out code

Index: RDFEdge.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFEdge.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RDFEdge.java	4 Oct 2004 10:21:05 -0000	1.2
--- RDFEdge.java	14 Oct 2004 13:03:05 -0000	1.3
***************
*** 30,34 ****
  	 * @return The primary value of this Edge.
  	 */
! 	public String getValue() {
  		return getType();
  	}
--- 30,34 ----
  	 * @return The primary value of this Edge.
  	 */
! 	public String getLabel() {
  		return getType();
  	}

Index: RDFNode.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RDFNode.java	4 Oct 2004 10:21:05 -0000	1.3
--- RDFNode.java	14 Oct 2004 13:03:05 -0000	1.4
***************
*** 12,15 ****
--- 12,17 ----
  import org.mediavirus.graphl.graph.Node;
  
+ import edu.unika.aifb.rdf.api.util.RDFUtil;
+ 
  /**
   * 
***************
*** 18,25 ****
  public class RDFNode extends DefaultNode {
  
- 	protected String value;
- 	protected String id;
- 	protected String comment = null;
- 	
  	protected static int num = 0;
  	
--- 20,23 ----
***************
*** 37,41 ****
  	}
  	
! 	public RDFNode(RDFGraph graph, String id, String value) {
  		super();
  		
--- 35,39 ----
  	}
  	
! 	public RDFNode(RDFGraph graph, String id) {
  		super();
  		
***************
*** 48,61 ****
  			setId(getUniqueId());			
  		}
- 		
- 		setValue(value);
  	}
  	
! 	public String getValue() {
! 		return value;
! 	}
! 	
! 	public void setValue(String value) {
! 		this.value = value;
  	}
  	
--- 46,60 ----
  			setId(getUniqueId());			
  		}
  	}
  	
! 	// TODO (2, 2h) label generation mechanism has to be hooked up here
! 	public String getLabel() {
! 	    String label = getProperty("http://www.mediavirus.org/graphl#label");
! 	    if ( label != null) return label;
! 		else {
! 		    label = RDFUtil.guessName(getId());
! 		}
! 	    if (label != null) return label;
! 	    else return "";
  	}
  	
***************
*** 64,68 ****
  		while (edges.hasNext()) {
  			RDFEdge e = (RDFEdge)edges.next();
! 			if (e.getType() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type") return ((RDFNode)e.getTo()).getValue();
  		}
  		return null;
--- 63,67 ----
  		while (edges.hasNext()) {
  			RDFEdge e = (RDFEdge)edges.next();
! 			if (e.getType() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type") return ((RDFNode)e.getTo()).getId();
  		}
  		return null;
***************
*** 74,78 ****
  			RDFEdge e = (RDFEdge)edges.next();
  			if (e.getType() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type") {
! 			    if (((RDFNode)e.getTo()).getValue().equals(type)) return true;
  			}
  		}
--- 73,77 ----
  			RDFEdge e = (RDFEdge)edges.next();
  			if (e.getType() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type") {
! 			    if (((RDFNode)e.getTo()).getId().equals(type)) return true;
  			}
  		}

Index: RDFGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFGraph.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RDFGraph.java	4 Oct 2004 10:21:05 -0000	1.3
--- RDFGraph.java	14 Oct 2004 13:03:05 -0000	1.4
***************
*** 63,71 ****
  			//writer.writeStatement(node.getId(), "http://www.mediavirus.org/graphl#hasLabel", node.getLabel(), null, null, true);
  			//if (node.getComment() != null) writer.writeStatement(node.getId(), "http://www.mediavirus.org/graphl#hasComment", node.getComment(), null, null, true);
! 			writer.writeStatement(node.getValue(), "http://www.mediavirus.org/graphl#canvasPosition", node.getCenterX() + ":" + node.getCenterY(), null, null, true);
  			List nodeEdges = node.getEdgesFrom();
  			for (Iterator edgeIter = nodeEdges.iterator(); edgeIter.hasNext();) {
  				RDFEdge edge = (RDFEdge) edgeIter.next();
! 				writer.writeStatement(node.getValue(), edge.getType(), ((RDFNode)edge.getTo()).getValue(), null, null, false);
  			}
  		}
--- 63,71 ----
  			//writer.writeStatement(node.getId(), "http://www.mediavirus.org/graphl#hasLabel", node.getLabel(), null, null, true);
  			//if (node.getComment() != null) writer.writeStatement(node.getId(), "http://www.mediavirus.org/graphl#hasComment", node.getComment(), 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();) {
  				RDFEdge edge = (RDFEdge) edgeIter.next();
! 				writer.writeStatement(node.getId(), edge.getType(), ((RDFNode)edge.getTo()).getId(), null, null, false);
  			}
  		}
***************
*** 174,178 ****
  		RDFNode node = getNodeById(uri);
  		if (node == null){
! 			node = new RDFNode(this, uri, uri);
  			node.setCenter(400*Math.random()-200,400*Math.random()-200);
  			addElements(Collections.singleton(node), null);
--- 174,178 ----
  		RDFNode node = getNodeById(uri);
  		if (node == null){
! 			node = new RDFNode(this, uri);
  			node.setCenter(400*Math.random()-200,400*Math.random()-200);
  			addElements(Collections.singleton(node), null);