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

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

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

Modified Files:
	GraphlPane.java GraphlPanel.java GraphlApplication.java 
Log Message:
added context menu for graph to switch configurations in the applet or without menubar

Index: GraphlPanel.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlPanel.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** GraphlPanel.java	30 Nov 2004 09:38:34 -0000	1.18
--- GraphlPanel.java	10 Dec 2004 16:13:04 -0000	1.19
***************
*** 42,47 ****
  	GraphlManipulator gui;
  	
- 	JButton saveButton;
- 	JButton loadButton;
  	JCheckBox layoutBox;
  	
--- 42,45 ----

Index: GraphlApplication.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlApplication.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** GraphlApplication.java	30 Nov 2004 09:38:34 -0000	1.15
--- GraphlApplication.java	10 Dec 2004 16:13:04 -0000	1.16
***************
*** 17,23 ****
  import java.net.MalformedURLException;
  import java.net.URL;
- import java.util.ArrayList;
  import java.util.Iterator;
- import java.util.List;
  
  import javax.swing.ButtonGroup;
--- 17,21 ----
***************
*** 77,85 ****
  
      private boolean doReload;
!     
!     private RDFGraph settingsGraph = new RDFGraph();
!     /** A List with all configuration nodes in the settings graph */
!     private List configurations = new ArrayList();
!     
      /**
       * @throws java.awt.HeadlessException
--- 75,79 ----
  
      private boolean doReload;
!         
      /**
       * @throws java.awt.HeadlessException
***************
*** 435,440 ****
          
          public void actionPerformed(ActionEvent e) {
!             FacetRegistry newRegistry = new GraphFacetRegistry(settingsGraph,node);
!             setRegistry(newRegistry);
          }               
      }
--- 429,434 ----
          
          public void actionPerformed(ActionEvent e) {
!             FacetRegistry newRegistry = new GraphFacetRegistry(mainPanel.graphPane.getConfigurationGraph(),node);
!             mainPanel.graphPane.setFacetRegistry(newRegistry);
          }               
      }
***************
*** 452,492 ****
      }
      
-     public void setRegistry(FacetRegistry registry) {
-         mainPanel.graphPane.setFacetRegistry(registry);
-     }
-     
      public void loadSettings(String filename) throws IOException {
!     	settingsGraph.clear();
  		settingsGraph.readFromFile(filename);
  		
- 		Node defaultConfiguration = null;
  		JRadioButtonMenuItem defaultItem = null;
  		ButtonGroup settingsGroup = new ButtonGroup();
! 		
! 		for (Iterator nodes = settingsGraph.getNodes().iterator(); nodes.hasNext();) {
!             Node node = (Node) nodes.next();
!             if (node.hasType("http://www.mediavirus.org/graphl#Configuration")) {
!                 configurations.add(node);
!                 JRadioButtonMenuItem item = new JRadioButtonMenuItem(node.getProperty("http://www.mediavirus.org/graphl#name","<unnamed>"));
!                 item.addActionListener(new SettingsAdapter(node));
!                 item.setFont(menuFont);
!                 configConfigurationMenu.add(item);
!                 settingsGroup.add(item);
!                 if (node.getProperty("http://www.mediavirus.org/graphl#default","").equalsIgnoreCase("true")) {
!                     defaultConfiguration = node;
!                     defaultItem = item;
!                 }
!             }
          }
! 		
! 		if (configurations.size() > 0) {
! 		    if (defaultConfiguration != null) {
! 		        setRegistry(new GraphFacetRegistry(settingsGraph,defaultConfiguration));
! 		        defaultItem.setSelected(true);
! 		    }
! 		    else {
! 		        setRegistry(new GraphFacetRegistry(settingsGraph,(Node)configurations.get(0)));
! 		    }
! 		}
      }
  
--- 446,471 ----
      }
      
      public void loadSettings(String filename) throws IOException {
!     	
!         RDFGraph settingsGraph = new RDFGraph();
  		settingsGraph.readFromFile(filename);
+ 		mainPanel.graphPane.setConfigurationGraph(settingsGraph);
  		
  		JRadioButtonMenuItem defaultItem = null;
  		ButtonGroup settingsGroup = new ButtonGroup();
! 
! 		for (Iterator settings = mainPanel.graphPane.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));
!             item.setFont(menuFont);
!             configConfigurationMenu.add(item);
!             settingsGroup.add(item);
!             if (node.getProperty("http://www.mediavirus.org/graphl#default","").equalsIgnoreCase("true")) {
!             	defaultItem = item;
!             }            
          }
! 
! 		if (defaultItem != null) defaultItem.setSelected(true);
      }
  

Index: GraphlPane.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlPane.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** GraphlPane.java	30 Nov 2004 09:38:34 -0000	1.15
--- GraphlPane.java	10 Dec 2004 16:13:04 -0000	1.16
***************
*** 45,48 ****
--- 45,49 ----
  import org.mediavirus.graphl.selection.SelectionModel;
  import org.mediavirus.graphl.view.FacetRegistry;
+ import org.mediavirus.graphl.view.GraphFacetRegistry;
  import org.mediavirus.graphl.view.SimpleFacetRegistry;
  import org.mediavirus.graphl.vocabulary.SimpleVocabularyRegistry;
***************
*** 690,692 ****
--- 691,732 ----
          return layouterRunning;
      }
+     
+     private Graph settingsGraph = null;
+     /** A List with all configuration nodes in the settings graph */
+     private List configurations = new ArrayList();
+ 
+     public void setConfigurationGraph(Graph settingsGraph) {
+         
+         this.settingsGraph = settingsGraph;
+         
+ 		Node defaultConfiguration = null;
+ 		
+ 		for (Iterator nodes = settingsGraph.getNodes().iterator(); nodes.hasNext();) {
+             Node node = (Node) nodes.next();
+             if (node.hasType("http://www.mediavirus.org/graphl#Configuration")) {
+                 configurations.add(node);
+                 if (node.getProperty("http://www.mediavirus.org/graphl#default","").equalsIgnoreCase("true")) {
+                     defaultConfiguration = node;
+                 }
+             }
+         }
+ 		
+ 		if (configurations.size() > 0) {
+ 		    if (defaultConfiguration != null) {
+ 		        setFacetRegistry(new GraphFacetRegistry(settingsGraph,defaultConfiguration));
+ 		    }
+ 		    else {
+ 		        setFacetRegistry(new GraphFacetRegistry(settingsGraph,(Node)configurations.get(0)));
+ 		    }
+ 		}
+ 
+     }
+     
+     public Graph getConfigurationGraph() {
+         return settingsGraph;
+     }
+     
+     public Collection getConfigurations() {
+         return configurations;
+     }
  }