[graphl-cvs] graphl/src/org/mediavirus/graphl/interaction GraphlManipulator.java

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

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

Modified Files:
	GraphlManipulator.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: GraphlManipulator.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction/GraphlManipulator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GraphlManipulator.java	29 Dec 2004 14:31:30 -0000	1.9
--- GraphlManipulator.java	17 Aug 2005 15:52:55 -0000	1.10
***************
*** 12,15 ****
--- 12,17 ----
  import java.util.Collections;
  
+ import javax.swing.JPopupMenu;
+ 
  import org.mediavirus.graphl.GraphlPane;
  import org.mediavirus.graphl.graph.*;
***************
*** 20,26 ****
--- 22,31 ----
  import org.mediavirus.graphl.gui.NodeContextMenu;
  import org.mediavirus.graphl.gui.NodeEditingController;
+ import org.mediavirus.graphl.gui.ResourceListener;
  import org.mediavirus.graphl.gui.TextFieldInPlaceNodeEditor;
+ import org.mediavirus.graphl.gui.TypeMenu;
  import org.mediavirus.graphl.painter.ArrowEdgePainter;
  import org.mediavirus.graphl.painter.NodePainter;
+ import org.mediavirus.graphl.vocabulary.NS;
  
  /**
***************
*** 104,112 ****
      			}
      		}
!     		else if (overEdge != null) {
! 				dragEdge = (RDFEdge)overEdge;
! 				oldLength = dragEdge.getLength();
!     			e.consume();
!     		}
      		else {
      		     oldTranslation = ((GraphlPane)graphPane).getTranslation();
--- 109,117 ----
      			}
      		}
! //    		else if (overEdge != null) {
! //				dragEdge = (RDFEdge)overEdge;
! //				oldLength = dragEdge.getLength();
! //    			e.consume();
! //    		}
      		else {
      		     oldTranslation = ((GraphlPane)graphPane).getTranslation();
***************
*** 120,130 ****
      	Node clickNode = graphPane.getHoverNode();
      	Edge clickEdge = graphPane.getHoverEdge();
! 
!     	if ((e.getWhen() - lastClick) < 300) {
  			if ((clickNode == null) && (clickEdge == null)) {
! 				clickNode = graphPane.getGraph().createNode();
  				clickNode.setCenter(p.getX(), p.getY());
! 				((DefaultGraph)graphPane.getGraph()).addElements(Collections.singleton(clickNode), null); 
! 				graphPane.getGraph().notifyLayoutUpdated();
  			}
  			else if (clickNode != null) {
--- 125,149 ----
      	Node clickNode = graphPane.getHoverNode();
      	Edge clickEdge = graphPane.getHoverEdge();
!     	
!     	if (e.getClickCount() == 2) {  //(e.getWhen() - lastClick) < 300) {
  			if ((clickNode == null) && (clickEdge == null)) {
! 				final Node newNode = graphPane.getGraph().createNode();
! 				clickNode = newNode;
  				clickNode.setCenter(p.getX(), p.getY());
! 				TypeMenu nodeTypeMenu = new TypeMenu("New Node", graphPane.getVocabularies());
! 				nodeTypeMenu.updateMenu(TypeMenu.CLASSES);
! 				nodeTypeMenu.addResourceListener(new ResourceListener() {
! 					public void resourceChanged(String resource) {
! 						newNode.setType(resource);
! 						graphPane.getGraph().notifyPropertyChanged();
! 				        graphPane.repaint();
! 					}
! 				});
! 				
! 				JPopupMenu menu = new JPopupMenu();
! 				menu.add(nodeTypeMenu);
! 				menu.show(graphPane, e.getX(), e.getY());
! 
! 				//graphPane.getGraph().notifyLayoutUpdated();
  			}
  			else if (clickNode != null) {
***************
*** 243,257 ****
      		graphPane.getGraph().notifyLayoutUpdated();
          }
! 		else if (dragEdge != null) {
! 			int delta = (int)(mousePos.getY() - dragStart.getY());
! 			// TODO (2) setLength is not in Edge interface! -> Edge Manipulators
! 			if (oldLength-delta > 2)
! 				((DefaultEdge)dragEdge).setLength(oldLength-delta);
! 			else
! 				((DefaultEdge)dragEdge).setLength(2);
! 			graphPane.repaint();
! 			e.consume();
! 			graphPane.getGraph().notifyLayoutUpdated();
! 		}
  		else if (edgeNode != null) {
  			graphPane.repaint();
--- 262,276 ----
      		graphPane.getGraph().notifyLayoutUpdated();
          }
! //		else if (dragEdge != null) {
! //			int delta = (int)(mousePos.getY() - dragStart.getY());
! //			// TODO (2) setLength is not in Edge interface! -> Edge Manipulators
! //			if (oldLength-delta > 2)
! //				((DefaultEdge)dragEdge).setLength(oldLength-delta);
! //			else
! //				((DefaultEdge)dragEdge).setLength(2);
! //			graphPane.repaint();
! //			e.consume();
! //			graphPane.getGraph().notifyLayoutUpdated();
! //		}
  		else if (edgeNode != null) {
  			graphPane.repaint();
***************
*** 306,310 ****
  	public boolean editingFinished(Node node, Object value) {
  		if (!((String)value).equals("")) {
! 			((RDFNode)node).setProperty("http://www.mediavirus.org/graphl#label",(String)value);
  		} 
  		return true;
--- 325,329 ----
  	public boolean editingFinished(Node node, Object value) {
  		if (!((String)value).equals("")) {
! 			((RDFNode)node).setProperty(NS.graphl + "label",(String)value);
  		} 
  		return true;