Author: ate
Date: Fri Mar 27 16:03:06 2009
New Revision: 759186
URL: http://svn.apache.org/viewvc?rev=759186&view=rev
Log:
Fixing PortletDefinition.getSupportedLocales to delegate to getLanguages() as
that's how Jetspeed stores and manages these
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java?rev=759186&r1=759185&r2=759186&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorServiceImpl.java
Fri Mar 27 16:03:06 2009
@@ -571,7 +571,6 @@
addLanguage(jpd, pd.getPortletInfo(),
JetspeedLocale.getDefaultLocale());
for (String locale : pd.getSupportedLocales())
{
- jpd.addSupportedLocale(locale);
Locale l = JetspeedLocale.convertStringToLocale(locale);
if (!l.equals(JetspeedLocale.getDefaultLocale()))
{
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java?rev=759186&r1=759185&r2=759186&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
Fri Mar 27 16:03:06 2009
@@ -95,7 +95,6 @@
private List<EventDefinitionReference> supportedPublishingEvents;
private List<SecurityRoleRef> securityRoleRefs;
private List<Supports> supports;
- private List<String> supportedLocales;
private List<Language> languages;
private List<ContainerRuntimeOption> containerRuntimeOptions;
private List<SupportedPublicRenderParameter>
supportedPublicRenderParameters;
@@ -639,23 +638,18 @@
public List<String> getSupportedLocales()
{
- if (supportedLocales == null)
+ List<Language> languages = getLanguages();
+ List<String> locales = new ArrayList<String>();
+ for (Language l : languages)
{
- supportedLocales = new ArrayList<String>();
+ locales.add(l.getLocale().toString());
}
- return supportedLocales;
+ return locales;
}
public void addSupportedLocale(String lang)
{
- for (String l : getSupportedLocales())
- {
- if (l.equals(lang))
- {
- throw new IllegalArgumentException("Supported locale: "+lang+"
already defined");
- }
- }
- supportedLocales.add(lang);
+ // noop: use addLanguage(Locale) instead
}
public List<String> getSupportedPublicRenderParameters()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
