[graphl-cvs] graphl/src/org/mediavirus/graphl/view FacetRegistry.java SimpleFacetRegistry.java GraphFacetRegistry.java JGraphPane.java

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

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

Modified Files:
	FacetRegistry.java SimpleFacetRegistry.java 
	GraphFacetRegistry.java 
Removed Files:
	JGraphPane.java 
Log Message:
* added martin klinke's contributions (File>New and mousewheel zooming)
* implemented facet configuration from rdf config file
* added configuration data to config.rdf
* removed historic JGraphPane, merged with GraphlPane
* factored out vocabulary registry mechanism from GraphlPane

Index: SimpleFacetRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/SimpleFacetRegistry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleFacetRegistry.java	20 Aug 2004 12:38:52 -0000	1.2
--- SimpleFacetRegistry.java	21 Aug 2004 22:31:01 -0000	1.3
***************
*** 409,411 ****
--- 409,465 ----
  		}
  	}
+ 
+ 	/*
+ 	 * Overrides @see org.mediavirus.graphl.view.FacetRegistry#updateEdgeFacets(org.mediavirus.graphl.graph.Edge)
+ 	 */
+ 	public void updateEdgeFacets(Edge edge) {
+         if (edge.getType() != null) {
+         	EdgeLayouter l = getEdgeLayouterForType(edge.getType());
+         	if ( l != null) {
+         		edge.setCurrentLayouter(l);
+         	}
+         	else {
+         		edge.setCurrentLayouter(getDefaultEdgeLayouter());
+         	}
+         	
+         	EdgePainter p = getEdgePainterForType(edge.getType());
+         	if ( p != null) {
+         		edge.setCurrentPainter(p);
+         	}
+         	else {
+         		edge.setCurrentPainter(getDefaultEdgePainter());
+         	}
+         }
+         else {
+             edge.setCurrentPainter(getDefaultEdgePainter());
+             edge.setCurrentLayouter(getDefaultEdgeLayouter());
+         }
+ 	}
+ 
+ 	/*
+ 	 * Overrides @see org.mediavirus.graphl.view.FacetRegistry#updateNodeFacets(org.mediavirus.graphl.graph.Node)
+ 	 */
+ 	public void updateNodeFacets(Node node) {
+         if (node.getType() != null) {
+         	NodeLayouter l = getNodeLayouterForType(node.getType());
+         	if ( l != null) {
+         		node.setCurrentLayouter(l);
+         	}
+         	else {
+         		node.setCurrentLayouter(getDefaultNodeLayouter());
+         	}
+         	
+         	NodePainter p = getNodePainterForType(node.getType());
+         	if ( p != null) {
+         		node.setCurrentPainter(p);
+         	}
+         	else {
+         		node.setCurrentPainter(getDefaultNodePainter());
+         	}
+         }
+         else {
+         	node.setCurrentPainter(getDefaultNodePainter());
+         	node.setCurrentLayouter(getDefaultNodeLayouter());
+         }
+ 	}
  }

--- JGraphPane.java DELETED ---

Index: FacetRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/FacetRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FacetRegistry.java	2 Aug 2004 12:36:31 -0000	1.1
--- FacetRegistry.java	21 Aug 2004 22:31:01 -0000	1.2
***************
*** 98,101 ****
--- 98,111 ----
      public NodeLayouter getNodeLayouterForType(String type);
  
+ 	/**
+ 	 * @param edge
+ 	 */
+ 	public void updateEdgeFacets(Edge edge);
+ 
+ 	/**
+ 	 * 
+ 	 */
+ 	public void updateNodeFacets(Node node);
+ 
  //	public NodeLayouter getNodeLayouter(Node node);
      

Index: GraphFacetRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/GraphFacetRegistry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GraphFacetRegistry.java	20 Aug 2004 12:38:52 -0000	1.1
--- GraphFacetRegistry.java	21 Aug 2004 22:31:01 -0000	1.2
***************
*** 8,11 ****
--- 8,12 ----
  import java.util.Iterator;
  
+ import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Graph;
  import org.mediavirus.graphl.graph.GraphListener;
