[graphl-cvs] graphl/src/org/mediavirus/graphl GraphlApplication.java GraphlPane.java GraphlApplet.java

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

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

Modified Files:
	GraphlApplication.java GraphlPane.java GraphlApplet.java 
Log Message:
- migrated from jxpath to jaxen, which gives a much cleaner implementation of custom axes


Index: GraphlApplet.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlApplet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** GraphlApplet.java	8 Jun 2006 13:14:58 -0000	1.14
--- GraphlApplet.java	30 Jun 2006 14:31:37 -0000	1.15
***************
*** 25,34 ****
  import javax.swing.JRadioButtonMenuItem;
  
- import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
  import org.mediavirus.graphl.graph.Graph;
  import org.mediavirus.graphl.graph.Node;
  import org.mediavirus.graphl.graph.filter.SourceFilter;
  import org.mediavirus.graphl.graph.rdf.RDFGraph;
- import org.mediavirus.graphl.jxpath.JXPathFactory;
  import org.mediavirus.graphl.vocabulary.NS;
  
--- 25,32 ----
***************
*** 49,53 ****
      public GraphlApplet() {
      	
!         JXPathContextReferenceImpl.addNodePointerFactory(new JXPathFactory());
          
          this.getContentPane().setLayout(new BorderLayout());
--- 47,51 ----
      public GraphlApplet() {
      	
!         //JXPathContextReferenceImpl.addNodePointerFactory(new JXPathFactory());
          
          this.getContentPane().setLayout(new BorderLayout());

Index: GraphlApplication.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlApplication.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** GraphlApplication.java	8 Jun 2006 13:14:58 -0000	1.24
--- GraphlApplication.java	30 Jun 2006 14:31:37 -0000	1.25
***************
*** 32,36 ****
  import javax.swing.KeyStroke;
  
- import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
  import org.mediavirus.graphl.graph.Graph;
  import org.mediavirus.graphl.graph.Node;
--- 32,35 ----
***************
*** 40,44 ****
  import org.mediavirus.graphl.gui.GenericDialog;
  import org.mediavirus.graphl.gui.OpenURLPanel;
- import org.mediavirus.graphl.jxpath.JXPathFactory;
  import org.mediavirus.graphl.painter.NodePainter;
  import org.mediavirus.graphl.vocabulary.NS;
--- 39,42 ----
***************
*** 487,491 ****
      	System.setProperty("swing.metalTheme", "steel");
          
!         JXPathContextReferenceImpl.addNodePointerFactory(new JXPathFactory());
          
  		GraphlApplication app = new GraphlApplication();
--- 485,489 ----
      	System.setProperty("swing.metalTheme", "steel");
          
!         //JXPathContextReferenceImpl.addNodePointerFactory(new JXPathFactory());
          
  		GraphlApplication app = new GraphlApplication();

Index: GraphlPane.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlPane.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** GraphlPane.java	8 Jun 2006 13:14:58 -0000	1.24
--- GraphlPane.java	30 Jun 2006 14:31:37 -0000	1.25
***************
*** 206,210 ****
  	//	}
  
! 		if (filteredGraph!=null)
              synchronized (filteredGraph) {
                  // this is the main rendering loop
--- 206,210 ----
  	//	}
  
! 		if (filteredGraph!=null) {
              synchronized (filteredGraph) {
                  // this is the main rendering loop
***************
*** 251,254 ****
--- 251,255 ----
                  //if (renderDuration > 0) System.out.println("render time: " + renderDuration + " FPS: " + 1000.0/renderDuration);
              }
+         }
  		g2.setTransform(oldTrans);
  	}
***************
*** 949,953 ****
              Node node = nodesI.next();
              if (node.getCurrentPainter() != null) {
!                 String label = node.getCurrentPainter().getLabel(node);
                  if (label != null && label.startsWith(input)) {
                      matchingNodes.add(node);
--- 950,954 ----
              Node node = nodesI.next();
              if (node.getCurrentPainter() != null) {
!                 String label = node.getCurrentPainter().getStringProperty(NS.graphl + "label", node);
                  if (label != null && label.startsWith(input)) {
                      matchingNodes.add(node);