[graphl-cvs] graphl/src/org/mediavirus/graphl/view SimpleFacetRegistry.java AbstractFacet.java Facet.java GraphFacetRegistry.java

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

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

Modified Files:
	SimpleFacetRegistry.java AbstractFacet.java Facet.java 
	GraphFacetRegistry.java 
Log Message:
a lot of changes done a long time ago... changelog has to be updated another time :(

Index: SimpleFacetRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/SimpleFacetRegistry.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SimpleFacetRegistry.java	18 Dec 2005 11:11:40 -0000	1.8
--- SimpleFacetRegistry.java	8 Jun 2006 13:14:59 -0000	1.9
***************
*** 482,490 ****
  	
  	public void updateFacets(Graph graph) {
! 	    for (Iterator nodes = graph.getNodes().iterator(); nodes.hasNext();) {
!             updateNodeFacets((Node)nodes.next());            
          }
! 	    for (Iterator edges = graph.getEdges().iterator(); edges.hasNext();) {
!             updateEdgeFacets((Edge)edges.next());            
          }
  	}
--- 482,499 ----
  	
  	public void updateFacets(Graph graph) {
!         //System.out.println("updateFacets() called");
! 	    for (Iterator<Node> nodes = graph.getNodes().iterator(); nodes.hasNext();) {
!             Node node = nodes.next();
!             updateNodeFacets(node);
!             //TODO this is a hack - either find some way to iterate over all active facets, or implement this via nodeListeners
!             if (node.getCurrentLayouter() != null) node.getCurrentLayouter().refresh();
!             if (node.getCurrentPainter() != null) node.getCurrentPainter().refresh();
          }
! 	    for (Iterator<Edge> edges = graph.getEdges().iterator(); edges.hasNext();) {
!             Edge edge = edges.next();
!             updateEdgeFacets(edge);
!             //TODO this is a hack - either find some way to iterate over all active facets, or implement this via nodeListeners
!             if (edge.getCurrentLayouter() != null) edge.getCurrentLayouter().refresh();
!             if (edge.getCurrentPainter() != null) edge.getCurrentPainter().refresh();
          }
  	}

Index: Facet.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/Facet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Facet.java	30 Nov 2004 09:38:33 -0000	1.5
--- Facet.java	8 Jun 2006 13:14:59 -0000	1.6
***************
*** 84,86 ****
--- 84,92 ----
      public void setConfigurationNode(Node node);
      
+     /**
+      * Facets may create internal caches for properties of GraphElements. If the graph
+      * changes, this method is called to reset the caches.
+      *
+      */
+     public void refresh();
  }
\ No newline at end of file

