svn commit: r1133106 - in /incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c: updates/UpdateDescriptionDocument.java util/LocalizationUtils.java

[scottbw]

Author: scottbw
Date: Tue Jun  7 17:35:09 2011
New Revision: 1133106

URL: http://svn.apache.org/viewvc?rev=1133106&view=rev
Log:
Switched the previous set of localizationUtils methods from deprecated to 
protected - they are still used, but not intended for use outside the 
LocalizationUtils class. See WOOKIE-211.

Modified:
    
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/updates/UpdateDescriptionDocument.java
    
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java

Modified: 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/updates/UpdateDescriptionDocument.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/updates/UpdateDescriptionDocument.java?rev=1133106&r1=1133105&r2=1133106&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/updates/UpdateDescriptionDocument.java
 (original)
+++ 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/updates/UpdateDescriptionDocument.java
 Tue Jun  7 17:35:09 2011
@@ -44,7 +44,7 @@ public class UpdateDescriptionDocument{
         * @return the update details
         */
        public String getDetails(String locale) {
-               Details localDetails = (Details) 
LocalizationUtils.getLocalizedElement(details.toArray(new 
Details[details.size()]), new String[]{locale});
+               Details localDetails = (Details) 
LocalizationUtils.getLocalizedElement(details.toArray(new 
Details[details.size()]), new String[]{locale}, null);
                return localDetails.text;
        }
        

Modified: 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java?rev=1133106&r1=1133105&r2=1133106&view=diff
==============================================================================
--- 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java
 (original)
+++ 
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/LocalizationUtils.java
 Tue Jun  7 17:35:09 2011
@@ -60,8 +60,7 @@ public class LocalizationUtils {
         * @param locales
         * @return an ILocalizedElement, or null if there are no valid entries
         */
-       @Deprecated
-       public static ILocalizedElement getLocalizedElement(ILocalizedElement[] 
elements,String[] locales){
+       protected static ILocalizedElement 
getLocalizedElement(ILocalizedElement[] elements,String[] locales){
                if (elements == null) return null;
                elements = processElementsByLocales(elements,locales);
                if (elements.length == 0) return null;
@@ -101,8 +100,7 @@ public class LocalizationUtils {
         * @param locales
         * @return the sorted and filtered set of elements
         */
-  @Deprecated
-       public static ILocalizedElement[] 
processElementsByLocales(ILocalizedElement[] elements,String[] locales){
+       protected static ILocalizedElement[] 
processElementsByLocales(ILocalizedElement[] elements,String[] locales){
                if (elements == null) return null;
                List<ULocale> localesList = getProcessedLocaleList(locales);
                Arrays.sort(elements, new LocaleComparator(localesList));