Menu
▾
▴
[Jcontracts-svn] SF.net SVN: jcontracts: [40] trunk/source/java/net/sf/jcontracts
|
From: <js...@us...> - 2006-12-04 19:46:58
|
Revision: 40
http://svn.sourceforge.net/jcontracts/?rev=40&view=rev
Author: jstuyts
Date: 2006-12-04 11:46:56 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
Replaced input streams with readers.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java
trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java
trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java
trunk/source/java/net/sf/jcontracts/codeparser/Parser.java
trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java
trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java
trunk/source/java/net/sf/jcontracts/icontract/Tool.java
Modified: trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-12-04 19:21:15 UTC (rev 39)
+++ trunk/source/java/net/sf/jcontracts/codeparser/CodeMetaclassCache.java 2006-12-04 19:46:56 UTC (rev 40)
@@ -3,6 +3,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
@@ -53,7 +54,7 @@
for (Enumeration e = recache.elements(); e.hasMoreElements();)
{
String fn = (String) e.nextElement();
- FileInputStream is = new FileInputStream(srcbase + fn);
+ FileReader is = new FileReader(srcbase + fn);
System.err.println("Upating cache entry for: " + fn.replace(File.separatorChar, '.'));
Parser parser = new Parser(is, fn);
parser.enableCaptureAllDependencies();
Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-12-04 19:21:15 UTC (rev 39)
+++ trunk/source/java/net/sf/jcontracts/codeparser/JavaLexer.java 2006-12-04 19:46:56 UTC (rev 40)
@@ -1,6 +1,6 @@
package net.sf.jcontracts.codeparser;
-import java.io.InputStream;
+import java.io.Reader;
import java.util.Hashtable;
import net.sf.jcontracts.antlr.ANTLRHashString;
@@ -141,7 +141,7 @@
super.caseSensitiveLiterals = true;
}
- public JavaLexer(InputStream in)
+ public JavaLexer(Reader in)
{
this(new CharBufferNoBacktrackingNoInteractive(in));
}
Modified: trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-12-04 19:21:15 UTC (rev 39)
+++ trunk/source/java/net/sf/jcontracts/codeparser/JavaParser.java 2006-12-04 19:46:56 UTC (rev 40)
@@ -1,7 +1,9 @@
package net.sf.jcontracts.codeparser;
import java.io.File;
-import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
@@ -2741,16 +2743,16 @@
{
try
{
- java.io.InputStream is;
+ Reader is;
String filename;
if (args.length != 0)
{
- is = new FileInputStream(args[0]);
+ is = new FileReader(args[0]);
filename = args[0];
}
else
{
- is = System.in;
+ is = new InputStreamReader(System.in);
filename = "<System.in>";
}
JavaLexer lexer = new JavaLexer(is);
Modified: trunk/source/java/net/sf/jcontracts/codeparser/Parser.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-12-04 19:21:15 UTC (rev 39)
+++ trunk/source/java/net/sf/jcontracts/codeparser/Parser.java 2006-12-04 19:46:56 UTC (rev 40)
@@ -1,6 +1,6 @@
package net.sf.jcontracts.codeparser;
-import java.io.InputStream;
+import java.io.Reader;
import java.util.Hashtable;
import java.util.Vector;
@@ -14,7 +14,7 @@
private JavaLexer _lexer;
- public Parser(InputStream is, String filename)
+ public Parser(Reader is, String filename)
{
_lexer = new JavaLexer(is);
_lexer.setTokenObjectClass("net.sf.jcontracts.codeParser.ExtendedToken");
Modified: trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-12-04 19:21:15 UTC (rev 39)
+++ trunk/source/java/net/sf/jcontracts/icontract/FileTarget.java 2006-12-04 19:46:56 UTC (rev 40)
@@ -2,13 +2,12 @@
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.FilenameFilter;
import java.io.IOException;
-import java.io.InputStream;
import java.io.PrintWriter;
+import java.io.Reader;
import java.util.Enumeration;
import java.util.Vector;
@@ -25,7 +24,7 @@
super(name);
}
- private void copyWithoutLinesStartingWith(FileInputStream is, PrintWriter os, String header) throws IOException
+ private void copyWithoutLinesStartingWith(FileReader is, PrintWriter os, String header) throws IOException
{
char buf[] = new char[300];
for (int ch = is.read(); ch != -1;)
@@ -58,13 +57,13 @@
}
- protected InputStream createStreamForCodeParsing() throws IOException
+ protected Reader createStreamForCodeParsing() throws IOException
{
- FileInputStream is = null;
+ FileReader is = null;
PrintWriter os = null;
try
{
- is = new FileInputStream(getName());
+ is = new FileReader(getName());
os = new PrintWriter(new FileWriter(getName() + ".clean"));
copyWithoutLinesStartingWith(is, os, "/*|*/");
}
@@ -79,7 +78,7 @@
os.close();
}
}
- return new FileInputStream(getName() + ".clean");
+ return new FileReader(getName() + ".clean");
}
Vector enumerateFilesIn(String dir, FilenameFilter filter)
@@ -209,7 +208,7 @@
Vector process(Vector options) throws Exception
{
Vector fileList = new Vector();
- InputStream is = null;
+ Reader is = null;
CleanOption cleanOption = null;
for (int i = 0; i < options.size(); i++)
{
@@ -230,7 +229,7 @@
}
else
{
- is = new FileInputStream(getName());
+ is = new FileReader(getName());
}
Parser parser = new Parser(is, getName());
MetaclassFactory metaclassFactory = new MetaclassFactory(getName());
Modified: trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java 2006-12-04 19:21:15 UTC (rev 39)
+++ trunk/source/java/net/sf/jcontracts/icontract/SystemInTarget.java 2006-12-04 19:46:56 UTC (rev 40)
@@ -1,6 +1,7 @@
package net.sf.jcontracts.icontract;
-import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.util.Vector;
public class SystemInTarget extends FileTarget
@@ -11,9 +12,9 @@
super("<system.in>");
}
- protected InputStream createStreamForCodeParsing()
+ protected Reader createStreamForCodeParsing()
{
- return System.in;
+ return new InputStreamReader(System.in);
}
Vector expand()
Modified: trunk/source/java/net/sf/jcontracts/icontract/Tool.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-12-04 19:21:15 UTC (rev 39)
+++ trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-12-04 19:46:56 UTC (rev 40)
@@ -1,12 +1,12 @@
package net.sf.jcontracts.icontract;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.Reader;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
@@ -105,10 +105,10 @@
for (int i = 0; i < targets.size(); i++)
{
String fn = ((Target) targets.elementAt(i)).getName();
- FileInputStream is = null;
+ Reader is = null;
try
{
- is = new FileInputStream(fn);
+ is = new FileReader(fn);
}
catch (FileNotFoundException _ex)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
