[ccmtools-cvs] ccmtools/src/ccmtools/parser/cpp JPP.java,1.1,1.2

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/cpp
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15473/src/ccmtools/parser/cpp

Modified Files:
	JPP.java 
Log Message:
using of deprecated API changed

Index: JPP.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/cpp/JPP.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JPP.java	18 Jan 2007 17:11:45 -0000	1.1
--- JPP.java	15 Feb 2007 07:35:51 -0000	1.2
***************
*** 21,30 ****
  package ccmtools.parser.cpp;
  
! import java.io.*;
  import java.util.Enumeration;
- import java.util.StringTokenizer;
  import java.util.Hashtable;
- import java.util.Vector;
  import java.util.Stack;
  
  /**
--- 21,37 ----
  package ccmtools.parser.cpp;
  
! import java.io.BufferedReader;
! import java.io.File;
! import java.io.FileInputStream;
! import java.io.FilterInputStream;
! import java.io.IOException;
! import java.io.InputStream;
! import java.io.InputStreamReader;
! import java.io.OutputStream;
  import java.util.Enumeration;
  import java.util.Hashtable;
  import java.util.Stack;
+ import java.util.StringTokenizer;
+ import java.util.Vector;
  
  /**
***************
*** 94,98 ****
        Stack nbStack  = null;
        
!       DataInputStream fCur = null;
        String nameCur = null;
        int nbCur = -1;
--- 101,105 ----
        Stack nbStack  = null;
        
!       BufferedReader fCur = null;
        String nameCur = null;
        int nbCur = -1;
***************
*** 100,104 ****
        
        JPPExpandedStream (String fileName, Vector includeDirs)  throws java.io.IOException {
!          fCur = new DataInputStream(new BufferedInputStream(new FileInputStream(fileName)));
           iDirs = includeDirs;
           fStack = new Stack();
--- 107,112 ----
        
        JPPExpandedStream (String fileName, Vector includeDirs)  throws java.io.IOException {
!          //fCur = new DataInputStream(new BufferedInputStream(new FileInputStream(fileName)));
!          fCur=new BufferedReader(new InputStreamReader(new FileInputStream(fileName)));
           iDirs = includeDirs;
           fStack = new Stack();
***************
*** 119,123 ****
                 line = "# "+nbCur+" "+"\""+nameCur+"\""+"      2";
                 nameCur = (String) nameStack.pop();
!                fCur = (DataInputStream) fStack.pop();
              }
           } else {
--- 127,131 ----
                 line = "# "+nbCur+" "+"\""+nameCur+"\""+"      2";
                 nameCur = (String) nameStack.pop();
!                fCur = (BufferedReader) fStack.pop();
              }
           } else {
***************
*** 138,142 ****
                    nbStack.push(new Integer(nbCur));
                    
!                   fCur = new DataInputStream(new BufferedInputStream(new FileInputStream(fiName)));
                    nameCur = new String(fiName);
                    line = "# "+nbCur+" "+"\""+fiName+"\""+"      1";
--- 146,151 ----
                    nbStack.push(new Integer(nbCur));
                    
!                   //fCur = new DataInputStream(new BufferedInputStream(new FileInputStream(fiName)));
!                   fCur=new BufferedReader(new InputStreamReader(new FileInputStream(fiName)));
                    nameCur = new String(fiName);
                    line = "# "+nbCur+" "+"\""+fiName+"\""+"      1";