Index: GraphFacetRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/GraphFacetRegistry.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GraphFacetRegistry.java	17 Aug 2005 15:52:50 -0000	1.8
--- GraphFacetRegistry.java	8 Jun 2006 13:14:59 -0000	1.9
***************
*** 50,54 ****
  	    clearRegistry();
  	    if (registryNode != null) { // TODO (3) && graph.containsNode(registryNode)
! 	        for (Iterator baseNodes = registryNode.getNeighbours(NS.graphl + "basedOn",true).iterator(); baseNodes.hasNext();) {
  	            Node baseNode = (Node) baseNodes.next();
  	    	    processRegistryNode(baseNode);
--- 50,54 ----
  	    clearRegistry();
  	    if (registryNode != null) { // TODO (3) && graph.containsNode(registryNode)
! 	        for (Iterator baseNodes = registryNode.getNeighbours(NS.graphl + "basedOn",Node.FORWARD).iterator(); baseNodes.hasNext();) {
  	            Node baseNode = (Node) baseNodes.next();
  	    	    processRegistryNode(baseNode);
***************
*** 62,66 ****
  	        if (!registryNode.hasType(NS.graphl + "Configuration")) return;
  	        
! 	        Node node = registryNode.getFirstNeighbour(NS.graphl + "defaultNodePainter",true);
  	        if (node != null && node.hasType(NS.graphl + "NodePainter")) {
  				NodePainter nodePainter = (NodePainter)createFacetInstance(node);
--- 62,66 ----
  	        if (!registryNode.hasType(NS.graphl + "Configuration")) return;
  	        
! 	        Node node = registryNode.getFirstNeighbour(NS.graphl + "defaultNodePainter",Node.FORWARD);
  	        if (node != null && node.hasType(NS.graphl + "NodePainter")) {
  				NodePainter nodePainter = (NodePainter)createFacetInstance(node);
***************
*** 68,72 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "defaultEdgePainter",true);
  	        if (node != null && node.hasType(NS.graphl + "EdgePainter")) {
  	            EdgePainter edgePainter = (EdgePainter)createFacetInstance(node);
--- 68,72 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "defaultEdgePainter",Node.FORWARD);
  	        if (node != null && node.hasType(NS.graphl + "EdgePainter")) {
  	            EdgePainter edgePainter = (EdgePainter)createFacetInstance(node);
***************
*** 74,78 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "defaultNodeLayouter",true);
  	        if (node != null && node.hasType(NS.graphl + "NodeLayouter")) {
  	            NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(node);
--- 74,78 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "defaultNodeLayouter",Node.FORWARD);
  	        if (node != null && node.hasType(NS.graphl + "NodeLayouter")) {
  	            NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(node);
***************
*** 80,84 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "defaultEdgeLayouter",true);
  	        if (node != null && node.hasType(NS.graphl + "EdgeLayouter")) {
  	            EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(node);
--- 80,84 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "defaultEdgeLayouter",Node.FORWARD);
  	        if (node != null && node.hasType(NS.graphl + "EdgeLayouter")) {
  	            EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(node);
***************
*** 86,90 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableNodePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
--- 86,90 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableNodePainters",Node.FORWARD);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
***************
*** 98,102 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableEdgePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
--- 98,102 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableEdgePainters",Node.FORWARD);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
***************
*** 110,114 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableNodeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
--- 110,114 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableNodeLayouters",Node.FORWARD);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
***************
*** 122,126 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableEdgeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
--- 122,126 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableEdgeLayouters",Node.FORWARD);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
***************
*** 134,138 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedNodePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
--- 134,138 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedNodePainters",Node.FORWARD);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
***************
*** 141,145 ****
                      if (n.hasType(NS.graphl + "NodePainter")) {
          				NodePainter nodePainter = (NodePainter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", true).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
--- 141,145 ----
                      if (n.hasType(NS.graphl + "NodePainter")) {
          				NodePainter nodePainter = (NodePainter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", Node.FORWARD).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
***************
*** 151,155 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedEdgePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
--- 151,155 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedEdgePainters",Node.FORWARD);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
***************
*** 158,162 ****
                      if (n.hasType(NS.graphl + "EdgePainter")) {
                          EdgePainter edgePainter = (EdgePainter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", true).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
--- 158,162 ----
                      if (n.hasType(NS.graphl + "EdgePainter")) {
                          EdgePainter edgePainter = (EdgePainter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", Node.FORWARD).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
***************
*** 168,172 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedNodeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
--- 168,172 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedNodeLayouters",Node.FORWARD);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
***************
*** 175,179 ****
                      if (n.hasType(NS.graphl + "NodeLayouter")) {
                          NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", true).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
--- 175,179 ----
                      if (n.hasType(NS.graphl + "NodeLayouter")) {
                          NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", Node.FORWARD).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
***************
*** 185,189 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedEdgeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
--- 185,189 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedEdgeLayouters",Node.FORWARD);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
***************
*** 192,196 ****
                      if (n.hasType(NS.graphl + "EdgeLayouter")) {
                          EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", true).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
--- 192,196 ----
                      if (n.hasType(NS.graphl + "EdgeLayouter")) {
                          EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours(NS.graphl + "assignedToType", Node.FORWARD).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();

Index: AbstractFacet.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/AbstractFacet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractFacet.java	18 Dec 2005 11:11:40 -0000	1.8
--- AbstractFacet.java	8 Jun 2006 13:14:59 -0000	1.9
***************
*** 95,98 ****
--- 95,102 ----
          return sheet;
      }
+     
+     public void refresh() {
+     }
+ 
  
  }