graphl-cvs Mailing List for Graphl - Hybrid graph visualization tool (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	GraphlApplet.java GraphlApplication.java 
Log Message:
updated save machanism to new multi-souurce paradigm

Index: GraphlApplet.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlApplet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GraphlApplet.java	17 Aug 2005 15:52:51 -0000	1.10
--- GraphlApplet.java	5 Sep 2005 15:51:50 -0000	1.11
***************
*** 127,133 ****
                  URL settingsurl = new URL(getDocumentBase(), urlstr);
                  settingsGraph.clear(); 
!                 settingsGraph.readFromURL(settingsurl);

-         		mainPanel.graphPane.setConfigurationGraph(settingsGraph);
          		Node defaultSettings = null;

--- 127,132 ----
                  URL settingsurl = new URL(getDocumentBase(), urlstr);
                  settingsGraph.clear(); 
!                 ((RDFGraph)mainPanel.getGraph()).readFromURL(settingsurl);

          		Node defaultSettings = null;

***************
*** 182,186 ****

      	        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
!     	        ((RDFGraph)mainPanel.getGraph()).writeToRDF(bytes);
      	        String data = bytes.toString();

--- 181,185 ----

      	        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
!     	        ((RDFGraph)mainPanel.getGraph()).writeToRDF(bytes, saveURL.toString());
      	        String data = bytes.toString();

Index: GraphlApplication.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlApplication.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** GraphlApplication.java	24 Aug 2005 16:09:30 -0000	1.20
--- GraphlApplication.java	5 Sep 2005 15:51:50 -0000	1.21
***************
*** 32,35 ****
--- 32,36 ----
  import javax.swing.KeyStroke;

+ import org.mediavirus.graphl.graph.Graph;
  import org.mediavirus.graphl.graph.Node;
  import org.mediavirus.graphl.graph.filter.FilteredGraph;
***************
*** 70,73 ****
--- 71,76 ----
      JMenu configConfigurationMenu;

+     JMenu saveMenu;
+     
  	Font menuFont = new Font(null, Font.PLAIN, 12);

***************
*** 96,107 ****
          });

! 		FilteredGraph fgraph = new FilteredGraph(new RDFGraph());
  		SourceFilter filter = new SourceFilter();
  		filter.addSource("file:/C:/data/projects/graphl/config/vocabs/foaf-owl.rdf");
  		filter.addSource("file:/C:/data/projects/graphl/config/vocabs/rdf+rdfs.rdf");
  		filter.addSource("file:/C:/data/projects/graphl/config/config.rdf");
  		filter.addSource(NS.graphl + "SYSTEM");
! 		fgraph.addFilter(filter);
! 		mainPanel = new GraphlPanel(fgraph);

  		this.getContentPane().setLayout(new BorderLayout());
--- 99,113 ----
          });

! 		Graph graph = new RDFGraph();
! 		
  		SourceFilter filter = new SourceFilter();
+ 		// TODO (2) we should model datasources as a class for UI access etc.
  		filter.addSource("file:/C:/data/projects/graphl/config/vocabs/foaf-owl.rdf");
  		filter.addSource("file:/C:/data/projects/graphl/config/vocabs/rdf+rdfs.rdf");
  		filter.addSource("file:/C:/data/projects/graphl/config/config.rdf");
  		filter.addSource(NS.graphl + "SYSTEM");
! 
! 		mainPanel = new GraphlPanel(graph);
! 		mainPanel.graphPane.getFilteredGraph().addFilter(filter);

  		this.getContentPane().setLayout(new BorderLayout());
***************
*** 113,117 ****
  		fileMenu.setFont(menuFont);

! 		newItem = new JMenuItem("New");
  		newItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK));
  		newItem.addActionListener(new ActionListener() {
--- 119,123 ----
  		fileMenu.setFont(menuFont);

! 		newItem = new JMenuItem("Clear");
  		newItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK));
  		newItem.addActionListener(new ActionListener() {
***************
*** 123,127 ****
  		fileMenu.add(newItem);

! 		openFileItem = new JMenuItem("Open File...");
  		openFileItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_DOWN_MASK));
  		openFileItem.addActionListener(new ActionListener() {
--- 129,133 ----
  		fileMenu.add(newItem);

! 		openFileItem = new JMenuItem("Load File...");
  		openFileItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_DOWN_MASK));
  		openFileItem.addActionListener(new ActionListener() {
***************
*** 133,137 ****
  		fileMenu.add(openFileItem);

! 		openURLItem = new JMenuItem("Open URL...");
  		openURLItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK));
  		openURLItem.addActionListener(new ActionListener() {
--- 139,143 ----
  		fileMenu.add(openFileItem);

! 		openURLItem = new JMenuItem("Load URL...");
  		openURLItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK));
  		openURLItem.addActionListener(new ActionListener() {
***************
*** 145,168 ****
  		fileMenu.addSeparator();

! 		saveItem = new JMenuItem("Save");
! 		saveItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK));
! 		saveItem.addActionListener(new ActionListener() {
!             public void actionPerformed(ActionEvent e) {
!                 doSave();
!             }
!         });
! 		saveItem.setFont(menuFont);
! 		fileMenu.add(saveItem);

! 		saveAsItem = new JMenuItem("Save As...");
! 		saveAsItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK));
! 		saveAsItem.addActionListener(new ActionListener() {
              public void actionPerformed(ActionEvent e) {
                  doSaveAs();
              }
          });
! 		saveAsItem.setFont(menuFont);
! 		fileMenu.add(saveAsItem);
! 		
  		fileMenu.addSeparator();

