ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-21 16:37:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

use createTemplate and createReference instead of makeTemplate and makeReference

Browse Source 
git-svn-id: https://smali.googlecode.com/svn/trunk@534 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
This commit is contained in:
JesusFreke@JesusFreke.com 2009-12-31 01:25:19 +00:00
parent 81ab1aa726
commit 7d9b1b10f0
28 changed files with 60 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/AnnotationAdaptor.java
View File

@ -37,7 +37,7 @@ import org.antlr.stringtemplate.StringTemplate;
import java.util.List;
public class AnnotationAdaptor {
public static StringTemplate makeTemplate(StringTemplateGroup stg, AnnotationItem annotationItem) {
public static StringTemplate createTemplate(StringTemplateGroup stg, AnnotationItem annotationItem) {
StringTemplate template = stg.getInstanceOf("annotation");
template.setAttribute("Visibility", annotationItem.getVisibility().name().toLowerCase());

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/CatchMethodItem.java
View File

@ -87,7 +87,7 @@ public class CatchMethodItem extends MethodItem {
public String toString() {
StringTemplate template = stg.getInstanceOf(getTemplateName());
if (exceptionType != null) {
template.setAttribute("ExceptionType", TypeReference.makeTemplate(stg, exceptionType));
template.setAttribute("ExceptionType", TypeReference.createTemplate(stg, exceptionType));
}
template.setAttribute("StartLabel", tryStartLabel);
template.setAttribute("EndLabel", tryEndLabel);

11
baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java
View File

@ -30,10 +30,7 @@ package org.jf.baksmali.Adaptors;
import org.jf.dexlib.EncodedValue.EncodedValue;
import org.jf.dexlib.*;
import org.jf.dexlib.Code.InstructionIterator;
import org.jf.dexlib.Code.Opcode;
import org.jf.dexlib.Code.Instruction;
import org.jf.dexlib.Code.Format.Format;
import org.jf.dexlib.Code.Format.Instruction21c;
import org.jf.dexlib.Util.AccessFlags;
import org.jf.dexlib.Util.SparseArray;
@ -61,7 +58,7 @@ public class ClassDefinition {
findFieldsSetInStaticConstructor();
}
public StringTemplate makeTemplate() {
public StringTemplate createTemplate() {
StringTemplate template = stg.getInstanceOf("smaliFile");
template.setAttribute("AccessFlags", getAccessFlags());
@ -195,7 +192,7 @@ public class ClassDefinition {
List<StringTemplate> annotations = new ArrayList<StringTemplate>();
for (AnnotationItem annotationItem: annotationSet.getAnnotations()) {
annotations.add(AnnotationAdaptor.makeTemplate(stg, annotationItem));
annotations.add(AnnotationAdaptor.createTemplate(stg, annotationItem));
}
return annotations;
}
@ -252,7 +249,7 @@ public class ClassDefinition {
for (ClassDataItem.EncodedMethod method: classDataItem.getDirectMethods()) {
AnnotationSetItem annotationSet = methodAnnotationsMap.get(method.method.getIndex());
AnnotationSetRefList parameterAnnotationList = parameterAnnotationsMap.get(method.method.getIndex());
directMethods.add(MethodDefinition.makeTemplate(stg, method, annotationSet, parameterAnnotationList));
directMethods.add(MethodDefinition.createTemplate(stg, method, annotationSet, parameterAnnotationList));
}
}
@ -266,7 +263,7 @@ public class ClassDefinition {
for (ClassDataItem.EncodedMethod method: classDataItem.getVirtualMethods()) {
AnnotationSetItem annotationSet = methodAnnotationsMap.get(method.method.getIndex());
AnnotationSetRefList parameterAnnotationList = parameterAnnotationsMap.get(method.method.getIndex());
virtualMethods.add(MethodDefinition.makeTemplate(stg, method, annotationSet, parameterAnnotationList));
virtualMethods.add(MethodDefinition.createTemplate(stg, method, annotationSet, parameterAnnotationList));
}
}

8
baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/AnnotationEncodedValueAdaptor.java
View File

@ -40,16 +40,16 @@ import java.util.ArrayList;
public abstract class AnnotationEncodedValueAdaptor {
public static StringTemplate makeTemplate(StringTemplateGroup stg, AnnotationEncodedSubValue encodedAnnotation) {
public static StringTemplate createTemplate(StringTemplateGroup stg, AnnotationEncodedSubValue encodedAnnotation) {
StringTemplate template = stg.getInstanceOf("AnnotationEncodedValue");
template.setAttribute("AnnotationType", TypeReference.makeTemplate(stg, encodedAnnotation.annotationType));
template.setAttribute("AnnotationType", TypeReference.createTemplate(stg, encodedAnnotation.annotationType));
template.setAttribute("Elements", getElements(stg, encodedAnnotation));
return template;
}
public static void setAttributesForAnnotation(StringTemplate template,
AnnotationEncodedSubValue encodedAnnotation) {
template.setAttribute("AnnotationType", TypeReference.makeTemplate(template.getGroup(),
template.setAttribute("AnnotationType", TypeReference.createTemplate(template.getGroup(),
encodedAnnotation.annotationType));
template.setAttribute("Elements", getElements(template.getGroup(), encodedAnnotation));
}
@ -70,7 +70,7 @@ public abstract class AnnotationEncodedValueAdaptor {
public static String toString(StringTemplateGroup stg, StringIdItem name, EncodedValue value) {
StringTemplate template = stg.getInstanceOf("AnnotationElement");
template.setAttribute("Name", name);
template.setAttribute("Value", EncodedValueAdaptor.make(stg, value));
template.setAttribute("Value", EncodedValueAdaptor.create(stg, value));
return template.toString();
}
}

4
baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/ArrayEncodedValueAdaptor.java
View File

@ -37,7 +37,7 @@ import java.util.List;
import java.util.ArrayList;
public class ArrayEncodedValueAdaptor {
public static StringTemplate makeTemplate(StringTemplateGroup stg, ArrayEncodedValue encodedArray) {
public static StringTemplate createTemplate(StringTemplateGroup stg, ArrayEncodedValue encodedArray) {
StringTemplate template = stg.getInstanceOf("ArrayEncodedValue");
template.setAttribute("Value", getValue(stg, encodedArray));
return template;
@ -47,7 +47,7 @@ public class ArrayEncodedValueAdaptor {
List<StringTemplate> encodedValues = new ArrayList<StringTemplate>();
for (EncodedValue encodedValue: encodedArray.values) {
encodedValues.add(EncodedValueAdaptor.make(stg, encodedValue));
encodedValues.add(EncodedValueAdaptor.create(stg, encodedValue));
}
return encodedValues;
}

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/EncodedIndexedItemAdaptor.java
View File

@ -33,7 +33,7 @@ import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup;
public class EncodedIndexedItemAdaptor {
public static StringTemplate makeTemplate(StringTemplateGroup stg, StringTemplate reference) {
public static StringTemplate createTemplate(StringTemplateGroup stg, StringTemplate reference) {
StringTemplate template = stg.getInstanceOf("EncodedIndexedItemReference");
template.setAttribute("Value", reference);
return template;

36
baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/EncodedValueAdaptor.java
View File

@ -34,44 +34,44 @@ import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup;
public abstract class EncodedValueAdaptor {
public static StringTemplate make(StringTemplateGroup stg, EncodedValue encodedValue) {
public static StringTemplate create(StringTemplateGroup stg, EncodedValue encodedValue) {
switch (encodedValue.getValueType()) {
case VALUE_ANNOTATION:
return AnnotationEncodedValueAdaptor.makeTemplate(stg, (AnnotationEncodedValue)encodedValue);
return AnnotationEncodedValueAdaptor.createTemplate(stg, (AnnotationEncodedValue)encodedValue);
case VALUE_ARRAY:
return ArrayEncodedValueAdaptor.makeTemplate(stg, (ArrayEncodedValue)encodedValue);
return ArrayEncodedValueAdaptor.createTemplate(stg, (ArrayEncodedValue)encodedValue);
case VALUE_BOOLEAN:
return SimpleEncodedValueAdaptor.makeTemplate(stg, ((BooleanEncodedValue)encodedValue).value);
return SimpleEncodedValueAdaptor.createTemplate(stg, ((BooleanEncodedValue)encodedValue).value);
case VALUE_BYTE:
return SimpleEncodedValueAdaptor.makeTemplate(stg, ((ByteEncodedValue)encodedValue).value);
return SimpleEncodedValueAdaptor.createTemplate(stg, ((ByteEncodedValue)encodedValue).value);
case VALUE_CHAR:
return SimpleEncodedValueAdaptor.makeTemplate(stg, ((CharEncodedValue)encodedValue).value);
return SimpleEncodedValueAdaptor.createTemplate(stg, ((CharEncodedValue)encodedValue).value);
case VALUE_DOUBLE:
return SimpleEncodedValueAdaptor.makeTemplate(stg, ((DoubleEncodedValue)encodedValue).value);
return SimpleEncodedValueAdaptor.createTemplate(stg, ((DoubleEncodedValue)encodedValue).value);
case VALUE_ENUM:
return EnumEncodedValueAdaptor.makeTemplate(stg,
FieldReference.makeTemplate(stg, ((EnumEncodedValue)encodedValue).value));
return EnumEncodedValueAdaptor.createTemplate(stg,
FieldReference.createTemplate(stg, ((EnumEncodedValue)encodedValue).value));
case VALUE_FIELD:
return EncodedIndexedItemAdaptor.makeTemplate(stg, FieldReference.makeTemplate(stg,
return EncodedIndexedItemAdaptor.createTemplate(stg, FieldReference.createTemplate(stg,
((FieldEncodedValue)encodedValue).value));
case VALUE_FLOAT:
return SimpleEncodedValueAdaptor.makeTemplate(stg, ((FloatEncodedValue)encodedValue).value);
return SimpleEncodedValueAdaptor.createTemplate(stg, ((FloatEncodedValue)encodedValue).value);
case VALUE_INT:
return SimpleEncodedValueAdaptor.makeTemplate(stg, ((IntEncodedValue)encodedValue).value);
return SimpleEncodedValueAdaptor.createTemplate(stg, ((IntEncodedValue)encodedValue).value);
case VALUE_LONG:
return SimpleEncodedValueAdaptor.makeTemplate(stg, ((LongEncodedValue)encodedValue).value);
return SimpleEncodedValueAdaptor.createTemplate(stg, ((LongEncodedValue)encodedValue).value);
case VALUE_METHOD:
return EncodedIndexedItemAdaptor.makeTemplate(stg, MethodReference.makeTemplate(stg,
return EncodedIndexedItemAdaptor.createTemplate(stg, MethodReference.createTemplate(stg,
((MethodEncodedValue)encodedValue).value));
case VALUE_NULL:
return SimpleEncodedValueAdaptor.makeTemplate(stg, "null");
return SimpleEncodedValueAdaptor.createTemplate(stg, "null");
case VALUE_SHORT:
return SimpleEncodedValueAdaptor.makeTemplate(stg, ((ShortEncodedValue)encodedValue).value);
return SimpleEncodedValueAdaptor.createTemplate(stg, ((ShortEncodedValue)encodedValue).value);
case VALUE_STRING:
return EncodedIndexedItemAdaptor.makeTemplate(stg, StringReference.makeTemplate(stg,
return EncodedIndexedItemAdaptor.createTemplate(stg, StringReference.createTemplate(stg,
((StringEncodedValue)encodedValue).value));
case VALUE_TYPE:
return EncodedIndexedItemAdaptor.makeTemplate(stg, TypeReference.makeTemplate(stg,
return EncodedIndexedItemAdaptor.createTemplate(stg, TypeReference.createTemplate(stg,
((TypeEncodedValue)encodedValue).value));
}
return null;

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/EnumEncodedValueAdaptor.java
View File

@ -33,7 +33,7 @@ import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup;
public class EnumEncodedValueAdaptor {
public static StringTemplate makeTemplate(StringTemplateGroup stg, StringTemplate fieldReference) {
public static StringTemplate createTemplate(StringTemplateGroup stg, StringTemplate fieldReference) {
StringTemplate template = stg.getInstanceOf("EnumEncodedValue");
template.setAttribute("Value", fieldReference);
return template;

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/SimpleEncodedValueAdaptor.java
View File

@ -32,7 +32,7 @@ import org.antlr.stringtemplate.StringTemplateGroup;
import org.antlr.stringtemplate.StringTemplate;
public class SimpleEncodedValueAdaptor {
public static StringTemplate makeTemplate(StringTemplateGroup stg, Object value) {
public static StringTemplate createTemplate(StringTemplateGroup stg, Object value) {
StringTemplate template = stg.getInstanceOf("SimpleEncodedValue");
template.setAttribute("Value", value);
return template;

4
baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java
View File

@ -71,7 +71,7 @@ public class FieldDefinition {
}
if (initialValue != null) {
template.setAttribute("InitialValue", EncodedValueAdaptor.make(stg, initialValue));
template.setAttribute("InitialValue", EncodedValueAdaptor.create(stg, initialValue));
}
return template;
@ -100,7 +100,7 @@ public class FieldDefinition {
List<StringTemplate> annotationAdaptors = new ArrayList<StringTemplate>();
for (AnnotationItem annotationItem: annotationSet.getAnnotations()) {
annotationAdaptors.add(AnnotationAdaptor.makeTemplate(stg, annotationItem));
annotationAdaptors.add(AnnotationAdaptor.createTemplate(stg, annotationItem));
}
return annotationAdaptors;
}

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21cMethodItem.java
View File

@ -41,7 +41,7 @@ public class Instruction21cMethodItem extends InstructionFormatMethodItem<Instru
}
protected void setAttributes(StringTemplate template) {
template.setAttribute("Reference", Reference.makeReference(template.getGroup(),
template.setAttribute("Reference", Reference.createReference(template.getGroup(),
instruction.getReferencedItem()));
template.setAttribute("Register", formatRegister(instruction.getRegisterA()));
}

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22cMethodItem.java
View File

@ -41,7 +41,7 @@ public class Instruction22cMethodItem extends InstructionFormatMethodItem<Instru
}
protected void setAttributes(StringTemplate template) {
template.setAttribute("Reference", Reference.makeReference(template.getGroup(),
template.setAttribute("Reference", Reference.createReference(template.getGroup(),
instruction.getReferencedItem()));
template.setAttribute("RegisterA", formatRegister(instruction.getRegisterA()));
template.setAttribute("RegisterB", formatRegister(instruction.getRegisterB()));

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22csfMethodItem.java
View File

@ -41,7 +41,7 @@ public class Instruction22csfMethodItem extends InstructionFormatMethodItem<Inst
}
protected void setAttributes(StringTemplate template) {
template.setAttribute("Reference", Reference.makeReference(template.getGroup(),
template.setAttribute("Reference", Reference.createReference(template.getGroup(),
instruction.getReferencedItem()));
template.setAttribute("RegisterA", formatRegister(instruction.getRegisterA()));
template.setAttribute("RegisterB", formatRegister(instruction.getRegisterB()));

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31cMethodItem.java
View File

@ -41,7 +41,7 @@ public class Instruction31cMethodItem extends InstructionFormatMethodItem<Instru
}
protected void setAttributes(StringTemplate template) {
template.setAttribute("Reference", Reference.makeReference(template.getGroup(),
template.setAttribute("Reference", Reference.createReference(template.getGroup(),
instruction.getReferencedItem()));
template.setAttribute("Register", formatRegister(instruction.getRegisterA()));
}

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35cMethodItem.java
View File

@ -41,7 +41,7 @@ public class Instruction35cMethodItem extends InstructionFormatMethodItem<Instru
}
protected void setAttributes(StringTemplate template) {
template.setAttribute("Reference", Reference.makeReference(template.getGroup(),
template.setAttribute("Reference", Reference.createReference(template.getGroup(),
instruction.getReferencedItem()));
setRegistersAttribute(template);
}

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35msfMethodItem.java
View File

@ -41,7 +41,7 @@ public class Instruction35msfMethodItem extends InstructionFormatMethodItem<Inst
}
protected void setAttributes(StringTemplate template) {
template.setAttribute("Reference", Reference.makeReference(template.getGroup(),
template.setAttribute("Reference", Reference.createReference(template.getGroup(),
instruction.getReferencedItem()));
setRegistersAttribute(template);
}

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35sMethodItem.java
View File

@ -41,7 +41,7 @@ public class Instruction35sMethodItem extends InstructionFormatMethodItem<Instru
}
protected void setAttributes(StringTemplate template) {
template.setAttribute("Reference", Reference.makeReference(template.getGroup(),
template.setAttribute("Reference", Reference.createReference(template.getGroup(),
instruction.getReferencedItem()));
setRegistersAttribute(template);
}

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35sfMethodItem.java
View File

@ -41,7 +41,7 @@ public class Instruction35sfMethodItem extends InstructionFormatMethodItem<Instr
}
protected void setAttributes(StringTemplate template) {
template.setAttribute("Reference", Reference.makeReference(template.getGroup(),
template.setAttribute("Reference", Reference.createReference(template.getGroup(),
instruction.getReferencedItem()));
setRegistersAttribute(template);
}

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction3rcMethodItem.java
View File

@ -42,7 +42,7 @@ public class Instruction3rcMethodItem extends InstructionFormatMethodItem<Instru
}
protected void setAttributes(StringTemplate template) {
template.setAttribute("Reference", Reference.makeReference(template.getGroup(),
template.setAttribute("Reference", Reference.createReference(template.getGroup(),
instruction.getReferencedItem()));
String[] registers = RegisterFormatter.formatFormat3rcRegisters(codeItem, instruction.getStartRegister(),

3
baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction3rmsfMethodItem.java
View File

@ -28,7 +28,6 @@
package org.jf.baksmali.Adaptors.Format;
import org.jf.dexlib.Code.Format.Instruction3rc;
import org.jf.dexlib.Code.Format.Instruction3rmsf;
import org.jf.dexlib.CodeItem;
import org.jf.baksmali.Adaptors.Reference.Reference;
@ -43,7 +42,7 @@ public class Instruction3rmsfMethodItem extends InstructionFormatMethodItem<Inst
}
protected void setAttributes(StringTemplate template) {
template.setAttribute("Reference", Reference.makeReference(template.getGroup(),
template.setAttribute("Reference", Reference.createReference(template.getGroup(),
instruction.getReferencedItem()));
String[] registers = RegisterFormatter.formatFormat3rcRegisters(codeItem, instruction.getStartRegister(),

6
baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java
View File

@ -43,7 +43,7 @@ import org.antlr.stringtemplate.StringTemplate;
import java.util.*;
public class MethodDefinition {
public static StringTemplate makeTemplate(StringTemplateGroup stg, ClassDataItem.EncodedMethod encodedMethod,
public static StringTemplate createTemplate(StringTemplateGroup stg, ClassDataItem.EncodedMethod encodedMethod,
AnnotationSetItem annotationSet,
AnnotationSetRefList parameterAnnotations) {
@ -132,7 +132,7 @@ public class MethodDefinition {
parameterName = parameterNames.get(i);
}
parameters.add(ParameterAdaptor.makeTemplate(stg, parameterName, annotationSet));
parameters.add(ParameterAdaptor.createTemplate(stg, parameterName, annotationSet));
}
return parameters;
@ -146,7 +146,7 @@ public class MethodDefinition {
List<StringTemplate> annotationAdaptors = new ArrayList<StringTemplate>();
for (AnnotationItem annotationItem: annotationSet.getAnnotations()) {
annotationAdaptors.add(AnnotationAdaptor.makeTemplate(stg, annotationItem));
annotationAdaptors.add(AnnotationAdaptor.createTemplate(stg, annotationItem));
}
return annotationAdaptors;
}

4
baksmali/src/main/java/org/jf/baksmali/Adaptors/ParameterAdaptor.java
View File

@ -37,7 +37,7 @@ import java.util.List;
import java.util.ArrayList;
public class ParameterAdaptor {
public static StringTemplate makeTemplate(StringTemplateGroup stg, String parameterName,
public static StringTemplate createTemplate(StringTemplateGroup stg, String parameterName,
AnnotationSetItem parameterAnnotations) {
StringTemplate template = stg.getInstanceOf("Parameter");
@ -54,7 +54,7 @@ public class ParameterAdaptor {
List<StringTemplate> annotations = new ArrayList<StringTemplate>();
for (AnnotationItem annotationItem: parameterAnnotations.getAnnotations()) {
annotations.add(AnnotationAdaptor.makeTemplate(stg, annotationItem));
annotations.add(AnnotationAdaptor.createTemplate(stg, annotationItem));
}
return annotations;
}

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Reference/FieldReference.java
View File

@ -33,7 +33,7 @@ import org.antlr.stringtemplate.StringTemplateGroup;
import org.antlr.stringtemplate.StringTemplate;
public class FieldReference {
public static StringTemplate makeTemplate(StringTemplateGroup stg, FieldIdItem item) {
public static StringTemplate createTemplate(StringTemplateGroup stg, FieldIdItem item) {
StringTemplate template = stg.getInstanceOf("FieldReference");
template.setAttribute("ContainingClass", item.getContainingClass().getTypeDescriptor());
template.setAttribute("FieldName", item.getFieldName().getStringValue());

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Reference/MethodReference.java
View File

@ -33,7 +33,7 @@ import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup;
public class MethodReference {
public static StringTemplate makeTemplate(StringTemplateGroup stg, MethodIdItem item) {
public static StringTemplate createTemplate(StringTemplateGroup stg, MethodIdItem item) {
StringTemplate template = stg.getInstanceOf("MethodReference");
template.setAttribute("ContainingClass", item.getContainingClass().getTypeDescriptor());
template.setAttribute("MethodName", item.getMethodName().getStringValue());

10
baksmali/src/main/java/org/jf/baksmali/Adaptors/Reference/Reference.java
View File

@ -33,16 +33,16 @@ import org.antlr.stringtemplate.StringTemplateGroup;
import org.antlr.stringtemplate.StringTemplate;
public abstract class Reference {
public static StringTemplate makeReference(StringTemplateGroup stg, Item item) {
public static StringTemplate createReference(StringTemplateGroup stg, Item item) {
switch (item.getItemType()) {
case TYPE_METHOD_ID_ITEM:
return MethodReference.makeTemplate(stg, (MethodIdItem)item);
return MethodReference.createTemplate(stg, (MethodIdItem)item);
case TYPE_FIELD_ID_ITEM:
return FieldReference.makeTemplate(stg, (FieldIdItem)item);
return FieldReference.createTemplate(stg, (FieldIdItem)item);
case TYPE_STRING_ID_ITEM:
return StringReference.makeTemplate(stg, (StringIdItem)item);
return StringReference.createTemplate(stg, (StringIdItem)item);
case TYPE_TYPE_ID_ITEM:
return TypeReference.makeTemplate(stg, (TypeIdItem)item);
return TypeReference.createTemplate(stg, (TypeIdItem)item);
}
return null;
}

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Reference/StringReference.java
View File

@ -34,7 +34,7 @@ import org.antlr.stringtemplate.StringTemplateGroup;
import org.antlr.stringtemplate.StringTemplate;
public class StringReference {
public static StringTemplate makeTemplate(StringTemplateGroup stg, StringIdItem item) {
public static StringTemplate createTemplate(StringTemplateGroup stg, StringIdItem item) {
StringTemplate template = stg.getInstanceOf("StringReference");
template.setAttribute("EscapedValue", Utf8Utils.escapeString(item.getStringValue()));
return template;

2
baksmali/src/main/java/org/jf/baksmali/Adaptors/Reference/TypeReference.java
View File

@ -33,7 +33,7 @@ import org.antlr.stringtemplate.StringTemplateGroup;
import org.antlr.stringtemplate.StringTemplate;
public class TypeReference {
public static StringTemplate makeTemplate(StringTemplateGroup stg, TypeIdItem item) {
public static StringTemplate createTemplate(StringTemplateGroup stg, TypeIdItem item) {
StringTemplate template = stg.getInstanceOf("TypeReference");
template.setAttribute("TypeDescriptor", item.getTypeDescriptor());
return template;

2
baksmali/src/main/java/org/jf/baksmali/baksmali.java
View File

@ -117,7 +117,7 @@ public class baksmali {
//create and initialize the top level string template
ClassDefinition classDefinition = new ClassDefinition(templates, classDefItem);
StringTemplate smaliFileST = classDefinition.makeTemplate();
StringTemplate smaliFileST = classDefinition.createTemplate();
//generate the disassembly
String output = smaliFileST.toString();