Move the IndentingWriter class to the util project

git-svn-id: https://smali.googlecode.com/svn/trunk@788 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
This commit is contained in:
JesusFreke@JesusFreke.com
2010-08-17 13:27:58 +00:00
parent bbf4dbba61
commit 4b72225e9d
35 changed files with 36 additions and 35 deletions

View File

@ -29,7 +29,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.Adaptors.EncodedValue.AnnotationEncodedValueAdaptor; import org.jf.baksmali.Adaptors.EncodedValue.AnnotationEncodedValueAdaptor;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.AnnotationItem; import org.jf.dexlib.AnnotationItem;
import org.jf.dexlib.AnnotationSetItem; import org.jf.dexlib.AnnotationSetItem;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
//a "spacer" between instructions //a "spacer" between instructions
public class BlankMethodItem extends MethodItem { public class BlankMethodItem extends MethodItem {

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.TypeIdItem; import org.jf.dexlib.TypeIdItem;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.*; import org.jf.dexlib.*;
import org.jf.dexlib.Code.Analysis.ValidationException; import org.jf.dexlib.Code.Analysis.ValidationException;
import org.jf.dexlib.Code.Format.Instruction21c; import org.jf.dexlib.Code.Format.Instruction21c;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.CodeItem; import org.jf.dexlib.CodeItem;
import org.jf.dexlib.StringIdItem; import org.jf.dexlib.StringIdItem;
import org.jf.dexlib.TypeIdItem; import org.jf.dexlib.TypeIdItem;

View File

@ -29,7 +29,7 @@
package org.jf.baksmali.Adaptors.EncodedValue; package org.jf.baksmali.Adaptors.EncodedValue;
import org.jf.baksmali.Adaptors.ReferenceFormatter; import org.jf.baksmali.Adaptors.ReferenceFormatter;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.EncodedValue.AnnotationEncodedSubValue; import org.jf.dexlib.EncodedValue.AnnotationEncodedSubValue;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors.EncodedValue; package org.jf.baksmali.Adaptors.EncodedValue;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.EncodedValue.ArrayEncodedValue; import org.jf.dexlib.EncodedValue.ArrayEncodedValue;
import org.jf.dexlib.EncodedValue.EncodedValue; import org.jf.dexlib.EncodedValue.EncodedValue;

View File

@ -29,7 +29,7 @@
package org.jf.baksmali.Adaptors.EncodedValue; package org.jf.baksmali.Adaptors.EncodedValue;
import org.jf.baksmali.Adaptors.ReferenceFormatter; import org.jf.baksmali.Adaptors.ReferenceFormatter;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.baksmali.Renderers.*; import org.jf.baksmali.Renderers.*;
import org.jf.dexlib.EncodedValue.*; import org.jf.dexlib.EncodedValue.*;

View File

@ -29,7 +29,7 @@
package org.jf.baksmali.Adaptors.EncodedValue; package org.jf.baksmali.Adaptors.EncodedValue;
import org.jf.baksmali.Adaptors.ReferenceFormatter; import org.jf.baksmali.Adaptors.ReferenceFormatter;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.FieldIdItem; import org.jf.dexlib.FieldIdItem;
import java.io.IOException; import java.io.IOException;

View File

@ -29,7 +29,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.Adaptors.EncodedValue.EncodedValueAdaptor; import org.jf.baksmali.Adaptors.EncodedValue.EncodedValueAdaptor;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.AnnotationSetItem; import org.jf.dexlib.AnnotationSetItem;
import org.jf.dexlib.ClassDataItem; import org.jf.dexlib.ClassDataItem;
import org.jf.dexlib.EncodedValue.EncodedValue; import org.jf.dexlib.EncodedValue.EncodedValue;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors.Format; package org.jf.baksmali.Adaptors.Format;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.baksmali.Renderers.ByteRenderer; import org.jf.baksmali.Renderers.ByteRenderer;
import org.jf.dexlib.Code.Format.ArrayDataPseudoInstruction; import org.jf.dexlib.Code.Format.ArrayDataPseudoInstruction;
import org.jf.dexlib.CodeItem; import org.jf.dexlib.CodeItem;

View File

@ -31,7 +31,7 @@ package org.jf.baksmali.Adaptors.Format;
import org.jf.baksmali.Adaptors.MethodItem; import org.jf.baksmali.Adaptors.MethodItem;
import org.jf.baksmali.Adaptors.ReferenceFormatter; import org.jf.baksmali.Adaptors.ReferenceFormatter;
import org.jf.baksmali.Adaptors.RegisterFormatter; import org.jf.baksmali.Adaptors.RegisterFormatter;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.baksmali.Renderers.LongRenderer; import org.jf.baksmali.Renderers.LongRenderer;
import org.jf.dexlib.Code.*; import org.jf.dexlib.Code.*;
import org.jf.dexlib.CodeItem; import org.jf.dexlib.CodeItem;

View File

@ -30,7 +30,7 @@ package org.jf.baksmali.Adaptors.Format;
import org.jf.baksmali.Adaptors.LabelMethodItem; import org.jf.baksmali.Adaptors.LabelMethodItem;
import org.jf.baksmali.Adaptors.MethodDefinition; import org.jf.baksmali.Adaptors.MethodDefinition;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.Code.Instruction; import org.jf.dexlib.Code.Instruction;
import org.jf.dexlib.Code.OffsetInstruction; import org.jf.dexlib.Code.OffsetInstruction;
import org.jf.dexlib.Code.Opcode; import org.jf.dexlib.Code.Opcode;

View File

@ -30,7 +30,7 @@ package org.jf.baksmali.Adaptors.Format;
import org.jf.baksmali.Adaptors.LabelMethodItem; import org.jf.baksmali.Adaptors.LabelMethodItem;
import org.jf.baksmali.Adaptors.MethodDefinition; import org.jf.baksmali.Adaptors.MethodDefinition;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.baksmali.Renderers.IntegerRenderer; import org.jf.baksmali.Renderers.IntegerRenderer;
import org.jf.dexlib.Code.Format.PackedSwitchDataPseudoInstruction; import org.jf.dexlib.Code.Format.PackedSwitchDataPseudoInstruction;
import org.jf.dexlib.CodeItem; import org.jf.dexlib.CodeItem;

View File

@ -30,7 +30,7 @@ package org.jf.baksmali.Adaptors.Format;
import org.jf.baksmali.Adaptors.LabelMethodItem; import org.jf.baksmali.Adaptors.LabelMethodItem;
import org.jf.baksmali.Adaptors.MethodDefinition; import org.jf.baksmali.Adaptors.MethodDefinition;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.baksmali.Renderers.IntegerRenderer; import org.jf.baksmali.Renderers.IntegerRenderer;
import org.jf.dexlib.Code.Format.SparseSwitchDataPseudoInstruction; import org.jf.dexlib.Code.Format.SparseSwitchDataPseudoInstruction;
import org.jf.dexlib.CodeItem; import org.jf.dexlib.CodeItem;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors.Format; package org.jf.baksmali.Adaptors.Format;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.Code.Format.UnresolvedOdexInstruction; import org.jf.dexlib.Code.Format.UnresolvedOdexInstruction;
import org.jf.dexlib.CodeItem; import org.jf.dexlib.CodeItem;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.baksmali.baksmali; import org.jf.baksmali.baksmali;
import java.io.IOException; import java.io.IOException;

View File

@ -29,7 +29,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.Adaptors.Format.InstructionMethodItemFactory; import org.jf.baksmali.Adaptors.Format.InstructionMethodItemFactory;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.baksmali.baksmali; import org.jf.baksmali.baksmali;
import org.jf.dexlib.*; import org.jf.dexlib.*;
import org.jf.dexlib.Code.Analysis.AnalyzedInstruction; import org.jf.dexlib.Code.Analysis.AnalyzedInstruction;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.baksmali.baksmali; import org.jf.baksmali.baksmali;
import org.jf.baksmali.main; import org.jf.baksmali.main;
import org.jf.dexlib.ClassDataItem; import org.jf.dexlib.ClassDataItem;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.baksmali.baksmali; import org.jf.baksmali.baksmali;
import org.jf.baksmali.main; import org.jf.baksmali.main;
import org.jf.dexlib.ClassDataItem; import org.jf.dexlib.ClassDataItem;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.*; import org.jf.dexlib.*;
import org.jf.dexlib.Util.Utf8Utils; import org.jf.dexlib.Util.Utf8Utils;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Adaptors; package org.jf.baksmali.Adaptors;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.baksmali.baksmali; import org.jf.baksmali.baksmali;
import org.jf.dexlib.CodeItem; import org.jf.dexlib.CodeItem;
import org.jf.dexlib.Util.AccessFlags; import org.jf.dexlib.Util.AccessFlags;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Renderers; package org.jf.baksmali.Renderers;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Renderers; package org.jf.baksmali.Renderers;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Renderers; package org.jf.baksmali.Renderers;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import org.jf.dexlib.Util.Utf8Utils; import org.jf.dexlib.Util.Utf8Utils;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Renderers; package org.jf.baksmali.Renderers;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Renderers; package org.jf.baksmali.Renderers;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Renderers; package org.jf.baksmali.Renderers;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Renderers; package org.jf.baksmali.Renderers;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -28,7 +28,7 @@
package org.jf.baksmali.Renderers; package org.jf.baksmali.Renderers;
import org.jf.baksmali.IndentingWriter; import org.jf.util.IndentingWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -33,6 +33,7 @@ import org.jf.dexlib.ClassDefItem;
import org.jf.dexlib.Code.Analysis.ClassPath; import org.jf.dexlib.Code.Analysis.ClassPath;
import org.jf.dexlib.DexFile; import org.jf.dexlib.DexFile;
import org.jf.util.ClassFileNameHandler; import org.jf.util.ClassFileNameHandler;
import org.jf.util.IndentingWriter;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -26,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package org.jf.baksmali; package org.jf.util;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
@ -38,7 +38,7 @@ public class IndentingWriter extends Writer {
private boolean beginningOfLine; private boolean beginningOfLine;
private static final String newLine = System.getProperty("line.separator"); private static final String newLine = System.getProperty("line.separator");
protected IndentingWriter(Writer writer) { public IndentingWriter(Writer writer) {
this.writer = writer; this.writer = writer;
} }