Gracefully handle duplicate methods and fields in baksmali

baksmali will emit duplicate methods and fields as commented blocks, when it
is safe to do so.

util/src/main/java/org/jf/util/CommentingIndentingWriter.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2012, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jf.util;
+
+import java.io.IOException;
+import java.io.Writer;
+
+public class CommentingIndentingWriter extends IndentingWriter {
+    private final String commentStr;
+
+    public CommentingIndentingWriter(Writer writer, String commentStr) {
+        super(writer);
+        this.commentStr = commentStr;
+    }
+
+    protected void writeLineStart() throws IOException {
+        writer.write(commentStr);
+    }
+}

util/src/main/java/org/jf/util/IndentingWriter.java

@@ -32,27 +32,37 @@ import java.io.IOException;
 import java.io.Writer;
 
 public class IndentingWriter extends Writer {
-    private final Writer writer;
-    private final char[] buffer = new char[16];
-    private int indentLevel = 0;
-    private boolean beginningOfLine;
+    protected final Writer writer;
+    protected final char[] buffer = new char[16];
+    protected int indentLevel = 0;
+    private boolean beginningOfLine = true;
     private static final String newLine = System.getProperty("line.separator");
 
     public IndentingWriter(Writer writer) {
         this.writer = writer;
     }
 
+    protected void writeLineStart() throws IOException {
+    }
+
+    protected void writeIndent() throws IOException {
+        for (int i=0; i<indentLevel; i++) {
+            writer.write(' ');
+        }
+    }
+
     @Override
     public void write(int chr) throws IOException {
         //synchronized(lock) {
+            if (beginningOfLine) {
+                writeLineStart();
+            }
             if (chr == '\n') {
                 writer.write(newLine);
                 beginningOfLine = true;
             } else {
                 if (beginningOfLine) {
-                    for (int i=0; i<indentLevel; i++) {
-                       writer.write(' ');
-                    }
+                    writeIndent();
                 }
                 beginningOfLine = false;
                 writer.write(chr);