[graphl-cvs] graphl/src/org/mediavirus/graphl/gui NodeContextMenu.java EdgeContextMenu.java TypeMenu.java

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

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

Modified Files:
	NodeContextMenu.java EdgeContextMenu.java TypeMenu.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: EdgeContextMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/EdgeContextMenu.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** EdgeContextMenu.java	5 Sep 2005 15:47:18 -0000	1.18
--- EdgeContextMenu.java	18 Dec 2005 11:11:40 -0000	1.19
***************
*** 17,20 ****
--- 17,21 ----
  
  import org.mediavirus.graphl.GraphlPane;
+ import org.mediavirus.graphl.GraphlRegistry;
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.layout.EdgeLayouter;
***************
*** 154,158 ****
          typeSubMenu.addSeparator();
  
!         Enumeration vocabs = graphlPane.getVocabularyRegistry().getRegisteredVocabularies();
          while (vocabs.hasMoreElements()) {
              Vocabulary vocab = (Vocabulary) vocabs.nextElement();
--- 155,159 ----
          typeSubMenu.addSeparator();
  
!         Enumeration vocabs = GraphlRegistry.instance().getVocabularyRegistry().getRegisteredVocabularies();
          while (vocabs.hasMoreElements()) {
              Vocabulary vocab = (Vocabulary) vocabs.nextElement();

Index: NodeContextMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/NodeContextMenu.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** NodeContextMenu.java	5 Sep 2005 15:47:18 -0000	1.19
--- NodeContextMenu.java	18 Dec 2005 11:11:40 -0000	1.20
***************
*** 17,20 ****
--- 17,21 ----
  
  import org.mediavirus.graphl.GraphlPane;
+ import org.mediavirus.graphl.GraphlRegistry;
  import org.mediavirus.graphl.graph.Node;
  import org.mediavirus.graphl.layout.NodeLayouter;
***************
*** 158,162 ****
          typeSubMenu.addSeparator();
  
!         Enumeration vocabs = graphlPane.getVocabularyRegistry().getRegisteredVocabularies();
          while (vocabs.hasMoreElements()) {
              Vocabulary vocab = (Vocabulary) vocabs.nextElement();
--- 159,163 ----
          typeSubMenu.addSeparator();
  
!         Enumeration vocabs = GraphlRegistry.instance().getVocabularyRegistry().getRegisteredVocabularies();
          while (vocabs.hasMoreElements()) {
              Vocabulary vocab = (Vocabulary) vocabs.nextElement();

Index: TypeMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/TypeMenu.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TypeMenu.java	17 Aug 2005 15:52:55 -0000	1.3
--- TypeMenu.java	18 Dec 2005 11:11:40 -0000	1.4
***************
*** 25,29 ****
  	String currentType = null;
  	
! 	ArrayList listeners = new ArrayList();
  
  	public TypeMenu() {
--- 25,29 ----
  	String currentType = null;
  	
! 	ArrayList<ResourceListener> listeners = new ArrayList<ResourceListener>();
  
  	public TypeMenu() {