[Refactoring] Write record data to data output interface instead of record interface...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3452 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/java/src/com/tightvnc/decoder/CoRREDecoder.java b/java/src/com/tightvnc/decoder/CoRREDecoder.java
index 56cb7ab67fad17b7d7576b8241a896b7258e5676..3ab437af000b6c842b9b3c06d16d7f7ffe1bfb99 100644 (file)
--- a/java/src/com/tightvnc/decoder/CoRREDecoder.java
+++ b/java/src/com/tightvnc/decoder/CoRREDecoder.java
@@ -43,13 +43,13 @@ public class CoRREDecoder extends RawDecoder {
     rfbis.readFully(buf);
 
     //
-    // Save decoded data to RecordInterface
+    // Save decoded data to data output stream
     //
 
-    if (rec.canWrite()) {
-      rec.writeIntBE(nSubrects);
-      rec.write(bg_buf);
-      rec.write(buf);
+    if (dos != null) {
+      dos.writeInt(nSubrects);
+      dos.write(bg_buf);
+      dos.write(buf);
     }
 
     int sx, sy, sw, sh;

diff --git a/java/src/com/tightvnc/decoder/HextileDecoder.java b/java/src/com/tightvnc/decoder/HextileDecoder.java
index adf59370416bbc50fb703b01c9e1f434660388d9..1e4ef0933f1daed5d64d7245e4103679c8f050a8 100644 (file)
--- a/java/src/com/tightvnc/decoder/HextileDecoder.java
+++ b/java/src/com/tightvnc/decoder/HextileDecoder.java
@@ -76,11 +76,11 @@ public class HextileDecoder extends RawDecoder {
     int subencoding = rfbis.readU8();
 
     //
-    // Save decoded data to RecordInterface
+    // Save decoded data to data output stream
     //
 
-    if (rec.canWrite()) {
-      rec.writeByte((byte)subencoding);
+    if (dos != null) {
+      dos.writeByte((byte)subencoding);
     }
 
     // Is it a raw-encoded sub-rectangle?
@@ -102,11 +102,11 @@ public class HextileDecoder extends RawDecoder {
       }
 
       //
-      // Save decoded data to RecordInterface
+      // Save decoded data to data output stream
       //
 
-      if (rec.canWrite()) {
-        rec.write(cbuf);
+      if (dos != null) {
+        dos.write(cbuf);
       }
     }
     graphics.setColor(hextile_bg);
@@ -122,11 +122,11 @@ public class HextileDecoder extends RawDecoder {
       }
 
       //
-      // Save decoded data to RecordInterface
+      // Save decoded data to data output stream
       //
 
-      if (rec.canWrite()) {
-        rec.write(cbuf);
+      if (dos != null) {
+        dos.write(cbuf);
       }
     }
 
@@ -143,12 +143,12 @@ public class HextileDecoder extends RawDecoder {
     rfbis.readFully(buf);
 
     //
-    // Save decoded data to RecordInterface
+    // Save decoded data to data output stream
     //
 
-    if (rec.canWrite()) {
-      rec.writeByte((byte)nSubrects);
-      rec.write(buf);
+    if (dos != null) {
+      dos.writeByte((byte)nSubrects);
+      dos.write(buf);
     }
 
     int b1, b2, sx, sy, sw, sh;

diff --git a/java/src/com/tightvnc/decoder/RREDecoder.java b/java/src/com/tightvnc/decoder/RREDecoder.java
index ce70606d063ea6056f39d7d8d8eead280d958ae2..72a5fdfbc2f336d40ca58ff60af9c88d62cf60cd 100644 (file)
--- a/java/src/com/tightvnc/decoder/RREDecoder.java
+++ b/java/src/com/tightvnc/decoder/RREDecoder.java
@@ -44,12 +44,12 @@ public class RREDecoder extends RawDecoder {
     DataInputStream ds = new DataInputStream(new ByteArrayInputStream(buf));
 
     //
-    // Save decoded data to RecordInterface
+    // Save decoded data to data output stream
     //
-    if (rec.canWrite()) {
-      rec.writeIntBE(nSubrects);
-      rec.write(bg_buf);
-      rec.write(buf);
+    if (dos != null) {
+      dos.writeInt(nSubrects);
+      dos.write(bg_buf);
+      dos.write(buf);
     }
 
     int sx, sy, sw, sh;