[armedbear-cvs] r11417 - branches/open-external-format/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Thu Dec  4 23:17:46 2008
New Revision: 11417

Log:
Rename variables shadowing fields.

Modified:
   branches/open-external-format/src/org/armedbear/lisp/Stream.java

Modified: branches/open-external-format/src/org/armedbear/lisp/Stream.java
==============================================================================
--- branches/open-external-format/src/org/armedbear/lisp/Stream.java	(original)
+++ branches/open-external-format/src/org/armedbear/lisp/Stream.java	Thu Dec  4 23:17:46 2008
@@ -151,8 +151,8 @@
     else
       {
         isBinaryStream = true;
-        InputStream in = new BufferedInputStream(inputStream);
-	initAsBinaryInputStream(in);
+        InputStream stream = new BufferedInputStream(inputStream);
+	initAsBinaryInputStream(stream);
       }
   }
 
@@ -174,24 +174,24 @@
     setExternalFormat(format);
     if (elementType == Symbol.CHARACTER || elementType == Symbol.BASE_CHAR)
       {
-	Writer writer;
+	Writer w;
         try
           {
-            writer = (encoding == null) ?
+            w = (encoding == null) ?
                 new OutputStreamWriter(outputStream)
                 : new OutputStreamWriter(outputStream, encoding);
           }
         catch (java.io.UnsupportedEncodingException e)
           {
             Debug.trace(e);
-            writer = new OutputStreamWriter(outputStream);
+            w = new OutputStreamWriter(outputStream);
           }
-	initAsCharacterOutputStream(writer);
+	initAsCharacterOutputStream(w);
       }
     else
       {
-        OutputStream out = new BufferedOutputStream(outputStream);
-	initAsBinaryOutputStream(out);
+        OutputStream stream = new BufferedOutputStream(outputStream);
+	initAsBinaryOutputStream(stream);
       }
   }