[portal-commits] JBoss Portal SVN: r12992 - in modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object: adapter and 1 other directory.

Author: mwringe Date: 2009-03-09 00:50:55 -0400 (Mon, 09 Mar 2009) New Revision: 12992 Added: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/adapter/ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/adapter/LocaleAdapter.java Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java Log: Add adapter to 'supported-locale' to properly return a Locale object. Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java 2009-03-07 00:29:06 UTC (rev 12991) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/CommonPortalObject.java 2009-03-09 04:50:55 UTC (rev 12992) @@ -26,8 +26,10 @@ import java.util.Locale; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup; +import org.jboss.portal.metadata.portal.object.adapter.LocaleAdapter; import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData; import org.jboss.portal.metadata.portlet.instances.SecurityConstraintMetaData; @@ -98,6 +100,7 @@ } @XmlElement(name = "supported-locale") + @XmlJavaTypeAdapter (LocaleAdapter.class) public void setSupportedLocales(List<Locale> supportedLocales) { this.supportedLocales = supportedLocales; @@ -107,8 +110,7 @@ { return supportedLocales; } - - //abstract public void setChildren(List<?> children); + abstract public List<CommonPortalObject> getChildren(); @XmlElement(name = "security-constraint") Modified: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java 2009-03-07 00:29:06 UTC (rev 12991) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/PageMetaData.java 2009-03-09 04:50:55 UTC (rev 12992) @@ -49,8 +49,6 @@ protected String resourceBundle; - protected List<String> supportedLocales; - protected CoordinationMetaData coordination; Added: modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/adapter/LocaleAdapter.java =================================================================== --- modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/adapter/LocaleAdapter.java (rev 0) +++ modules/metadata/trunk/metadata/src/main/java/org/jboss/portal/metadata/portal/object/adapter/LocaleAdapter.java 2009-03-09 04:50:55 UTC (rev 12992) @@ -0,0 +1,74 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, 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.metadata.portal.object.adapter; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import javax.naming.OperationNotSupportedException; +import javax.xml.bind.annotation.adapters.XmlAdapter; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public final class LocaleAdapter extends XmlAdapter<String, Locale> +{ + + @Override + public String marshal(Locale locale) throws Exception + { + throw new OperationNotSupportedException(); + } + + @Override + public Locale unmarshal(String localeString) throws Exception + { + return new Locale(localeString); + } + +} + +//public final class LocaleAdapter extends XmlAdapter<List<String>, List<Locale>> +//{ +// +// @Override +// public List<String> marshal(List<Locale> locales) throws Exception +// { +// throw new OperationNotSupportedException(); +// } +// +// @Override +// public List<Locale> unmarshal(List<String> localeStrings) throws Exception +// { +// List<Locale> locales = new ArrayList<Locale>(localeStrings.size()); +// for (String localeString : localeStrings) +// { +// locales.add(new Locale(localeString)); +// } +// +// return locales; +// } +// +//}