jreepad-cvs

[PeWu <pe...@us...>]

Update of /cvsroot/jreepad/jreepad/src/jreepad
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31373/src/jreepad

Modified Files:
	find.java JreepadViewer.java 
Log Message:
Using SAX for reading and writing XML

Index: find.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/find.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** find.java	26 Mar 2007 11:49:24 -0000	1.8
--- find.java	28 Sep 2007 21:54:41 -0000	1.9
***************
*** 31,38 ****
  import java.awt.print.*;
  */
! import java.io.*;
  
  import javax.swing.tree.TreePath;
- import java.util.Vector;
  
  import jreepad.io.AutoDetectReader;
--- 31,42 ----
  import java.awt.print.*;
  */
! import java.io.File;
! import java.io.FileInputStream;
! import java.io.IOException;
! import java.io.InputStream;
! import java.io.ObjectInputStream;
! import java.util.Vector;
  
  import javax.swing.tree.TreePath;
  
  import jreepad.io.AutoDetectReader;
***************
*** 198,204 ****
        // De-serialize the prefs file (i.e. load it)...
        JreepadPrefs jreepref;
! 	  ObjectInputStream prefsLoader = new ObjectInputStream(new FileInputStream(prefsFile));
! 	  jreepref = (JreepadPrefs)prefsLoader.readObject();
! 	  prefsLoader.close();
  
        // ...and take some data from it
--- 202,208 ----
        // De-serialize the prefs file (i.e. load it)...
        JreepadPrefs jreepref;
!       ObjectInputStream prefsLoader = new ObjectInputStream(new FileInputStream(prefsFile));
!       jreepref = (JreepadPrefs)prefsLoader.readObject();
!       prefsLoader.close();
  
        // ...and take some data from it
***************
*** 232,246 ****
      // Load the file to be searched
      JreepadNode root = new JreepadNode();
! 	try
! 	{
          InputStream in = new FileInputStream(userFile);
          JreepadReader reader = new AutoDetectReader(encoding, false);
          root = reader.read(in).getRootNode();
! 	}
! 	catch(IOException err)
! 	{
! 	  System.out.println("File input error: " + err);
! 	  System.exit(1);
! 	}
  
  
--- 236,250 ----
      // Load the file to be searched
      JreepadNode root = new JreepadNode();
!     try
!     {
          InputStream in = new FileInputStream(userFile);
          JreepadReader reader = new AutoDetectReader(encoding, false);
          root = reader.read(in).getRootNode();
!     }
!     catch(IOException err)
!     {
!       System.out.println("File input error: " + err);
!       System.exit(1);
!     }
  
  
***************
*** 248,258 ****
      JreepadSearcher searcher = new JreepadSearcher(root);
      searcher.performSearch(inNodes, inArticles, new TreePath(root),
!   							orNotAnd, caseSensitive, maxResults);
      JreepadSearcher.JreepadSearchResult[] res = searcher.getSearchResults();
  
      if(res.length==0)
      {
! 	  System.out.println("No matches.");
! 	  System.exit(1);
      }
  
--- 252,262 ----
      JreepadSearcher searcher = new JreepadSearcher(root);
      searcher.performSearch(inNodes, inArticles, new TreePath(root),
!                               orNotAnd, caseSensitive, maxResults);
      JreepadSearcher.JreepadSearchResult[] res = searcher.getSearchResults();
  
      if(res.length==0)
      {
!       System.out.println("No matches.");
!       System.exit(1);
      }
  
***************
*** 277,281 ****
          JreepadWriter writer;
          if (outputFormat == OUTPUT_XML)
!             writer= new XmlWriter(outputEncoding);
          else
              writer= new TreepadWriter(outputEncoding);
--- 281,285 ----
          JreepadWriter writer;
          if (outputFormat == OUTPUT_XML)
!             writer= new XmlWriter();
          else
              writer= new TreepadWriter(outputEncoding);

Index: JreepadViewer.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/JreepadViewer.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** JreepadViewer.java	15 Apr 2007 10:46:45 -0000	1.63
--- JreepadViewer.java	28 Sep 2007 21:54:41 -0000	1.64
***************
*** 80,83 ****
--- 80,84 ----
  
  import jreepad.io.AutoDetectReader;
+ import jreepad.io.EncryptedWriter;
  import jreepad.io.HtmlWriter;
  import jreepad.io.JreepadReader;
***************
*** 85,88 ****
--- 86,90 ----
  import jreepad.io.TreepadWriter;
[...1552 lines suppressed...]
          ae.setHandled(true);
!     }
!     public void handleQuit(ApplicationEvent ae) {
          //
          //	You MUST setHandled(false) if you want to delay or cancel the quit.
***************
*** 2405,2409 ****
          ae.setHandled(false);
          quit();
! 	}
  */
  }
\ No newline at end of file
--- 2422,2426 ----
          ae.setHandled(false);
          quit();
!     }
  */
  }
\ No newline at end of file