[graphl-cvs] graphl/src/org/mediavirus/graphl/view 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-serv26842/src/org/mediavirus/graphl/view

Modified Files:
	GraphFacetRegistry.java 
Log Message:
* registering available facets via config.rdf works
* zoom factor visible in gui
* clicking zoom label resets to 100%
* fixed some repainting/relayouting issues

Index: GraphFacetRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/GraphFacetRegistry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GraphFacetRegistry.java	21 Aug 2004 22:31:01 -0000	1.2
--- GraphFacetRegistry.java	22 Aug 2004 22:31:29 -0000	1.3
***************
*** 56,59 ****
--- 56,74 ----
  					}
  					
+ 					if (node.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodePainters",false) != null) {
+ 					    registerNodePainter(nodePainter);
+ 					}
+ 					else { // look for a parent Bag containing the NodePainters to register
+ 						Iterator neighbours = node.getEdgesTo().iterator();
+ 						while (neighbours.hasNext()) {
+                             Node n = ((Edge)neighbours.next()).getFrom();
+                             if (n.getType() != null && n.getType().equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag")) {
+     							if (n.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodePainters",false) != null) {
+     							    registerNodePainter(nodePainter);
+     							}
+                             }
+                         }
+ 					}
+ 					
  					Iterator assignedTypes = node.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator();
  					while (assignedTypes.hasNext()) {
***************
*** 70,73 ****
--- 85,103 ----
  					}
  					
+ 					if (node.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodeLayouters",false) != null) {
+ 					    registerNodeLayouter(nodeLayouter);
+ 					}
+ 					else { // look for a parent Bag containing the NodeLayouters to register
+ 						Iterator neighbours = node.getEdgesTo().iterator();
+ 						while (neighbours.hasNext()) {
+                             Node n = ((Edge)neighbours.next()).getFrom();
+                             if (n.getType() != null && n.getType().equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag")) {
+     							if (n.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodeLayouters",false) != null) {
+     							    registerNodeLayouter(nodeLayouter);
+     							}
+                             }
+                         }
+ 					}
+ 
  					Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator();
  					while (assignedTypes.hasNext()) {
***************
*** 84,87 ****
--- 114,132 ----
  					}
  					
+ 					if (node.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgePainters",false) != null) {
+ 					    registerEdgePainter(edgePainter);
+ 					}
+ 					else { // look for a parent Bag containing the edgePainters to register
+ 						Iterator neighbours = node.getEdgesTo().iterator();
+ 						while (neighbours.hasNext()) {
+                             Node n = ((Edge)neighbours.next()).getFrom();
+                             if (n.getType() != null && n.getType().equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag")) {
+     							if (n.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgePainters",false) != null) {
+     							    registerEdgePainter(edgePainter);
+     							}
+                             }
+                         }
+ 					}
+ 
  					Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator();
  					while (assignedTypes.hasNext()) {
***************
*** 98,101 ****
--- 143,161 ----
  					}
  					
+ 					if (node.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgePainters",false) != null) {
+ 					    registerEdgeLayouter(edgeLayouter);
+ 					}
+ 					else { // look for a parent Bag containing the edgeLayouters to register
+ 						Iterator neighbours = node.getEdgesTo().iterator();
+ 						while (neighbours.hasNext()) {
+                             Node n = ((Edge)neighbours.next()).getFrom();
+                             if (n.getType() != null && n.getType().equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag")) {
+     							if (n.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgeLayouters",false) != null) {
+     							    registerEdgeLayouter(edgeLayouter);
+     							}
+                             }
+                         }
+ 					}
+ 					
  					Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator();
  					while (assignedTypes.hasNext()) {