ReVanced/ARSCLib
1
0
Fork 0
mirror of https://github.com/revanced/ARSCLib.git synced 2025-04-30 22:34:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

override merge

Browse Source
This commit is contained in:
REAndroid 2023-02-13 14:59:29 -05:00
parent 93c96e5397
commit c96e13220e
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/reandroid/arsc/value/ResValueMap.java
View File

@ -73,17 +73,6 @@ public class ResValueMap extends ValueItem{
setName(json.getInt(NAME_name)); setName(json.getInt(NAME_name));
} }
@Override
public String toString(){
return "name="+String.format("0x%08x", getName())
+", "+super.toString();
}
private static final int OFFSET_NAME = 0;
private static final int OFFSET_SIZE = 4;
public static final String NAME_name = "name";
public void setNameHigh(short val){ public void setNameHigh(short val){
int name = getName() & 0xffff; int name = getName() & 0xffff;
name = ((val & 0xffff) <<16 ) | name; name = ((val & 0xffff) <<16 ) | name;
@ -104,12 +93,24 @@ public class ResValueMap extends ValueItem{
data = (val & 0xffff) | data; data = (val & 0xffff) | data;
setData(data); setData(data);
} }
public void merge(ResValueMap resValueMap){ @Override
if(resValueMap==null||resValueMap==this){ public void merge(ValueItem valueItem){
if(valueItem==this || !(valueItem instanceof ResValueMap)){
return; return;
} }
ResValueMap resValueMap = (ResValueMap) valueItem;
super.merge(resValueMap); super.merge(resValueMap);
setName(resValueMap.getName()); setName(resValueMap.getName());
} }
@Override
public String toString(){
return "name="+String.format("0x%08x", getName())
+", "+super.toString();
}
private static final int OFFSET_NAME = 0;
private static final int OFFSET_SIZE = 4;
public static final String NAME_name = "name";
} }