--- a/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.java Tue Aug 21 13:42:08 2012 +0100
+++ b/jdk/test/java/util/PluggableLocale/LocaleNameProviderTest.java Tue Aug 21 11:00:30 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import java.text.*;
import java.util.*;
-import sun.util.*;
+import sun.util.locale.provider.*;
import sun.util.resources.*;
public class LocaleNameProviderTest extends ProviderTest {
@@ -43,7 +43,7 @@
for (Locale target: availloc) {
// pure JRE implementation
- OpenListResourceBundle rb = LocaleData.getLocaleNames(target);
+ OpenListResourceBundle rb = LocaleProviderAdapter.forJRE().getLocaleData().getLocaleNames(target);
boolean jreHasBundle = rb.getLocale().equals(target);
for (Locale test: testloc) {