This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Remove outStream from FlowControlWriter.
- From: mark at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 1 Mar 2008 19:26:35 -0000
- Subject: [SCM] master: Remove outStream from FlowControlWriter.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via beb160770d5b41afd0f2dcf839c11a1a8d16b5e1 (commit)
from 2f59fef898b23d942b8091b7c5fdfa992888039d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit beb160770d5b41afd0f2dcf839c11a1a8d16b5e1
Author: Mark Wielaard <mwielaard@redhat.com>
Date: Sat Mar 1 20:18:07 2008 +0100
Remove outStream from FlowControlWriter.
frysk-core/frysk/util/ChangeLog
2008-02-29 Tom Tromey <tromey@redhat.com>
* FlowControlWriter.java (outStream): Remove.
(FlowControlWriter): Update.
(flush): Update.
(close): Update.
(write(char[],int,int)): Update.
(write(int)): Update.
(write(String,int,int)): Update.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/util/ChangeLog | 10 ++++++++++
frysk-core/frysk/util/FlowControlWriter.java | 17 +++++++----------
2 files changed, 17 insertions(+), 10 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/util/ChangeLog b/frysk-core/frysk/util/ChangeLog
index 172839c..a0e9e7b 100644
--- a/frysk-core/frysk/util/ChangeLog
+++ b/frysk-core/frysk/util/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-29 Tom Tromey <tromey@redhat.com>
+
+ * FlowControlWriter.java (outStream): Remove.
+ (FlowControlWriter): Update.
+ (flush): Update.
+ (close): Update.
+ (write(char[],int,int)): Update.
+ (write(int)): Update.
+ (write(String,int,int)): Update.
+
2008-02-29 Stan Cox <scox@redhat.com>
* CommandlineParser.java (CommandlineParser): Add new option sysroot.
diff --git a/frysk-core/frysk/util/FlowControlWriter.java b/frysk-core/frysk/util/FlowControlWriter.java
index b0b76fd..0ab8dfb 100644
--- a/frysk-core/frysk/util/FlowControlWriter.java
+++ b/frysk-core/frysk/util/FlowControlWriter.java
@@ -47,7 +47,6 @@ import java.io.Writer;
* Extension of Writer that allows output to be paused.
*/
public class FlowControlWriter extends FilterWriter {
- private Writer outStream;
private boolean paused = false;
/**
@@ -55,7 +54,6 @@ public class FlowControlWriter extends FilterWriter {
*/
public FlowControlWriter(Writer outStream) {
super(outStream);
- this.outStream = outStream;
}
public synchronized boolean isPaused() {
@@ -81,7 +79,7 @@ public class FlowControlWriter extends FilterWriter {
}
}
try {
- outStream.flush();
+ super.flush();
}
catch (IOException e) {
}
@@ -96,7 +94,6 @@ public class FlowControlWriter extends FilterWriter {
}
}
- outStream.close();
super.close();
}
@@ -109,9 +106,9 @@ public class FlowControlWriter extends FilterWriter {
}
}
- outStream.write(buf, offset, len);
+ super.write(buf, offset, len);
try {
- outStream.flush();
+ super.flush();
}
catch (IOException e) {
}
@@ -126,9 +123,9 @@ public class FlowControlWriter extends FilterWriter {
}
}
- outStream.write(b);
+ super.write(b);
try {
- outStream.flush();
+ super.flush();
}
catch (IOException e) {
}
@@ -143,9 +140,9 @@ public class FlowControlWriter extends FilterWriter {
}
}
- outStream.write(str, offset, len);
+ super.write(str, offset, len);
try {
- outStream.flush();
+ super.flush();
}
catch (IOException e) {
hooks/post-receive
--
frysk system monitor/debugger