[Jython-checkins] SF.net SVN: jython:[6232] trunk/jython/src/org/python/core/io

[<pj...@us...>]

Revision: 6232
          http://jython.svn.sourceforge.net/jython/?rev=6232&view=rev
Author:   pjenvey
Date:     2009-04-16 23:59:40 +0000 (Thu, 16 Apr 2009)

Log Message:
-----------
cleanup/coding standards

Modified Paths:
--------------
    trunk/jython/src/org/python/core/io/StreamIO.java
    trunk/jython/src/org/python/core/io/UniversalIOWrapper.java

Modified: trunk/jython/src/org/python/core/io/StreamIO.java
===================================================================
--- trunk/jython/src/org/python/core/io/StreamIO.java	2009-04-16 06:18:40 UTC (rev 6231)
+++ trunk/jython/src/org/python/core/io/StreamIO.java	2009-04-16 23:59:40 UTC (rev 6232)
@@ -16,8 +16,8 @@
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 
+import org.python.core.Py;
 import org.python.core.imp;
-import org.python.core.Py;
 
 /**
  * Raw I/O implementation for simple streams.
@@ -82,9 +82,6 @@
      * Construct a StreamIO for the given write channel.
      *
      * @param writeChannel a WritableByteChannel
-     * @param isatty boolean whether this io object is a tty device
-     * @param closefd boolean whether the underlying file is closed on
-     *                close() (defaults to True)
      */
     public StreamIO(WritableByteChannel writeChannel) {
         this(writeChannel, true);
@@ -160,56 +157,62 @@
 
     /** Unwrap one or more nested FilterInputStreams. */
     private static FileDescriptor getInputFileDescriptor(InputStream stream) throws IOException {
-	if (stream == null)
-	    return null;
-	if (stream instanceof FileInputStream)
-	    return ((FileInputStream)stream).getFD();
-	if (stream instanceof FilterInputStream) {
-	    Field inField = null;
-	    try {
-		inField = FilterInputStream.class.getDeclaredField("in");
-		inField.setAccessible(true);
-		return getInputFileDescriptor((InputStream)inField.get(stream));
-	    } catch (Exception e) {
-	    } finally {
-		if (inField != null && inField.isAccessible())
-		    inField.setAccessible(false);
-	    }
-	}
-	return null;
+        if (stream == null) {
+            return null;
+        }
+        if (stream instanceof FileInputStream) {
+            return ((FileInputStream)stream).getFD();
+        }
+        if (stream instanceof FilterInputStream) {
+            Field inField = null;
+            try {
+                inField = FilterInputStream.class.getDeclaredField("in");
+                inField.setAccessible(true);
+                return getInputFileDescriptor((InputStream)inField.get(stream));
+            } catch (Exception e) {
+                // XXX: masking other exceptions
+            } finally {
+                if (inField != null && inField.isAccessible())
+                    inField.setAccessible(false);
+            }
+        }
+        return null;
     }
 
     /** Unwrap one or more nested FilterOutputStreams. */
     private static FileDescriptor getOutputFileDescriptor(OutputStream stream) throws IOException {
-	if (stream == null)
-	    return null;
-	if (stream instanceof FileOutputStream)
-	    return ((FileOutputStream)stream).getFD();
-	if (stream instanceof FilterOutputStream) {
-	    Field outField = null;
-	    try {
-		outField = FilterOutputStream.class.getDeclaredField("out");
-		outField.setAccessible(true);
-		return getOutputFileDescriptor((OutputStream)outField.get(stream));
-	    } catch (Exception e) {
-	    } finally {
-		if (outField != null && outField.isAccessible())
-		    outField.setAccessible(false);
-	    }
-	}
-	return null;
+        if (stream == null) {
+            return null;
+        }
+        if (stream instanceof FileOutputStream) {
+            return ((FileOutputStream)stream).getFD();
+        }
+        if (stream instanceof FilterOutputStream) {
+            Field outField = null;
+            try {
+                outField = FilterOutputStream.class.getDeclaredField("out");
+                outField.setAccessible(true);
+                return getOutputFileDescriptor((OutputStream)outField.get(stream));
+            } catch (Exception e) {
+                // XXX: masking other exceptions
+            } finally {
+                if (outField != null && outField.isAccessible())
+                    outField.setAccessible(false);
+            }
+        }
+        return null;
     }
 
     /** {@inheritDoc} */
-
     public boolean isatty() {
         checkClosed();
 
         FileDescriptor fd;
         try {
-            if ( ((fd = getInputFileDescriptor(inputStream)) == null) &&
-                 ((fd = getOutputFileDescriptor(outputStream)) == null))
-                   return false;
+            if ((fd = getInputFileDescriptor(inputStream)) == null
+                && (fd = getOutputFileDescriptor(outputStream)) == null) {
+                return false;
+            }
         } catch (IOException e) {
             return false;
         }

Modified: trunk/jython/src/org/python/core/io/UniversalIOWrapper.java
===================================================================
--- trunk/jython/src/org/python/core/io/UniversalIOWrapper.java	2009-04-16 06:18:40 UTC (rev 6231)
+++ trunk/jython/src/org/python/core/io/UniversalIOWrapper.java	2009-04-16 23:59:40 UTC (rev 6232)
@@ -3,7 +3,6 @@
 
 import java.nio.ByteBuffer;
 import java.util.EnumSet;
-import java.util.Iterator;
 
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -189,7 +188,6 @@
         byte[] readaheadArray;
         int readaheadPos;
         int interimBuilderPos;
-        String line;
 
         do {
             readaheadArray = readahead.array();
@@ -313,12 +311,12 @@
         if (size == 0) {
             return Py.None;
         } else if (size == 1) {
-            Newline newline = (Newline)newlineTypes.iterator().next();
+            Newline newline = newlineTypes.iterator().next();
             return new PyString(newline.getValue());
         }
 
-        int i = 0;
         PyObject[] newlines = new PyObject[size];
+        int i = 0;
         for (Newline newline : newlineTypes) {
             newlines[i++] = new PyString(newline.getValue());
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.