Use String instead of JStringLiteral in ThisRefTypeInfo and OriginalTypeInfo.

Change-Id: Ic65c1eeaae659d6f404e4e9241d3eafa3f7644be

3 files changed, 8 insertions, 10 deletions

diff --git a/jill/src/com/android/jill/frontend/java/ClassNodeWriter.java b/jill/src/com/android/jill/frontend/java/ClassNodeWriter.java
index 680391d..4aa3f8d 100644
--- a/jill/src/com/android/jill/frontend/java/ClassNodeWriter.java
+++ b/jill/src/com/android/jill/frontend/java/ClassNodeWriter.java
@@ -168,7 +168,7 @@ public class ClassNodeWriter extends JillWriter {
     if (thisRefSignature != null) {
       writer.writeKeyword(Token.THIS_REF_TYPE_INFO);
       writer.writeOpen();
-      writeValue(thisRefSignature);
+      writer.writeString(thisRefSignature);
       writer.writeClose();
     }
   }
@@ -177,9 +177,9 @@ public class ClassNodeWriter extends JillWriter {
     writer.writeKeyword(Token.ORIGINAL_TYPE_INFO);
     writer.writeOpen();
     if (AsmHelper.isGenericSignature(cn)) {
-      writeValue(cn.signature);
+      writer.writeString(cn.signature);
     } else {
-      writer.writeNull();
+      writer.writeString(null);
     }
     writer.writeString(AsmHelper.getSourceName(cn));
     writer.writeClose();
@@ -189,8 +189,7 @@ public class ClassNodeWriter extends JillWriter {
     if (fn.signature != null) {
       writer.writeKeyword(Token.ORIGINAL_TYPE_INFO);
       writer.writeOpen();
-      writeValue(fn.signature);
-//      writer.writeNull(); // Source name not set
+      writer.writeString(fn.signature);
       writer.writeString(null);
       writer.writeClose();
     } else {
diff --git a/jill/src/com/android/jill/frontend/java/JavaTransformer.java b/jill/src/com/android/jill/frontend/java/JavaTransformer.java
index 272eaa1..e1c871e 100644
--- a/jill/src/com/android/jill/frontend/java/JavaTransformer.java
+++ b/jill/src/com/android/jill/frontend/java/JavaTransformer.java
@@ -280,7 +280,7 @@ public class JavaTransformer {
     JayceWriter writer = new JayceWriter(os);
 
       writer.writeHeader(
-          "jayce(2.10 \"" + Jill.FILE_ENCODING + "\" \"Jill version : " + version + "\")");
+          "jayce(2.11 \"" + Jill.FILE_ENCODING + "\" \"Jill version : " + version + "\")");
 
       return writer;
   }
diff --git a/jill/src/com/android/jill/frontend/java/MethodBodyWriter.java b/jill/src/com/android/jill/frontend/java/MethodBodyWriter.java
index a2f748c..16db06b 100644
--- a/jill/src/com/android/jill/frontend/java/MethodBodyWriter.java
+++ b/jill/src/com/android/jill/frontend/java/MethodBodyWriter.java
@@ -282,8 +282,7 @@ public class MethodBodyWriter extends JillWriter implements Opcodes {
     if (currentMethod.signature != null) {
       writer.writeKeyword(Token.ORIGINAL_TYPE_INFO);
       writer.writeOpen();
-      writeValue(currentMethod.signature);
-      //writer.writeNull(); // Source name not set.
+      writer.writeString(currentMethod.signature);
       writer.writeString(null);
       writer.writeClose();
     } else {
@@ -1969,7 +1968,7 @@ public class MethodBodyWriter extends JillWriter implements Opcodes {
     if (v.hasSignature()) {
       writer.writeKeyword(Token.ORIGINAL_TYPE_INFO); // Marker original type info
       writer.writeOpen();
-      writeValue(v.getSignature());
+      writer.writeString(v.getSignature());
       writer.writeString(AsmHelper.getSourceName(currentClass));
       writer.writeClose();
     }
@@ -2209,7 +2208,7 @@ public class MethodBodyWriter extends JillWriter implements Opcodes {
     if (param.hasSignature()) {
       writer.writeKeyword(Token.ORIGINAL_TYPE_INFO); // Marker original type info
       writer.writeOpen();
-      writeValue(param.getSignature());
+      writer.writeString(param.getSignature());
       writer.writeString(AsmHelper.getSourceName(currentClass));
       writer.writeClose();
     }