# HG changeset patch # User Carl Byington # Date 1451954296 28800 # Node ID 5ce5235adde63fecdb1486b49666a4cc78fbcd1f # Parent 8fa8e73e2f5c01936f9856931fc004225d942778 fix compile errors diff -r 8fa8e73e2f5c -r 5ce5235adde6 app/src/main/java/org/tn5250j/framework/tn5250/DataStreamDumper.java --- a/app/src/main/java/org/tn5250j/framework/tn5250/DataStreamDumper.java Mon Jan 04 15:52:25 2016 -0800 +++ b/app/src/main/java/org/tn5250j/framework/tn5250/DataStreamDumper.java Mon Jan 04 16:38:16 2016 -0800 @@ -30,6 +30,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.EOFException; import java.util.concurrent.atomic.AtomicInteger; import android.util.Log; diff -r 8fa8e73e2f5c -r 5ce5235adde6 app/src/main/java/org/tn5250j/framework/tn5250/DataStreamProducer.java --- a/app/src/main/java/org/tn5250j/framework/tn5250/DataStreamProducer.java Mon Jan 04 15:52:25 2016 -0800 +++ b/app/src/main/java/org/tn5250j/framework/tn5250/DataStreamProducer.java Mon Jan 04 16:38:16 2016 -0800 @@ -1,5 +1,7 @@ package org.tn5250j.framework.tn5250; +import org.tn5250j.encoding.ICodePage; + import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -88,7 +90,7 @@ Log.d(TAG, "loadStream() offset=" + offset + " partialLen=" + partialLen + " bufferLen=" + bufferLen); if (saveStream != null) { - log.debug("partial stream found"); + Log.d(TAG, "partial stream found"); bufferLen = saveStream.length + streamBuffer.length; byte[] inter = new byte[bufferLen]; System.arraycopy(saveStream, 0, inter, 0, saveStream.length); @@ -106,7 +108,7 @@ int buf_len = partialLen + 2; byte[] buf = new byte[buf_len]; if (isBufferShifted(partialLen, bufferLen) && isOpcodeShifted(streamBuffer, offset)) { - log.debug("Invalid stream buffer detected. Ignoring the inserted byte."); + Log.d(TAG, "Invalid stream buffer detected. Ignoring the inserted byte."); System.arraycopy(streamBuffer, offset, buf, 0, MINIMAL_PARTIAL_STREAM_LEN); System.arraycopy(streamBuffer, offset + MINIMAL_PARTIAL_STREAM_LEN + 1, buf, MINIMAL_PARTIAL_STREAM_LEN, partialLen); } else { @@ -261,3 +263,4 @@ dataStreamDumper.toggleDebug(codePage); } +} diff -r 8fa8e73e2f5c -r 5ce5235adde6 app/src/main/java/org/tn5250j/framework/tn5250/tnvt.java --- a/app/src/main/java/org/tn5250j/framework/tn5250/tnvt.java Mon Jan 04 15:52:25 2016 -0800 +++ b/app/src/main/java/org/tn5250j/framework/tn5250/tnvt.java Mon Jan 04 16:38:16 2016 -0800 @@ -1076,7 +1076,7 @@ } catch (RuntimeException e) { Log.w(TAG, " tnvt.run: " + e.getMessage()); - exd.printStackTrace(); + e.printStackTrace(); } if (pendingUnlock && !screen52.isStatusErrorCode()) { @@ -1104,7 +1104,7 @@ int rows = screen52.getRows(); int cols = screen52.getColumns(); byte screenArray[] = new byte[rows * cols]; - fillScreenArray(screenArray, rows, cols); + fillScreenArray(screenArray); Log.i(TAG, "readScreen() writeGDS()"); writeGDS(0, 0, screenArray); }