[graphl-cvs] graphl/src/org/mediavirus/graphl/view SimpleFacetRegistry.java AbstractFacet.java LabelGeneratorController.java LabelGenerator.java

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

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

Modified Files:
	SimpleFacetRegistry.java AbstractFacet.java 
Removed Files:
	LabelGeneratorController.java LabelGenerator.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: SimpleFacetRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/SimpleFacetRegistry.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SimpleFacetRegistry.java	30 Nov 2004 09:38:33 -0000	1.7
--- SimpleFacetRegistry.java	18 Dec 2005 11:11:40 -0000	1.8
***************
*** 26,38 ****
  	private NodeLayouter defaultNodeLayouter;
  	
! 	Hashtable nodePaintersForType = new Hashtable();
! 	Hashtable edgePaintersForType = new Hashtable();
! 	Hashtable edgeLayoutersForType = new Hashtable();
! 	Hashtable nodeLayoutersForType = new Hashtable();
  	
! 	Vector registeredEdgePainters = new Vector();
! 	Vector registeredNodePainters = new Vector();
! 	Vector registeredEdgeLayouters = new Vector();
! 	Vector registeredNodeLayouters = new Vector();
  	
      public SimpleFacetRegistry() {
--- 26,38 ----
  	private NodeLayouter defaultNodeLayouter;
  	
! 	Hashtable<String, NodePainter> nodePaintersForType = new Hashtable<String, NodePainter>();
! 	Hashtable<String, EdgePainter> edgePaintersForType = new Hashtable<String, EdgePainter>();
! 	Hashtable<String, EdgeLayouter> edgeLayoutersForType = new Hashtable<String, EdgeLayouter>();
! 	Hashtable<String, NodeLayouter> nodeLayoutersForType = new Hashtable<String, NodeLayouter>();
  	
! 	Vector<EdgePainter> registeredEdgePainters = new Vector<EdgePainter>();
! 	Vector<NodePainter> registeredNodePainters = new Vector<NodePainter>();
! 	Vector<EdgeLayouter> registeredEdgeLayouters = new Vector<EdgeLayouter>();
! 	Vector<NodeLayouter> registeredNodeLayouters = new Vector<NodeLayouter>();
  	
      public SimpleFacetRegistry() {

--- LabelGeneratorController.java DELETED ---

Index: AbstractFacet.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/view/AbstractFacet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AbstractFacet.java	5 Sep 2005 15:48:58 -0000	1.7
--- AbstractFacet.java	18 Dec 2005 11:11:40 -0000	1.8
***************
*** 32,36 ****
  public abstract class AbstractFacet implements Facet {
  
! 	protected List assignedElements = new ArrayList();
  
  	/*
--- 32,36 ----
  public abstract class AbstractFacet implements Facet {
  
! 	protected List<GraphElement> assignedElements = new ArrayList<GraphElement>();
  
  	/*
***************
*** 40,44 ****
  		// need to return copy, becuase elements might be unassigned by caller
  		// this triggers a ConcurrentModificationException if original set is returned
! 		return new ArrayList(assignedElements);
  	}
  
--- 40,44 ----
  		// need to return copy, becuase elements might be unassigned by caller
  		// this triggers a ConcurrentModificationException if original set is returned
! 		return new ArrayList<GraphElement>(assignedElements);
  	}
  

--- LabelGenerator.java DELETED ---