Commit: 0ebc55b1d64d501fd959a402e191413f5023d5aa - packages-apps-AndroidTerm (git)

packages/apps/AndroidTerm

Commit MetaInfo

• Révision: 0ebc55b1d64d501fd959a402e191413f5023d5aa (tree)
• l'heure: 2012-03-26 10:21:27
• Auteur: Steven Luo <steven+android@stev...>
• Commiter: Jack Palevich

Message de Log

Move some getChar() logic from UnicodeTranscript into FullUnicodeLine

Signed-off-by: Jack Palevich <[e-mail]>

Change Summary

• modified: src/jackpal/androidterm/util/UnicodeTranscript.java

Modification

--- a/src/jackpal/androidterm/util/UnicodeTranscript.java
+++ b/src/jackpal/androidterm/util/UnicodeTranscript.java
@@ -691,19 +691,7 @@ public class UnicodeTranscript {
         }
 
         FullUnicodeLine line = (FullUnicodeLine) mLines[row];
-        char[] rawLine = line.getLine();
-        int pos = line.findStartOfColumn(column);
-        int length;
-        if (column + 1 < mColumns) {
-            length = line.findStartOfColumn(column + 1) - pos;
-        } else {
-            length = line.getSpaceUsed() - pos;
-        }
-        if (charIndex >= length) {
-            throw new IllegalArgumentException();
-        }
-        out[offset] = rawLine[pos + charIndex];
-        return (charIndex + 1 < length);
+        return line.getChar(column, charIndex, out, offset);
     }
 
     public int getForeColor(int row, int column) {
@@ -898,6 +886,21 @@ class FullUnicodeLine {
         }
     }
 
+    public boolean getChar(int column, int charIndex, char[] out, int offset) {
+        int pos = findStartOfColumn(column);
+        int length;
+        if (column + 1 < mColumns) {
+            length = findStartOfColumn(column + 1) - pos;
+        } else {
+            length = getSpaceUsed() - pos;
+        }
+        if (charIndex >= length) {
+            throw new IllegalArgumentException();
+        }
+        out[offset] = mText[pos + charIndex];
+        return (charIndex + 1 < length);
+    }
+
     public void setChar(int column, int codePoint) {
         int columns = mColumns;
         if (column < 0 || column >= columns) {