***************
*** 46,66 ****
  		while (nodes.hasNext()) {
  			Node node = (Node) nodes.next();
! 			if (node.getType().equals("http://www.mediavirus.org/graphl#NodePainter")) {
! 				NodePainter nodePainter = (NodePainter)getFacetInstance(node);
! 				
! 			}
! 			else if (node.getType().equals("http://www.mediavirus.org/graphl#NodeLayouter")) {
! 				NodeLayouter nodeLayouter = (NodeLayouter)getFacetInstance(node);
! 			}
! 			else if (node.getType().equals("http://www.mediavirus.org/graphl#EdgePainter")) {
! 				EdgePainter edgePainter = (EdgePainter)getFacetInstance(node);
! 			}
! 			else if (node.getType().equals("http://www.mediavirus.org/graphl#EdgeLayouter")) {
! 				EdgeLayouter edgeLayouter = (EdgeLayouter)getFacetInstance(node);
  			}
  		}
  	}
  	
! 	private Facet getFacetInstance(Node facetNode) {
  		String type = facetNode.getProperty("http://www.mediavirus.org/graphl#javaClass");
  		try {
--- 47,113 ----
  		while (nodes.hasNext()) {
  			Node node = (Node) nodes.next();
! 			if (node.getType() != null) {
! 				if (node.getType().equals("http://www.mediavirus.org/graphl#NodePainter")) {
! 					
! 					NodePainter nodePainter = (NodePainter)createFacetInstance(node);
! 					
! 					if (!node.getEdgesTo("http://www.mediavirus.org/graphl#defaultNodePainter").isEmpty()){
! 						setDefaultNodePainter(nodePainter);
! 					}
! 					
! 					Iterator assignedTypes = node.getNeighbours("http://www.mediavirus.org/graphl#assignedToType", true).iterator();
! 					while (assignedTypes.hasNext()) {
! 						Node classNode = (Node)assignedTypes.next();
! 						String type = classNode.getValue();
! 						setPainterForNodeType(type, nodePainter);
! 					}
! 				}
! 				else if (node.getType().equals("http://www.mediavirus.org/graphl#NodeLayouter")) {
! 					NodeLayouter nodeLayouter = (NodeLayouter)createFacetInstance(node);
! 					
! 					if (!node.getEdgesTo("http://www.mediavirus.org/graphl#defaultNodeLayouter").isEmpty()){
! 						setDefaultNodeLayouter(nodeLayouter);
! 					}
! 					
! 					Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator();
! 					while (assignedTypes.hasNext()) {
! 						Node classNode = ((Edge)assignedTypes.next()).getTo();
! 						String type = classNode.getValue();
! 						setLayouterForNodeType(type, nodeLayouter);
! 					}
! 				}
! 				else if (node.getType().equals("http://www.mediavirus.org/graphl#EdgePainter")) {
! 					EdgePainter edgePainter = (EdgePainter)createFacetInstance(node);
! 					
! 					if (!node.getEdgesTo("http://www.mediavirus.org/graphl#defaultEdgePainter").isEmpty()){
! 						setDefaultEdgePainter(edgePainter);
! 					}
! 					
! 					Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator();
! 					while (assignedTypes.hasNext()) {
! 						Node classNode = ((Edge)assignedTypes.next()).getTo();
! 						String type = classNode.getValue();
! 						setPainterForEdgeType(type, edgePainter);
! 					}
! 				}
! 				else if (node.getType().equals("http://www.mediavirus.org/graphl#EdgeLayouter")) {
! 					EdgeLayouter edgeLayouter = (EdgeLayouter)createFacetInstance(node);
! 					
! 					if (!node.getEdgesTo("http://www.mediavirus.org/graphl#defaultEdgeLayouter").isEmpty()){
! 						setDefaultEdgeLayouter(edgeLayouter);
! 					}
! 					
! 					Iterator assignedTypes = node.getEdgesFrom("http://www.mediavirus.org/graphl#assignedToType").iterator();
! 					while (assignedTypes.hasNext()) {
! 						Node classNode = ((Edge)assignedTypes.next()).getTo();
! 						String type = classNode.getValue();
! 						setLayouterForEdgeType(type, edgeLayouter);
! 					}
! 				}
  			}
  		}
  	}
  	
! 	private Facet createFacetInstance(Node facetNode) {
  		String type = facetNode.getProperty("http://www.mediavirus.org/graphl#javaClass");
  		try {