diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java index bd1b34f5..9afc32d6 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java @@ -58,27 +58,11 @@ public class ResPackage { return spec; } - public List getConfigs() { - return new ArrayList(mConfigs.values()); - } - - public boolean hasConfig(ResConfigFlags flags) { - return mConfigs.containsKey(flags); - } - - public ResType getConfig(ResConfigFlags flags) throws AndrolibException { - ResType config = mConfigs.get(flags); - if (config == null) { - throw new UndefinedResObjectException("config: " + flags); - } - return config; - } - public int getResSpecCount() { return mResSpecs.size(); } - public ResType getOrCreateConfig(ResConfigFlags flags) throws AndrolibException { + public ResType getOrCreateConfig(ResConfigFlags flags) { ResType config = mConfigs.get(flags); if (config == null) { config = new ResType(flags); @@ -87,14 +71,6 @@ public class ResPackage { return config; } - public List listTypes() { - return new ArrayList(mTypes.values()); - } - - public boolean hasType(String typeName) { - return mTypes.containsKey(typeName); - } - public ResTypeSpec getType(String typeName) throws AndrolibException { ResTypeSpec type = mTypes.get(typeName); if (type == null) { @@ -151,7 +127,7 @@ public class ResPackage { return mSynthesizedRes.contains(resId); } - public void removeResSpec(ResResSpec spec) throws AndrolibException { + public void removeResSpec(ResResSpec spec) { mResSpecs.remove(spec.getId()); } @@ -161,13 +137,7 @@ public class ResPackage { } } - public void addConfig(ResType config) throws AndrolibException { - if (mConfigs.put(config.getFlags(), config) != null) { - throw new AndrolibException("Multiple configs: " + config); - } - } - - public void addType(ResTypeSpec type) throws AndrolibException { + public void addType(ResTypeSpec type) { if (mTypes.containsKey(type.getName())) { LOGGER.warning("Multiple types detected! " + type + " ignored!"); } else { @@ -175,12 +145,6 @@ public class ResPackage { } } - public void addResource(ResResource res) { - } - - public void removeResource(ResResource res) { - } - public void addSynthesizedRes(int resId) { mSynthesizedRes.add(new ResID(resId)); } diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java index 12fc7f4c..9b2c7bf6 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java @@ -64,14 +64,6 @@ public class ResResSpec { return res; } - public boolean hasResource(ResType config) { - return hasResource(config.getFlags()); - } - - private boolean hasResource(ResConfigFlags flags) { - return mResources.containsKey(flags); - } - public ResResource getDefaultResource() throws AndrolibException { return getResource(new ResConfigFlags()); } @@ -80,10 +72,6 @@ public class ResResSpec { return mResources.containsKey(new ResConfigFlags()); } - public String getFullName() { - return getFullName(false, false); - } - public String getFullName(ResPackage relativeToPackage, boolean excludeType) { return getFullName(getPackage().equals(relativeToPackage), excludeType); } @@ -124,11 +112,6 @@ public class ResResSpec { } } - public void removeResource(ResResource res) throws AndrolibException { - ResConfigFlags flags = res.getConfig().getFlags(); - mResources.remove(flags); - } - @Override public String toString() { return mId.toString() + " " + mType.toString() + "/" + mName; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTable.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTable.java index fa9d57e9..b54e074f 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTable.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTable.java @@ -117,14 +117,6 @@ public class ResTable { return pkg; } - public boolean hasPackage(int id) { - return mPackagesById.containsKey(id); - } - - public boolean hasPackage(String name) { - return mPackagesByName.containsKey(name); - } - public ResValue getValue(String package_, String type, String name) throws AndrolibException { return getPackage(package_).getType(type).getResSpec(name).getDefaultResource().getValue(); } diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResType.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResType.java index 840c13c2..efb75e86 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResType.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResType.java @@ -28,10 +28,6 @@ public class ResType { this.mFlags = flags; } - public Set listResources() { - return new LinkedHashSet(mResources.values()); - } - public ResResource getResource(ResResSpec spec) throws AndrolibException { ResResource res = mResources.get(spec); if (res == null) { @@ -40,10 +36,6 @@ public class ResType { return res; } - public Set listResSpecs() { - return mResources.keySet(); - } - public ResConfigFlags getFlags() { return mFlags; } @@ -52,11 +44,6 @@ public class ResType { addResource(res, false); } - public void removeResource(ResResource res) throws AndrolibException { - ResResSpec spec = res.getResSpec(); - mResources.remove(spec); - } - public void addResource(ResResource res, boolean overwrite) throws AndrolibException { ResResSpec spec = res.getResSpec(); if (mResources.put(spec, res) != null && !overwrite) { diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java index f1630f00..aeb99200 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java @@ -52,18 +52,10 @@ public final class ResTypeSpec { return mId; } - public int getEntryCount() { - return mEntryCount; - } - public boolean isString() { return mName.equalsIgnoreCase("string"); } - public Set listResSpecs() { - return new LinkedHashSet(mResSpecs.values()); - } - public ResResSpec getResSpec(String name) throws AndrolibException { ResResSpec spec = getResSpecUnsafe(name); if (spec == null) { @@ -76,7 +68,7 @@ public final class ResTypeSpec { return mResSpecs.get(name); } - public void removeResSpec(ResResSpec spec) throws AndrolibException { + public void removeResSpec(ResResSpec spec) { mResSpecs.remove(spec.getName()); } diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResValuesFile.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResValuesFile.java index e41a4896..01977957 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResValuesFile.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResValuesFile.java @@ -45,10 +45,6 @@ public class ResValuesFile { return mType; } - public ResType getConfig() { - return mConfig; - } - public boolean isSynthesized(ResResource res) { return mPackage.isSynthesized(res.getResSpec().getId()); }