Build fix: follow on to r3562.
Review by: bobv (TBR)
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@3656 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/cfg/StaticPropertyOracle.java b/dev/core/src/com/google/gwt/dev/cfg/StaticPropertyOracle.java
index 3fa969a..f501fd2 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/StaticPropertyOracle.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/StaticPropertyOracle.java
@@ -81,7 +81,7 @@
for (int i = 0; i < orderedProps.length; i++) {
BindingProperty prop = orderedProps[i];
if (prop.getName().equals(propertyName)) {
- return prop.getAllowedValues();
+ return prop.getDefinedValues();
}
}
diff --git a/dev/core/src/com/google/gwt/dev/shell/ModuleSpacePropertyOracle.java b/dev/core/src/com/google/gwt/dev/shell/ModuleSpacePropertyOracle.java
index a079b20..c74aa6a 100644
--- a/dev/core/src/com/google/gwt/dev/shell/ModuleSpacePropertyOracle.java
+++ b/dev/core/src/com/google/gwt/dev/shell/ModuleSpacePropertyOracle.java
@@ -79,7 +79,7 @@
throws BadPropertyValueException {
Property prop = getProperty(propertyName);
if (prop instanceof BindingProperty) {
- return ((BindingProperty) prop).getAllowedValues();
+ return ((BindingProperty) prop).getDefinedValues();
}
throw new BadPropertyValueException(propertyName);
}
diff --git a/user/test/com/google/gwt/i18n/I18N2Test.gwt.xml b/user/test/com/google/gwt/i18n/I18N2Test.gwt.xml
index 6c3e4cc..3ab098d 100644
--- a/user/test/com/google/gwt/i18n/I18N2Test.gwt.xml
+++ b/user/test/com/google/gwt/i18n/I18N2Test.gwt.xml
@@ -16,6 +16,6 @@
<inherits name="com.google.gwt.i18n.I18N"/>
<!-- Browser-sensitive code should use the 'user.agent' property -->
- <set-property name="locale" value="b_C_d" />
<extend-property name = "locale" values ="piglatin,piglatin_UK, piglatin_UK_win,a,b,b_C,b_C_d"/>
+ <set-property name="locale" value="b_C_d" />
</module>
diff --git a/user/test/com/google/gwt/i18n/I18NTest.gwt.xml b/user/test/com/google/gwt/i18n/I18NTest.gwt.xml
index 15082ee..2582b75 100644
--- a/user/test/com/google/gwt/i18n/I18NTest.gwt.xml
+++ b/user/test/com/google/gwt/i18n/I18NTest.gwt.xml
@@ -17,6 +17,6 @@
<source path='resolutiontest' />
<source path = 'client'/>
<!-- Browser-sensitive code should use the 'user.agent' property -->
- <set-property name="locale" value="piglatin_UK_win" />
<extend-property name = "locale" values ="piglatin,piglatin_UK, piglatin_UK_win"/>
+ <set-property name="locale" value="piglatin_UK_win" />
</module>
