[java-identity-provider COMMIT] /trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/Localizati...

[noreply at shibboleth.net]

Author: lajoie
Date: Fri Aug 12 12:28:14 2011
New Revision: 4010

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4010&view=rev
Log:
synch up with some changes to OpenSAML APIs

Modified:
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/LocalizationHelper.java

Modified: trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/LocalizationHelper.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/LocalizationHelper.java?rev=4010&r1=4009&r2=4010&view=diff
==============================================================================
--- trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/LocalizationHelper.java (original)
+++ trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/LocalizationHelper.java Fri Aug 12 12:28:14 2011
@@ -195,7 +195,7 @@
     private Collection<Locale> getAvailableNameLocales(final List<ServiceName> serviceNames) {
         final Collection<Locale> availableLocales = new HashSet<Locale>();
         for (ServiceName serviceName : serviceNames) {
-            availableLocales.add(new Locale(serviceName.getName().getLanguage()));
+            availableLocales.add(new Locale(serviceName.getXMLLang()));
         }
         return availableLocales;
     }
@@ -209,7 +209,7 @@
     private Collection<Locale> getAvailableDescriptionLocales(final List<ServiceDescription> serviceDescriptions) {
         final Collection<Locale> availableLocales = new HashSet<Locale>();
         for (ServiceDescription serviceDescription : serviceDescriptions) {
-            availableLocales.add(new Locale(serviceDescription.getDescription().getLanguage()));
+            availableLocales.add(new Locale(serviceDescription.getXMLLang()));
         }
         return availableLocales;
     }
@@ -223,8 +223,8 @@
      */
     private String getRelyingPartyName(final List<ServiceName> serviceNames, final Locale locale) {
         for (ServiceName serviceName : serviceNames) {
-            if (serviceName.getName().getLanguage().equals(locale.getLanguage())) {
-                return serviceName.getName().getLocalString();
+            if (serviceName.getXMLLang().equals(locale.getLanguage())) {
+                return serviceName.getXMLLang();
             }
         }
         return null;
@@ -240,8 +240,8 @@
      */
     private String getRelyingPartyDescription(final List<ServiceDescription> serviceDescriptions, final Locale locale) {
         for (ServiceDescription serviceDescription : serviceDescriptions) {
-            if (serviceDescription.getDescription().getLanguage().equals(locale.getLanguage())) {
-                return serviceDescription.getDescription().getLocalString();
+            if (serviceDescription.getXMLLang().equals(locale.getLanguage())) {
+                return serviceDescription.getXMLLang();
             }
         }
         return null;