[graphl-cvs] graphl/src/org/mediavirus/graphl/view LabelGenerator.java GraphFacetRegistry.java

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

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

Modified Files:
	LabelGenerator.java GraphFacetRegistry.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: GraphFacetRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/GraphFacetRegistry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GraphFacetRegistry.java	4 Oct 2004 10:21:04 -0000	1.5
--- GraphFacetRegistry.java	14 Oct 2004 13:03:02 -0000	1.6
***************
*** 133,137 ****
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
!     						String type = classNode.getValue();
      						setPainterForNodeType(type, nodePainter);
      					}
--- 133,137 ----
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
!     						String type = classNode.getId();
      						setPainterForNodeType(type, nodePainter);
      					}
***************
*** 150,154 ****
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
!     						String type = classNode.getValue();
      						setPainterForEdgeType(type, edgePainter);
      					}
--- 150,154 ----
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
!     						String type = classNode.getId();
      						setPainterForEdgeType(type, edgePainter);
      					}
***************
*** 167,171 ****
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
!     						String type = classNode.getValue();
      						setLayouterForNodeType(type, nodeLayouter);
      					}
--- 167,171 ----
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
!     						String type = classNode.getId();
      						setLayouterForNodeType(type, nodeLayouter);
      					}
***************
*** 184,188 ****
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
!     						String type = classNode.getValue();
      						setLayouterForEdgeType(type, edgeLayouter);
      					}
--- 184,188 ----
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
!     						String type = classNode.getId();
      						setLayouterForEdgeType(type, edgeLayouter);
      					}

Index: LabelGenerator.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/LabelGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LabelGenerator.java	4 Oct 2004 10:21:04 -0000	1.6
--- LabelGenerator.java	14 Oct 2004 13:03:02 -0000	1.7
***************
*** 54,58 ****
  				break;
  			case VALUE:
! 				value = node.getValue();
  				break;
  			case PROPERTY:
--- 54,58 ----
  				break;
  			case VALUE:
! 				value = node.getId();
  				break;
  			case PROPERTY:
***************
*** 63,67 ****
  					Edge edge = (Edge) edges.next();
  					if (edge.getType().equals(data)) {
! 						value = edge.getTo().getValue();
  					}
  				}
--- 63,67 ----
  					Edge edge = (Edge) edges.next();
  					if (edge.getType().equals(data)) {
! 						value = edge.getTo().getId();
  					}
  				}
***************
*** 91,95 ****
  				break;
  			case VALUE:
! 				value = edge.getValue();
  				break;
  			case PROPERTY:
--- 91,95 ----
  				break;
  			case VALUE:
! 				value = edge.getId();
  				break;
  			case PROPERTY:
***************
*** 284,288 ****
  		}
  		
! 		while (listNode != null && !listNode.getValue().equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil")) {
  			Node labelFacetNode = listNode.getFirstNeighbour("http://www.w3.org/1999/02/22-rdf-syntax-ns#first", true);
  			if (labelFacetNode != null) {
--- 284,288 ----
  		}
  		
! 		while (listNode != null && !listNode.getId().equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil")) {
  			Node labelFacetNode = listNode.getFirstNeighbour("http://www.w3.org/1999/02/22-rdf-syntax-ns#first", true);
  			if (labelFacetNode != null) {