[graphl-cvs] graphl/src/org/mediavirus/graphl/gui GraphContextMenu.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-serv16461/src/org/mediavirus/graphl/gui

Modified Files:
	GraphContextMenu.java TypeMenu.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: GraphContextMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/GraphContextMenu.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GraphContextMenu.java	29 Dec 2004 14:31:29 -0000	1.2
--- GraphContextMenu.java	17 Aug 2005 15:52:55 -0000	1.3
***************
*** 17,20 ****
--- 17,21 ----
  import org.mediavirus.graphl.graph.Graph;
  import org.mediavirus.graphl.graph.Node;
+ import org.mediavirus.graphl.vocabulary.NS;
  
  /**
***************
*** 51,61 ****
  		for (Iterator settings = graphlPane.getConfigurations().iterator(); settings.hasNext();) {
              Node node = (Node) settings.next();
!     		JRadioButtonMenuItem item = new JRadioButtonMenuItem(node.getProperty("http://www.mediavirus.org/graphl#name","<unnamed>"));
!             item.addActionListener(new SettingsAdapter(node));
!             configMenu.add(item);
!             settingsGroup.add(item);
!             if (node.getProperty("http://www.mediavirus.org/graphl#active","").equalsIgnoreCase("true")) {
!             	selectedItem = item;
!             }            
          }
  
--- 52,64 ----
  		for (Iterator settings = graphlPane.getConfigurations().iterator(); settings.hasNext();) {
              Node node = (Node) settings.next();
!     		if (! node.getProperty(NS.graphl + "public","true").equalsIgnoreCase("false")){
! 	    		JRadioButtonMenuItem item = new JRadioButtonMenuItem(node.getProperty(NS.graphl + "name","<unnamed>"));
! 	            item.addActionListener(new SettingsAdapter(node));
! 	            configMenu.add(item);
! 	            settingsGroup.add(item);
! 	            if (node.getProperty(NS.graphl + "active","").equalsIgnoreCase("true")) {
! 	            	selectedItem = item;
! 	            }  
!     		}
          }
  

Index: TypeMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/TypeMenu.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TypeMenu.java	11 Jan 2005 13:26:42 -0000	1.2
--- TypeMenu.java	17 Aug 2005 15:52:55 -0000	1.3
***************
*** 13,16 ****
--- 13,17 ----
  
  import org.mediavirus.graphl.graph.Node;
+ import org.mediavirus.graphl.vocabulary.NS;
  import org.mediavirus.graphl.vocabulary.ResourceActionListener;
  
***************
*** 20,24 ****
  public class TypeMenu extends JMenu implements ResourceListener{
  	
! 	static final int CLASSES = 1, PROPERTIES = 2, ALL = 3;
  	Node types = null;
  	String currentType = null;
--- 21,25 ----
  public class TypeMenu extends JMenu implements ResourceListener{
  	
! 	public static final int CLASSES = 1, PROPERTIES = 2, ALL = 3;
  	Node types = null;
  	String currentType = null;
***************
*** 56,67 ****
  	 */
  	protected void addItem(Node node, int which, boolean deep) {
! 		List items = node.getNeighbours("http://www.mediavirus.org/graphl#contains", true);
  		
  		for (Iterator iter = items.iterator(); iter.hasNext();) {
  			Node item = (Node) iter.next();
! 			if (item.hasType("http://www.mediavirus.org/graphl#Vocabulary")) {
! 				TypeMenu menu = new TypeMenu(item.getProperty("http://www.mediavirus.org/graphl#name","<unnamed>"), item);
  				menu.updateMenu(which);
! 				menu.setToolTipText(item.getProperty("http://www.mediavirus.org/graphl#description",""));
  				this.add(menu);
  				menu.addResourceListener(this);
--- 57,68 ----
  	 */
  	protected void addItem(Node node, int which, boolean deep) {
! 		List items = node.getNeighbours(NS.graphl + "contains", true);
  		
  		for (Iterator iter = items.iterator(); iter.hasNext();) {
  			Node item = (Node) iter.next();
! 			if (item.hasType(NS.graphl + "Vocabulary")) {
! 				TypeMenu menu = new TypeMenu(item.getProperty(NS.graphl + "name","<unnamed>"), item);
  				menu.updateMenu(which);
! 				menu.setToolTipText(item.getProperty(NS.graphl + "description",""));
  				this.add(menu);
  				menu.addResourceListener(this);
***************
*** 82,91 ****
  				this.add(mItem);
  			}
! 			else if ( (((which & CLASSES) > 0) && item.hasType("http://www.mediavirus.org/graphl#ClassGroup"))
! 			       || (((which & PROPERTIES) > 0) && item.hasType("http://www.mediavirus.org/graphl#PropertyGroup"))) {			
  				if (deep) {
! 					TypeMenu menu = new TypeMenu(item.getProperty("http://www.mediavirus.org/graphl#name","<unnamed>"), item);
  					menu.updateMenu(which);
! 					menu.setToolTipText(item.getProperty("http://www.mediavirus.org/graphl#description","<unnamed>"));
  					this.add(menu);	
  					menu.addResourceListener(this);
--- 83,92 ----
  				this.add(mItem);
  			}
! 			else if ( (((which & CLASSES) > 0) && item.hasType(NS.graphl + "ClassGroup"))
! 			       || (((which & PROPERTIES) > 0) && item.hasType(NS.graphl + "PropertyGroup"))) {			
  				if (deep) {
! 					TypeMenu menu = new TypeMenu(item.getProperty(NS.graphl + "name","<unnamed>"), item);
  					menu.updateMenu(which);
! 					menu.setToolTipText(item.getProperty(NS.graphl + "description","<unnamed>"));
  					this.add(menu);	
  					menu.addResourceListener(this);