diff --git a/src/main/java/com/reandroid/arsc/pool/JsonStringPoolHelper.java b/src/main/java/com/reandroid/arsc/pool/JsonStringPoolHelper.java index bb5c01b..da20b00 100644 --- a/src/main/java/com/reandroid/arsc/pool/JsonStringPoolHelper.java +++ b/src/main/java/com/reandroid/arsc/pool/JsonStringPoolHelper.java @@ -12,8 +12,8 @@ import java.util.*; class JsonStringPoolHelper { - private final BaseStringPool stringPool; - JsonStringPoolHelper(BaseStringPool stringPool){ + private final StringPool stringPool; + JsonStringPoolHelper(StringPool stringPool){ this.stringPool=stringPool; } void loadStyledStrings(JSONArray jsonArray) { diff --git a/src/main/java/com/reandroid/arsc/pool/ResXmlStringPool.java b/src/main/java/com/reandroid/arsc/pool/ResXmlStringPool.java index 60dd99b..039beb8 100755 --- a/src/main/java/com/reandroid/arsc/pool/ResXmlStringPool.java +++ b/src/main/java/com/reandroid/arsc/pool/ResXmlStringPool.java @@ -23,7 +23,7 @@ import com.reandroid.arsc.item.IntegerArray; import com.reandroid.arsc.item.IntegerItem; import com.reandroid.arsc.item.ResXmlString; -public class ResXmlStringPool extends BaseStringPool { +public class ResXmlStringPool extends StringPool { public ResXmlStringPool(boolean is_utf8) { super(is_utf8); } diff --git a/src/main/java/com/reandroid/arsc/pool/SpecStringPool.java b/src/main/java/com/reandroid/arsc/pool/SpecStringPool.java index 887961a..3d5e0c7 100755 --- a/src/main/java/com/reandroid/arsc/pool/SpecStringPool.java +++ b/src/main/java/com/reandroid/arsc/pool/SpecStringPool.java @@ -23,7 +23,7 @@ import com.reandroid.arsc.item.IntegerArray; import com.reandroid.arsc.item.IntegerItem; import com.reandroid.arsc.item.SpecString; -public class SpecStringPool extends BaseStringPool { +public class SpecStringPool extends StringPool { public SpecStringPool(boolean is_utf8){ super(is_utf8); } diff --git a/src/main/java/com/reandroid/arsc/pool/BaseStringPool.java b/src/main/java/com/reandroid/arsc/pool/StringPool.java similarity index 97% rename from src/main/java/com/reandroid/arsc/pool/BaseStringPool.java rename to src/main/java/com/reandroid/arsc/pool/StringPool.java index 66dc9aa..683f14c 100755 --- a/src/main/java/com/reandroid/arsc/pool/BaseStringPool.java +++ b/src/main/java/com/reandroid/arsc/pool/StringPool.java @@ -31,13 +31,13 @@ package com.reandroid.arsc.pool; import java.util.*; - public abstract class BaseStringPool extends Chunk implements BlockLoad, JSONConvert, Comparator { + public abstract class StringPool extends Chunk implements BlockLoad, JSONConvert, Comparator { private final StringArray mArrayStrings; private final StyleArray mArrayStyles; private final Map> mUniqueMap; - BaseStringPool(boolean is_utf8){ + StringPool(boolean is_utf8){ super(new StringPoolHeader(), 4); IntegerArray offsetStrings = new IntegerArray(); diff --git a/src/main/java/com/reandroid/arsc/pool/TypeStringPool.java b/src/main/java/com/reandroid/arsc/pool/TypeStringPool.java index ce10fb5..9faabf2 100755 --- a/src/main/java/com/reandroid/arsc/pool/TypeStringPool.java +++ b/src/main/java/com/reandroid/arsc/pool/TypeStringPool.java @@ -23,24 +23,24 @@ import com.reandroid.arsc.item.IntegerArray; import com.reandroid.arsc.item.IntegerItem; import com.reandroid.arsc.item.TypeString; -public class TypeStringPool extends BaseStringPool { +public class TypeStringPool extends StringPool { private final IntegerItem mTypeIdOffset; public TypeStringPool(boolean is_utf8, IntegerItem typeIdOffset) { super(is_utf8); this.mTypeIdOffset = typeIdOffset; } - public byte idOf(String typeName){ + public int idOf(String typeName){ return idOf(getByName(typeName)); } /** * Resolves id of {@link TypeBlock} * Not recommend to use unless unless you are sure of proper pool **/ - public byte idOf(TypeString typeString){ + public int idOf(TypeString typeString){ if(typeString==null){ return 0; } - return (byte) (typeString.getIndex()+mTypeIdOffset.get()+1); + return (typeString.getIndex()+mTypeIdOffset.get()+1); } /** * Searches string entry {@link TypeBlock}