Author: emuckenhuber Date: 2008-01-13 13:15:59 -0500 (Sun, 13 Jan 2008) New Revision: 9492 Removed: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocaleAdapter.java Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/SupportedLocaleMetaData.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java Log: - removed LocaleAdapter Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-01-13 16:20:32 UTC (rev 9491) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-01-13 18:15:59 UTC (rev 9492) @@ -38,8 +38,10 @@ import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; import org.jboss.portal.portlet.info.MetaInfo; +import org.jboss.portal.common.util.ConversionException; import org.jboss.portal.common.value.Value; import org.jboss.portal.common.value.StringValue; +import org.jboss.portal.common.i18n.LocaleFormat; import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.common.i18n.ResourceBundleManager; import org.jboss.portal.common.reflect.NoSuchClassException; @@ -218,8 +220,18 @@ List<Locale> locales = new ArrayList<Locale>(); for (SupportedLocaleMetaData supportedLocaleMD : portletMD.getSupportedLocale()) { - Locale locale = supportedLocaleMD.getLocale(); - locales.add(locale); + Locale locale; + try + { + locale = LocaleFormat.DEFAULT.getLocale(supportedLocaleMD.getLocale()); + locales.add(locale); + } + catch (ConversionException e) + { + // FIXME -- basic for now + log.error("Could not convert supported locale (" + supportedLocaleMD.getLocale() + ") for portlet: " + portletMD.getPortletName(), e); + } + } return locales; } @@ -450,7 +462,15 @@ // for (SupportedLocaleMetaData supportedLocaleMD : portletMD.getSupportedLocale()) { - capabilities.addLocale(supportedLocaleMD.getLocale()); + try + { + capabilities.addLocale(LocaleFormat.DEFAULT.getLocale(supportedLocaleMD.getLocale())); + } + catch (ConversionException e) + { + // FIXME -- basic for now + log.error("Could not convert supported locale (" + supportedLocaleMD.getLocale() + ") for portlet: " + portletMD.getPortletName(), e); + } } // Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocaleAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocaleAdapter.java 2008-01-13 16:20:32 UTC (rev 9491) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocaleAdapter.java 2008-01-13 18:15:59 UTC (rev 9492) @@ -1,51 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.impl.metadata.adapter; - -import org.jboss.portal.common.i18n.LocaleFormat; - -import java.util.Locale; - -import javax.xml.bind.annotation.adapters.XmlAdapter; - -/** - * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> - * @version $Revision$ - */ -public class LocaleAdapter extends XmlAdapter<String, Locale> -{ - - @Override - public String marshal(Locale arg0) throws Exception - { - throw new UnsupportedOperationException(); - } - - @Override - public Locale unmarshal(String arg0) throws Exception - { - return LocaleFormat.DEFAULT.getLocale(arg0); - } - -} - Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/SupportedLocaleMetaData.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/SupportedLocaleMetaData.java 2008-01-13 16:20:32 UTC (rev 9491) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/SupportedLocaleMetaData.java 2008-01-13 18:15:59 UTC (rev 9492) @@ -22,14 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.metadata.portlet; -import java.util.Locale; - import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.jboss.portal.portlet.impl.metadata.adapter.LocaleAdapter; - /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ @@ -39,16 +34,15 @@ { /** The supported locale */ - private Locale locale; + private String locale; @XmlValue - @XmlJavaTypeAdapter(LocaleAdapter.class) - public Locale getLocale() + public String getLocale() { return locale; } - public void setLocale(Locale locale) + public void setLocale(String locale) { this.locale = locale; } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-01-13 16:20:32 UTC (rev 9491) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-01-13 18:15:59 UTC (rev 9492) @@ -24,14 +24,11 @@ import java.net.URI; import java.net.URISyntaxException; -import java.util.Locale; import org.apache.log4j.Logger; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.i18n.LocaleFormat; -import org.jboss.portal.common.util.ConversionException; import org.jboss.portal.portlet.TransportGuarantee; import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData; @@ -607,14 +604,7 @@ SupportedLocaleMetaData md = (SupportedLocaleMetaData) object; if ("supported-locale".equals(localName)) { - try - { - md.setLocale(LocaleFormat.DEFAULT.getLocale(value)); - } - catch (ConversionException e) - { - throw new RuntimeException("Todo make this reportable ????"); - } + md.setLocale(value); } } Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java 2008-01-13 16:20:32 UTC (rev 9491) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java 2008-01-13 18:15:59 UTC (rev 9492) @@ -109,9 +109,9 @@ List<SupportedLocaleMetaData> localeList = p1.getSupportedLocale(); assertEquals(3, localeList.size()); - assertEquals(new Locale("en"), localeList.get(0).getLocale()); - assertEquals(new Locale("fr"), localeList.get(1).getLocale()); - assertEquals(new Locale("fr", "FR"), localeList.get(2).getLocale()); + assertEquals("en", localeList.get(0).getLocale()); + assertEquals("fr", localeList.get(1).getLocale()); + assertEquals("fr_FR", localeList.get(2).getLocale()); PortletInfoMetaData pimd = p1.getPortletInfo(); assertNotNull(pimd); @@ -183,9 +183,9 @@ assertEquals(md, p6.getPortletApplication()); assertEquals("Portlet6", p6.getResourceBundle()); assertEquals(3, p6.getSupportedLocale().size()); - assertEquals(new Locale("en"), p6.getSupportedLocale().get(0).getLocale()); - assertEquals(new Locale("fr"), p6.getSupportedLocale().get(1).getLocale()); - assertEquals(new Locale("fr", "FR"), p6.getSupportedLocale().get(2).getLocale()); + assertEquals("en", p6.getSupportedLocale().get(0).getLocale()); + assertEquals("fr", p6.getSupportedLocale().get(1).getLocale()); + assertEquals("fr_FR", p6.getSupportedLocale().get(2).getLocale()); PortletMetaData p7 = md.getPortlet("Portlet7"); assertNotNull(p7); @@ -277,11 +277,9 @@ List<SupportedLocaleMetaData> localeList = p1.getSupportedLocale(); assertEquals(3, localeList.size()); - assertEquals(new Locale("en"), localeList.get(0).getLocale()); - assertEquals(new Locale("fr"), localeList.get(1).getLocale()); - assertEquals(new Locale("fr", "FR").getLanguage(), localeList.get(2).getLocale().getLanguage()); - assertEquals(new Locale("fr", "FR").getCountry(), localeList.get(2).getLocale().getCountry()); - assertEquals(new Locale("fr", "FR"), localeList.get(2).getLocale()); + assertEquals("en", localeList.get(0).getLocale()); + assertEquals("fr", localeList.get(1).getLocale()); + assertEquals("fr_FR", localeList.get(2).getLocale()); assertEquals("MyResourceBundle", p1.getResourceBundle()); @@ -346,9 +344,9 @@ assertNotNull(p6); assertEquals("Portlet6", p6.getResourceBundle()); assertEquals(3, p6.getSupportedLocale().size()); - assertEquals(new Locale("en"), p6.getSupportedLocale().get(0).getLocale()); - assertEquals(new Locale("fr"), p6.getSupportedLocale().get(1).getLocale()); - assertEquals(new Locale("fr", "FR"), p6.getSupportedLocale().get(2).getLocale()); + assertEquals("en", p6.getSupportedLocale().get(0).getLocale()); + assertEquals("fr", p6.getSupportedLocale().get(1).getLocale()); + assertEquals("fr_FR", p6.getSupportedLocale().get(2).getLocale()); PortletMetaData p7 = md.getPortlet("Portlet7"); assertNotNull(p7); @@ -443,9 +441,9 @@ List<SupportedLocaleMetaData> localeList = p1.getSupportedLocale(); assertEquals(3, localeList.size()); - assertEquals(new Locale("en"), localeList.get(0).getLocale()); - assertEquals(new Locale("fr"), localeList.get(1).getLocale()); - assertEquals(new Locale("fr", "FR"), localeList.get(2).getLocale()); + assertEquals("en", localeList.get(0).getLocale()); + assertEquals("fr", localeList.get(1).getLocale()); + assertEquals("fr_FR", localeList.get(2).getLocale()); assertEquals("MyResourceBundle", p1.getResourceBundle());