--- 151,168 ----
  		fileMenu.addSeparator();

! 		saveMenu = new JMenu("Save Changes");
! 		saveMenu.setFont(menuFont);
! 		fileMenu.add(saveMenu);

! 		saveItem = new JMenuItem("to new File...");
! 		saveItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_DOWN_MASK + KeyEvent.SHIFT_DOWN_MASK));
! 		saveItem.addActionListener(new ActionListener() {
              public void actionPerformed(ActionEvent e) {
                  doSaveAs();
              }
          });
! 		saveItem.setFont(menuFont);
! 		saveMenu.add(saveItem);
! 				
  		fileMenu.addSeparator();

***************
*** 338,342 ****
      protected boolean doSave(File file) {
  		try {
! 			mainPanel.getGraph().writeToRDF(new FileOutputStream(currentFile));
  			mainPanel.getGraph().resetDirty();
  		}
--- 338,354 ----
      protected boolean doSave(File file) {
  		try {
! 			FilteredGraph fgraph = new FilteredGraph(mainPanel.getGraphPane().getSourceGraph());
! 			SourceFilter filter = new SourceFilter(false, false);
! 
! 			String urlstr = "";
! 			try {
! 				urlstr = new URL("file:///" + file.getAbsolutePath()).toString();
! 				filter.addSource(urlstr);
! 			}
! 			catch (MalformedURLException e) {}
! 			filter.addSource(NS.graphl + "USER");
! 			fgraph.addFilter(filter);
! 
! 			RDFGraph.writeToRDF(fgraph, new FileOutputStream(currentFile), urlstr);
  			mainPanel.getGraph().resetDirty();
  		}
***************
*** 354,368 ****
       */
      protected void doLoad() {
-         if (mainPanel.getGraph().isDirty()) {
-             int choice = JOptionPane.showConfirmDialog(this, "File has been changed. Do you want to save your changes?", "Save Changes?", JOptionPane.YES_NO_CANCEL_OPTION);
-             if (choice == JOptionPane.CANCEL_OPTION) return;
-             if (choice == JOptionPane.YES_OPTION) {
-                 boolean result = doSave();
-                 // if save not succesful, treat as cancel
-                 if (result != true) {
-                     return;
-                 }
-             }
-         }

          JFileChooser chooser = new JFileChooser();
--- 366,369 ----
***************
*** 388,391 ****
--- 389,398 ----
  		    try {
  		        loadFile(chooser.getSelectedFile());
+ 		        
+ 		        JMenuItem saveFileItem = new JMenuItem("to " + chooser.getSelectedFile().getName());
+ 		        saveFileItem.addActionListener(new SaveFileAdapter(chooser.getSelectedFile()));
+ 		        saveFileItem.setFont(menuFont);
+ 		        saveMenu.add(saveFileItem);
+ 
  		    }
  			catch (IOException ioex) {
***************
*** 397,400 ****
--- 404,419 ----
      }

+     private class SaveFileAdapter implements ActionListener {
+     	private File f;
+     	
+     	public SaveFileAdapter(File f) {
+     		this.f = f;
+     	}
+     	
+     	public void actionPerformed(ActionEvent e) {
+     		doSave(f);
+     	}
+     }
+     
      /**
       * Loads the graph from the specified file.
***************
*** 410,414 ****

  			    mainPanel.getGraph().readFromFile(file.getAbsolutePath());
! 			    setTitle("Graphl - " + file.getName());
  				currentFile = file;
  		    }
--- 429,433 ----

  			    mainPanel.getGraph().readFromFile(file.getAbsolutePath());
! 			    //setTitle("Graphl - " + file.getName());
  				currentFile = file;
  		    }
***************
*** 485,492 ****
      public void loadSettings(String filename) throws IOException {

!     	// TODO (1) fix this to properly access graph. think about GraphlPanel vs. GraphlApplication features
!         RDFGraph settingsGraph = (RDFGraph)((FilteredGraph)mainPanel.graphPane.getGraph()).getSource();
  		settingsGraph.readFromFile(filename);
- 		mainPanel.graphPane.setConfigurationGraph(settingsGraph);

  		JRadioButtonMenuItem defaultItem = null;
--- 504,509 ----
      public void loadSettings(String filename) throws IOException {

!         RDFGraph settingsGraph = (RDFGraph)mainPanel.graphPane.getSourceGraph();
  		settingsGraph.readFromFile(filename);

  		JRadioButtonMenuItem defaultItem = null;
***************
*** 626,630 ****
  			public void run() {
  				try {
! 					List nodes = mainPanel.graphPane.graph.getNodes();
  					for (Iterator iter = nodes.iterator(); iter.hasNext();) {
  						Node node = (Node) iter.next();
--- 643,647 ----
  			public void run() {
  				try {
! 					List nodes = mainPanel.graphPane.filteredGraph.getNodes();
  					for (Iterator iter = nodes.iterator(); iter.hasNext();) {
  						Node node = (Node) iter.next();

2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (48)	Sep (6)	Oct (64)	Nov (12)	Dec (13)
2005	Jan (10)	Feb	Mar	Apr	May	Jun	Jul	Aug (34)	Sep (31)	Oct	Nov	Dec (25)
2006	Jan	Feb	Mar	Apr	May	Jun (43)	Jul (16)	Aug	Sep	Oct	Nov	Dec

graphl-cvs Mailing List for Graphl - Hybrid graph visualization tool (Page 5)

graphl-cvs — cvs commit mails