From 0c428dd7c7eeb4e705e2f6470e8e02102da727e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= Date: Tue, 17 May 2011 10:01:21 +0200 Subject: [PATCH] ResPluralsValue: now stores array of ResScalarValue instead of ResStringValue. Plurals contain strings, but they could use e.g. references. It'll be safer to let them store any scalar value. --- .../brut/androlib/res/data/value/ResPluralsValue.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java index b944ffc5..1909b9a9 100644 --- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java +++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java @@ -31,10 +31,10 @@ public class ResPluralsValue extends ResBagValue implements ResValuesXmlSerializ Duo[] items) { super(parent); - mItems = new ResStringValue[6]; + mItems = new ResScalarValue[6]; for (int i = 0; i < items.length; i++) { mItems[items[i].m1 - BAG_KEY_PLURALS_START] = - (ResStringValue) items[i].m2; + (ResScalarValue) items[i].m2; } } @@ -44,7 +44,7 @@ public class ResPluralsValue extends ResBagValue implements ResValuesXmlSerializ serializer.startTag(null, "plurals"); serializer.attribute(null, "name", res.getResSpec().getName()); for (int i = 0; i < mItems.length; i++) { - ResStringValue item = mItems[i]; + ResScalarValue item = mItems[i]; if (item == null) { continue; } @@ -57,7 +57,7 @@ public class ResPluralsValue extends ResBagValue implements ResValuesXmlSerializ } - private final ResStringValue[] mItems; + private final ResScalarValue[] mItems; public static final int BAG_KEY_PLURALS_START = 0x01000004;