diff --git a/src/main/java/com/reandroid/apk/StringPoolBuilder.java b/src/main/java/com/reandroid/apk/StringPoolBuilder.java index 651eb5d..6e7c328 100644 --- a/src/main/java/com/reandroid/apk/StringPoolBuilder.java +++ b/src/main/java/com/reandroid/apk/StringPoolBuilder.java @@ -19,7 +19,7 @@ import com.reandroid.arsc.chunk.PackageBlock; import com.reandroid.arsc.chunk.TableBlock; import com.reandroid.arsc.pool.SpecStringPool; import com.reandroid.arsc.pool.TableStringPool; -import com.reandroid.arsc.value.Header; +import com.reandroid.arsc.value.ValueHeader; import com.reandroid.arsc.value.ValueType; import com.reandroid.json.JSONArray; import com.reandroid.json.JSONException; @@ -90,8 +90,8 @@ public class StringPoolBuilder { return mSpecNameMap.get(pkgId); } private void scan(JSONObject jsonObject){ - if(jsonObject.has(Header.NAME_entry_name)){ - addSpecName(jsonObject.optString(Header.NAME_entry_name)); + if(jsonObject.has(ValueHeader.NAME_entry_name)){ + addSpecName(jsonObject.optString(ValueHeader.NAME_entry_name)); } if(jsonObject.has(ApkUtil.NAME_value_type)){ if(ValueType.STRING.name().equals(jsonObject.getString(ApkUtil.NAME_value_type))){ diff --git a/src/main/java/com/reandroid/apk/xmlencoder/XMLValuesEncoderId.java b/src/main/java/com/reandroid/apk/xmlencoder/XMLValuesEncoderId.java index 6262950..e894f6a 100644 --- a/src/main/java/com/reandroid/apk/xmlencoder/XMLValuesEncoderId.java +++ b/src/main/java/com/reandroid/apk/xmlencoder/XMLValuesEncoderId.java @@ -15,7 +15,7 @@ */ package com.reandroid.apk.xmlencoder; -import com.reandroid.arsc.value.Header; +import com.reandroid.arsc.value.ValueHeader; import com.reandroid.arsc.value.Entry; class XMLValuesEncoderId extends XMLValuesEncoder{ @@ -38,8 +38,8 @@ import com.reandroid.arsc.value.Entry; setVisibility(entry); } private void setVisibility(Entry entry){ - Header header = entry.getHeader(); - header.setWeak(true); - header.setPublic(true); + ValueHeader valueHeader = entry.getHeader(); + valueHeader.setWeak(true); + valueHeader.setPublic(true); } } diff --git a/src/main/java/com/reandroid/arsc/header/HeaderBlock.java b/src/main/java/com/reandroid/arsc/header/HeaderBlock.java index b088bd7..39bdefe 100755 --- a/src/main/java/com/reandroid/arsc/header/HeaderBlock.java +++ b/src/main/java/com/reandroid/arsc/header/HeaderBlock.java @@ -217,7 +217,7 @@ import java.util.List; builder.append("Unknown type="); builder.append(String.format("0x%02x", (0xffff & t))); } - builder.append("{Header="); + builder.append("{ValueHeader="); builder.append(getHeaderSize()); builder.append(", Chunk="); builder.append(getChunkSize()); diff --git a/src/main/java/com/reandroid/arsc/value/Entry.java b/src/main/java/com/reandroid/arsc/value/Entry.java index 7263673..9e4880e 100755 --- a/src/main/java/com/reandroid/arsc/value/Entry.java +++ b/src/main/java/com/reandroid/arsc/value/Entry.java @@ -195,7 +195,7 @@ public TableEntry getTableEntry(){ return mTableEntry; } - public Header getHeader(){ + public ValueHeader getHeader(){ TableEntry tableEntry = getTableEntry(); if(tableEntry!=null){ return tableEntry.getHeader(); @@ -319,7 +319,7 @@ setNull(true); return; } - boolean is_complex = json.optBoolean(Header.NAME_is_complex, false); + boolean is_complex = json.optBoolean(ValueHeader.NAME_is_complex, false); TableEntry entry = createTableEntry(is_complex); setTableEntry(entry); entry.fromJson(json); diff --git a/src/main/java/com/reandroid/arsc/value/EntryHeader.java b/src/main/java/com/reandroid/arsc/value/EntryHeader.java index 0dbc068..375232f 100644 --- a/src/main/java/com/reandroid/arsc/value/EntryHeader.java +++ b/src/main/java/com/reandroid/arsc/value/EntryHeader.java @@ -15,7 +15,7 @@ */ package com.reandroid.arsc.value; -public class EntryHeader extends Header{ +public class EntryHeader extends ValueHeader { public EntryHeader(){ super(HEADER_SIZE_SCALAR); } diff --git a/src/main/java/com/reandroid/arsc/value/EntryHeaderMap.java b/src/main/java/com/reandroid/arsc/value/EntryHeaderMap.java index f2ea76d..ce9ef64 100644 --- a/src/main/java/com/reandroid/arsc/value/EntryHeaderMap.java +++ b/src/main/java/com/reandroid/arsc/value/EntryHeaderMap.java @@ -17,7 +17,7 @@ package com.reandroid.arsc.value; import com.reandroid.json.JSONObject; -public class EntryHeaderMap extends Header{ +public class EntryHeaderMap extends ValueHeader { public EntryHeaderMap(){ super(HEADER_SIZE_COMPLEX); setComplex(true); @@ -36,12 +36,12 @@ public class EntryHeaderMap extends Header{ } @Override - public void merge(Header header){ - if(header == this || !(header instanceof EntryHeaderMap)){ + public void merge(ValueHeader valueHeader){ + if(valueHeader == this || !(valueHeader instanceof EntryHeaderMap)){ return; } - super.merge(header); - EntryHeaderMap entryHeaderMap = (EntryHeaderMap) header; + super.merge(valueHeader); + EntryHeaderMap entryHeaderMap = (EntryHeaderMap) valueHeader; setParentId(entryHeaderMap.getParentId()); setValuesCount(entryHeaderMap.getValuesCount()); } diff --git a/src/main/java/com/reandroid/arsc/value/ResTableMapEntry.java b/src/main/java/com/reandroid/arsc/value/ResTableMapEntry.java index 74f636a..c08a188 100644 --- a/src/main/java/com/reandroid/arsc/value/ResTableMapEntry.java +++ b/src/main/java/com/reandroid/arsc/value/ResTableMapEntry.java @@ -42,7 +42,7 @@ public class ResTableMapEntry extends TableEntry extends Block implements +public abstract class TableEntry
extends Block implements JSONConvert { private final HEADER header; private final VALUE resValue; @@ -78,9 +78,9 @@ public abstract class TableEntry
ext @Override public void onReadBytes(BlockReader reader) throws IOException { - Header header = getHeader(); - header.readBytes(reader); - onHeaderLoaded(header); + ValueHeader valueHeader = getHeader(); + valueHeader.readBytes(reader); + onHeaderLoaded(valueHeader); getValue().readBytes(reader); } @@ -92,7 +92,7 @@ public abstract class TableEntry
ext return result; } - void onHeaderLoaded(Header header){ + void onHeaderLoaded(ValueHeader valueHeader){ } abstract void onRemoved(); abstract boolean shouldMerge(TableEntry tableEntry); diff --git a/src/main/java/com/reandroid/arsc/value/Header.java b/src/main/java/com/reandroid/arsc/value/ValueHeader.java similarity index 94% rename from src/main/java/com/reandroid/arsc/value/Header.java rename to src/main/java/com/reandroid/arsc/value/ValueHeader.java index bcc1f7f..b0d5ce6 100644 --- a/src/main/java/com/reandroid/arsc/value/Header.java +++ b/src/main/java/com/reandroid/arsc/value/ValueHeader.java @@ -25,9 +25,9 @@ import com.reandroid.json.JSONObject; import java.io.IOException; -public class Header extends BlockItem implements JSONConvert { +public class ValueHeader extends BlockItem implements JSONConvert { private ReferenceItem mStringReference; - public Header(int size){ + public ValueHeader(int size){ super(size); writeSize(); putInteger(getBytesInternal(), OFFSET_SPEC_REFERENCE, -1); @@ -161,14 +161,14 @@ public class Header extends BlockItem implements JSONConvert { setKey(stringItem.getIndex()); linkStringReference(stringItem); } - public void merge(Header header){ - if(header == null || header ==this){ + public void merge(ValueHeader valueHeader){ + if(valueHeader == null || valueHeader ==this){ return; } - setComplex(header.isComplex()); - setWeak(header.isWeak()); - setPublic(header.isPublic()); - setName(header.getName()); + setComplex(valueHeader.isComplex()); + setWeak(valueHeader.isWeak()); + setPublic(valueHeader.isPublic()); + setName(valueHeader.getName()); } public void toJson(JSONObject jsonObject) { jsonObject.put(NAME_entry_name, getName());