From: Frank W. <fwi...@us...> - 2005-11-06 01:55:15
|
Update of /cvsroot/jython/jython/org/python/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32469/org/python/core Modified Files: StdoutWrapper.java Log Message: reformat Index: StdoutWrapper.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/StdoutWrapper.java,v retrieving revision 2.6 retrieving revision 2.7 diff -C2 -d -r2.6 -r2.7 *** StdoutWrapper.java 28 Oct 2001 17:13:43 -0000 2.6 --- StdoutWrapper.java 6 Nov 2005 01:55:07 -0000 2.7 *************** *** 5,14 **** import java.io.Writer; ! public class StdoutWrapper extends OutputStream ! { protected String name; public StdoutWrapper() { ! name = "stdout"; } --- 5,13 ---- import java.io.Writer; ! public class StdoutWrapper extends OutputStream { protected String name; public StdoutWrapper() { ! this.name = "stdout"; } *************** *** 16,19 **** --- 15,19 ---- return ss.stdout; } + protected void setObject(PySystemState ss, PyObject obj) { ss.stdout = obj; *************** *** 24,28 **** PyObject obj = getObject(ss); if (obj == null) { ! throw Py.AttributeError("missing sys."+name); } if (obj instanceof PyJavaInstance) { --- 24,28 ---- PyObject obj = getObject(ss); if (obj == null) { ! throw Py.AttributeError("missing sys." + this.name); } if (obj instanceof PyJavaInstance) { *************** *** 31,40 **** Object tmp = obj.__tojava__(OutputStream.class); if ((tmp != Py.NoConversion) && (tmp != null)) { ! OutputStream os = (OutputStream)tmp; f = new PyFile(os, "<java OutputStream>"); } else { tmp = obj.__tojava__(Writer.class); if ((tmp != Py.NoConversion) && (tmp != null)) { ! Writer w = (Writer)tmp; f = new PyFile(w, "<java Writer>"); } --- 31,40 ---- Object tmp = obj.__tojava__(OutputStream.class); if ((tmp != Py.NoConversion) && (tmp != null)) { ! OutputStream os = (OutputStream) tmp; f = new PyFile(os, "<java OutputStream>"); } else { tmp = obj.__tojava__(Writer.class); if ((tmp != Py.NoConversion) && (tmp != null)) { ! Writer w = (Writer) tmp; f = new PyFile(w, "<java Writer>"); } *************** *** 51,55 **** PyObject obj = myFile(); if (obj instanceof PyFile) { ! ((PyFile)obj).flush(); } else { obj.invoke("flush"); --- 51,55 ---- PyObject obj = myFile(); if (obj instanceof PyFile) { ! ((PyFile) obj).flush(); } else { obj.invoke("flush"); *************** *** 61,65 **** if (obj instanceof PyFile) { ! ((PyFile)obj).write(s); } else { obj.invoke("write", new PyString(s)); --- 61,65 ---- if (obj instanceof PyFile) { ! ((PyFile) obj).write(s); } else { obj.invoke("write", new PyString(s)); *************** *** 67,73 **** } - public void write(int i) { ! write(new String(new char[] {(char)i})); } --- 67,72 ---- } public void write(int i) { ! write(new String(new char[] { (char) i })); } *************** *** 76,85 **** } - public void clearSoftspace() { PyObject obj = myFile(); if (obj instanceof PyFile) { ! PyFile file = (PyFile)obj; if (file.softspace) { file.write("\n"); --- 75,83 ---- } public void clearSoftspace() { PyObject obj = myFile(); if (obj instanceof PyFile) { ! PyFile file = (PyFile) obj; if (file.softspace) { file.write("\n"); *************** *** 102,115 **** if (obj instanceof PyFile) { ! PyFile file = (PyFile)obj; String s = string.toString(); ! if (newline) ! s = s+"\n"; ! if (file.softspace) ! s = " "+s; file.write(s); file.flush(); ! if (space && s.endsWith("\n")) space = false; file.softspace = space; } else { --- 100,116 ---- if (obj instanceof PyFile) { ! PyFile file = (PyFile) obj; String s = string.toString(); ! if (newline) { ! s = s + "\n"; ! } ! if (file.softspace) { ! s = " " + s; ! } file.write(s); file.flush(); ! if (space && s.endsWith("\n")) { space = false; + } file.softspace = space; } else { *************** *** 119,133 **** } obj.invoke("write", string); ! if (newline) obj.invoke("write", Py.Newline); ! // obj.invoke("flush"); ! if (space && string.toString().endsWith("\n")) space = false; obj.__setattr__("softspace", space ? Py.One : Py.Zero); } } - public void print(String s) { print(new PyString(s), false, false); --- 120,135 ---- } obj.invoke("write", string); ! if (newline) { obj.invoke("write", Py.Newline); ! } ! // obj.invoke("flush"); ! if (space && string.toString().endsWith("\n")) { space = false; + } obj.__setattr__("softspace", space ? Py.One : Py.Zero); } } public void print(String s) { print(new PyString(s), false, false); *************** *** 154,163 **** if (obj instanceof PyFile) { ! PyFile file = (PyFile)obj; file.write("\n"); file.flush(); file.softspace = false; ! } ! else { obj.invoke("write", Py.Newline); obj.__setattr__("softspace", Py.Zero); --- 156,164 ---- if (obj instanceof PyFile) { ! PyFile file = (PyFile) obj; file.write("\n"); file.flush(); file.softspace = false; ! } else { obj.invoke("write", Py.Newline); obj.__setattr__("softspace", Py.Zero); |