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

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

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

Modified Files:
	LabelGenerator.java GraphFacetRegistry.java 
Log Message:
- FEATURE: added navigator thread for update-exhibition, disabled in normal operation
- FEATURE: started implementation of filtering architecture
- FEATURE: creating new node opens type context menu
- CODE: added NS calss for easier namespace referencing in code


Index: GraphFacetRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/GraphFacetRegistry.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GraphFacetRegistry.java	30 Nov 2004 09:38:33 -0000	1.7
--- GraphFacetRegistry.java	17 Aug 2005 15:52:50 -0000	1.8
***************
*** 16,19 ****
--- 16,20 ----
  import org.mediavirus.graphl.painter.EdgePainter;
  import org.mediavirus.graphl.painter.NodePainter;
+ import org.mediavirus.graphl.vocabulary.NS;
  
  /**
***************
*** 49,53 ****
  	    clearRegistry();
  	    if (registryNode != null) { // TODO (3) && graph.containsNode(registryNode)
! 	        for (Iterator baseNodes = registryNode.getNeighbours("http://www.mediavirus.org/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",true).iterator(); baseNodes.hasNext();) {
  	            Node baseNode = (Node) baseNodes.next();
  	    	    processRegistryNode(baseNode);
***************
*** 59,94 ****
  	private void processRegistryNode(Node registryNode) {
  	    if (registryNode != null) { 
! 	        if (!registryNode.hasType("http://www.mediavirus.org/graphl#Configuration")) return;
  	        
! 	        Node node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#defaultNodePainter",true);
! 	        if (node != null && node.hasType("http://www.mediavirus.org/graphl#NodePainter")) {
  				NodePainter nodePainter = (NodePainter)createFacetInstance(node);
  				setDefaultNodePainter(nodePainter);
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#defaultEdgePainter",true);
! 	        if (node != null && node.hasType("http://www.mediavirus.org/graphl#EdgePainter")) {
  	            EdgePainter edgePainter = (EdgePainter)createFacetInstance(node);
  				setDefaultEdgePainter(edgePainter);
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#defaultNodeLayouter",true);
! 	        if (node != null && node.hasType("http://www.mediavirus.org/graphl#NodeLayouter")) {
  	            NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(node);
  				setDefaultNodeLayouter(nodeLayouter);
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#defaultEdgeLayouter",true);
! 	        if (node != null && node.hasType("http://www.mediavirus.org/graphl#EdgeLayouter")) {
  	            EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(node);
  				setDefaultEdgeLayouter(edgeLayouter);
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType("http://www.mediavirus.org/graphl#NodePainter")) {
          				NodePainter nodePainter = (NodePainter)createFacetInstance(n);
  						registerNodePainter(nodePainter);
--- 60,95 ----
  	private void processRegistryNode(Node registryNode) {
  	    if (registryNode != null) { 
! 	        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);
  				setDefaultNodePainter(nodePainter);
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "defaultEdgePainter",true);
! 	        if (node != null && node.hasType(NS.graphl + "EdgePainter")) {
  	            EdgePainter edgePainter = (EdgePainter)createFacetInstance(node);
  				setDefaultEdgePainter(edgePainter);
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "defaultNodeLayouter",true);
! 	        if (node != null && node.hasType(NS.graphl + "NodeLayouter")) {
  	            NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(node);
  				setDefaultNodeLayouter(nodeLayouter);
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "defaultEdgeLayouter",true);
! 	        if (node != null && node.hasType(NS.graphl + "EdgeLayouter")) {
  	            EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(node);
  				setDefaultEdgeLayouter(edgeLayouter);
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableNodePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType(NS.graphl + "NodePainter")) {
          				NodePainter nodePainter = (NodePainter)createFacetInstance(n);
  						registerNodePainter(nodePainter);
***************
*** 97,106 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType("http://www.mediavirus.org/graphl#EdgePainter")) {
                          EdgePainter edgePainter = (EdgePainter)createFacetInstance(n);
  						registerEdgePainter(edgePainter);
--- 98,107 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableEdgePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType(NS.graphl + "EdgePainter")) {
                          EdgePainter edgePainter = (EdgePainter)createFacetInstance(n);
  						registerEdgePainter(edgePainter);
***************
*** 109,118 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#availableNodeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType("http://www.mediavirus.org/graphl#NodeLayouter")) {
                          NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(n);
  						registerNodeLayouter(nodeLayouter);
--- 110,119 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableNodeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType(NS.graphl + "NodeLayouter")) {
                          NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(n);
  						registerNodeLayouter(nodeLayouter);
***************
*** 121,130 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#availableEdgeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType("http://www.mediavirus.org/graphl#EdgeLayouter")) {
                          EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(n);
  						registerEdgeLayouter(edgeLayouter);
--- 122,131 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "availableEdgeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType(NS.graphl + "EdgeLayouter")) {
                          EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(n);
  						registerEdgeLayouter(edgeLayouter);
***************
*** 133,144 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#assignedNodePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType("http://www.mediavirus.org/graphl#NodePainter")) {
          				NodePainter nodePainter = (NodePainter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
--- 134,145 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedNodePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     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();
***************
*** 150,161 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#assignedEdgePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType("http://www.mediavirus.org/graphl#EdgePainter")) {
                          EdgePainter edgePainter = (EdgePainter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
--- 151,162 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedEdgePainters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     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();
***************
*** 167,178 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#assignedNodeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType("http://www.mediavirus.org/graphl#NodeLayouter")) {
                          NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
--- 168,179 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedNodeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     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();
***************
*** 184,195 ****
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour("http://www.mediavirus.org/graphl#assignedEdgeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     if (n.hasType("http://www.mediavirus.org/graphl#EdgeLayouter")) {
                          EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(n);
!     					Iterator assignedTypes = n.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator();
      					while (assignedTypes.hasNext()) {
      						Node classNode = (Node)assignedTypes.next();
--- 185,196 ----
  	        }
  	        
! 	        node = registryNode.getFirstNeighbour(NS.graphl + "assignedEdgeLayouters",true);
  	        if (node != null) {
  				Iterator painters = node.getEdgesFrom().iterator();
  				while (painters.hasNext()) {
                      Node n = ((Edge)painters.next()).getTo();
!                     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();
***************
*** 219,223 ****
  	
  	private Facet createFacetInstance(Node facetNode) {
! 		String type = facetNode.getProperty("http://www.mediavirus.org/graphl#javaClass");
  		try {
  			if (type != null) {
--- 220,224 ----
  	
  	private Facet createFacetInstance(Node facetNode) {
! 		String type = facetNode.getProperty(NS.graphl + "javaClass");
  		try {
  			if (type != null) {

Index: LabelGenerator.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/LabelGenerator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LabelGenerator.java	21 Oct 2004 16:00:46 -0000	1.9
--- LabelGenerator.java	17 Aug 2005 15:52:50 -0000	1.10
***************
*** 12,15 ****
--- 12,16 ----
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Node;
+ import org.mediavirus.graphl.vocabulary.NS;
  import org.mediavirus.util.ParseUtils;
  
***************
*** 278,282 ****
  		Node listNode = null;
  		
! 		listNode = node.getFirstNeighbour("http://www.mediavirus.org/graphl#labelFacets", true);
  		if (listNode != null) {
  			facets.clear();
--- 279,283 ----
  		Node listNode = null;
  		
! 		listNode = node.getFirstNeighbour(NS.graphl + "labelFacets", true);
  		if (listNode != null) {
  			facets.clear();
***************
*** 286,292 ****
  			Node labelFacetNode = listNode.getFirstNeighbour("http://www.w3.org/1999/02/22-rdf-syntax-ns#first", true);
  			if (labelFacetNode != null) {
! 				String data = labelFacetNode.getProperty("http://www.mediavirus.org/graphl#labelFacetValue");
  				int type = STRING;
! 				String str = labelFacetNode.getProperty("http://www.mediavirus.org/graphl#labelFacetType");
  				if (str != null) {
  					if (str.equalsIgnoreCase("value")) {
--- 287,293 ----
  			Node labelFacetNode = listNode.getFirstNeighbour("http://www.w3.org/1999/02/22-rdf-syntax-ns#first", true);
  			if (labelFacetNode != null) {
! 				String data = labelFacetNode.getProperty(NS.graphl + "labelFacetValue");
  				int type = STRING;
! 				String str = labelFacetNode.getProperty(NS.graphl + "labelFacetType");
  				if (str != null) {
  					if (str.equalsIgnoreCase("value")) {
***************
*** 304,308 ****
  				}
  				boolean guessName = false;
! 				str = labelFacetNode.getProperty("http://www.mediavirus.org/graphl#guessName");
  				if (str != null && str.equalsIgnoreCase("true")) guessName = true;
  				LabelFacet labelFacet = new LabelFacet(type,data,guessName);
--- 305,309 ----
  				}
  				boolean guessName = false;
! 				str = labelFacetNode.getProperty(NS.graphl + "guessName");
  				if (str != null && str.equalsIgnoreCase("true")) guessName = true;
  				LabelFacet labelFacet = new LabelFacet(type,data,guessName);