diff options
| -rw-r--r-- | jill/rsc/jill.properties | 4 | ||||
| -rw-r--r-- | jill/src/com/android/jill/Main.java | 7 | ||||
| -rw-r--r-- | jill/src/com/android/jill/backend/jayce/Token.java | 2 | ||||
| -rw-r--r-- | jill/src/com/android/jill/frontend/java/AnnotationWriter.java | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/jill/rsc/jill.properties b/jill/rsc/jill.properties index e863058..a33854a 100644 --- a/jill/rsc/jill.properties +++ b/jill/rsc/jill.properties @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -jill.version=1.1-a9 +jill.version=1.1-a12 jill.version.release.name=Brest jill.version.release.code=2 jill.version.sub-release.kind=ALPHA -jill.version.sub-release.code=9 +jill.version.sub-release.code=13 # These properties are added by the release step # jill.version.buildid=<BUILDID> diff --git a/jill/src/com/android/jill/Main.java b/jill/src/com/android/jill/Main.java index dce329a..1843365 100644 --- a/jill/src/com/android/jill/Main.java +++ b/jill/src/com/android/jill/Main.java @@ -21,6 +21,7 @@ import com.android.sched.util.location.NoLocation; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; +import org.kohsuke.args4j.ParserProperties; import java.io.IOException; import java.util.ArrayList; @@ -46,7 +47,7 @@ public class Main { if (options.askForVersion()) { System.out.println("Jill"); - System.out.println("Version: " + Jill.getVersion().getVersion() + '.'); + System.out.println("Version: " + Jill.getVersion().getVerboseVersion() + '.'); System.exit(ExitStatus.SUCCESS); } @@ -90,8 +91,8 @@ public class Main { Options options = new Options(); - CmdLineParser parser = new CmdLineParser(options); - parser.setUsageWidth(100); + CmdLineParser parser = + new CmdLineParser(options, ParserProperties.defaults().withUsageWidth(100)); TokenIterator iterator = new TokenIterator(new NoLocation(), args); List<String> list = new ArrayList<String>(); diff --git a/jill/src/com/android/jill/backend/jayce/Token.java b/jill/src/com/android/jill/backend/jayce/Token.java index e7c8f2f..d1113a5 100644 --- a/jill/src/com/android/jill/backend/jayce/Token.java +++ b/jill/src/com/android/jill/backend/jayce/Token.java @@ -45,7 +45,7 @@ public enum Token { ADD_OPERATION("+"), ALLOC("alloc"), AND_OPERATION("&&"), - ANNOTATION_LITERAL("annotation-literal"), + ANNOTATION("annotation-literal"), ANNOTATION_METHOD("annotation-method"), ANNOTATION_TYPE("annotation"), ARRAY_LENGTH("array-length"), diff --git a/jill/src/com/android/jill/frontend/java/AnnotationWriter.java b/jill/src/com/android/jill/frontend/java/AnnotationWriter.java index 97b97ea..4bb366e 100644 --- a/jill/src/com/android/jill/frontend/java/AnnotationWriter.java +++ b/jill/src/com/android/jill/frontend/java/AnnotationWriter.java @@ -181,7 +181,7 @@ public class AnnotationWriter extends JillWriter { private void writeAnnotation(@Nonnull AnnotationNode anno, @Nonnull RetentionPolicy retentionPolicy) throws IOException { sourceInfoWriter.writeUnknwonDebugBegin(); - writer.writeKeyword(Token.ANNOTATION_LITERAL); + writer.writeKeyword(Token.ANNOTATION); writer.writeOpen(); writer.writeRetentionPolicyEnum(retentionPolicy); writer.writeId(anno.desc); |