Author: emuckenhuber Date: 2008-01-08 11:07:37 -0500 (Tue, 08 Jan 2008) New Revision: 9459 Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletModeAdapter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/WindowStateAdapter.java Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/PortletModeMetaData.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/WindowStateMetaData.java 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/factory/PortletApplicationModelFactory.java Log: - use Mode and WindowState instead of String Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletModeAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletModeAdapter.java (rev 0) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletModeAdapter.java 2008-01-08 16:07:37 UTC (rev 9459) @@ -0,0 +1,49 @@ +/****************************************************************************** + * 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 javax.xml.bind.annotation.adapters.XmlAdapter; + +import org.jboss.portal.Mode; + +/** + * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> + * @version $Revision$ + */ +public class PortletModeAdapter extends XmlAdapter<String, Mode> +{ + + @Override + public String marshal(Mode mode) throws Exception + { + throw new UnsupportedOperationException(); + } + + @Override + public Mode unmarshal(String name) throws Exception + { + return Mode.create(name); + } + +} + Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/WindowStateAdapter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/WindowStateAdapter.java (rev 0) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/WindowStateAdapter.java 2008-01-08 16:07:37 UTC (rev 9459) @@ -0,0 +1,49 @@ +/****************************************************************************** + * 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 javax.xml.bind.annotation.adapters.XmlAdapter; + +import org.jboss.portal.WindowState; + +/** + * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> + * @version $Revision$ + */ +public class WindowStateAdapter extends XmlAdapter<String, WindowState> +{ + + @Override + public String marshal(WindowState arg0) throws Exception + { + throw new UnsupportedOperationException(); + } + + @Override + public WindowState unmarshal(String name) throws Exception + { + return WindowState.create(name); + } + +} + Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/PortletModeMetaData.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/PortletModeMetaData.java 2008-01-08 16:06:39 UTC (rev 9458) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/PortletModeMetaData.java 2008-01-08 16:07:37 UTC (rev 9459) @@ -24,7 +24,11 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.jboss.portal.Mode; +import org.jboss.portal.portlet.impl.metadata.adapter.PortletModeAdapter; + /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ @@ -35,15 +39,16 @@ { /** The portlet mode */ - private String portletMode; + private Mode portletMode; @XmlValue - public String getPortletMode() + @XmlJavaTypeAdapter(PortletModeAdapter.class) + public Mode getPortletMode() { return portletMode; } - public void setPortletMode(String portletMode) + public void setPortletMode(Mode portletMode) { this.portletMode = portletMode; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/WindowStateMetaData.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/WindowStateMetaData.java 2008-01-08 16:06:39 UTC (rev 9458) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/WindowStateMetaData.java 2008-01-08 16:07:37 UTC (rev 9459) @@ -24,7 +24,11 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.jboss.portal.WindowState; +import org.jboss.portal.portlet.impl.metadata.adapter.WindowStateAdapter; + /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ @@ -34,15 +38,16 @@ { /** The window state */ - private String windowState; + private WindowState windowState; @XmlValue - public String getWindowState() + @XmlJavaTypeAdapter(WindowStateAdapter.class) + public WindowState getWindowState() { return windowState; } - public void setWindowState(String windowState) + public void setWindowState(WindowState windowState) { this.windowState = windowState; } 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-08 16:06:39 UTC (rev 9458) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java 2008-01-08 16:07:37 UTC (rev 9459) @@ -25,6 +25,8 @@ import java.util.List; import java.util.Locale; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; @@ -94,14 +96,14 @@ SupportsMetaData smd1 = p1.getSupports().get(0); assertEquals("text/html", smd1.getMimeType()); - assertEquals("VIEW", smd1.getPortletModes().get(0).getPortletMode()); - assertEquals("EDIT", smd1.getPortletModes().get(1).getPortletMode()); - assertEquals("HELP", smd1.getPortletModes().get(2).getPortletMode()); + assertEquals(Mode.create("VIEW"), smd1.getPortletModes().get(0).getPortletMode()); + assertEquals(Mode.create("EDIT"), smd1.getPortletModes().get(1).getPortletMode()); + assertEquals(Mode.create("HELP"), smd1.getPortletModes().get(2).getPortletMode()); SupportsMetaData smd2 = p1.getSupports().get(1); assertEquals("text/wml", smd2.getMimeType()); - assertEquals("VIEW", smd2.getPortletModes().get(0).getPortletMode()); - assertEquals("HELP", smd2.getPortletModes().get(1).getPortletMode()); + assertEquals(Mode.create("VIEW"), smd2.getPortletModes().get(0).getPortletMode()); + assertEquals(Mode.create("HELP"), smd2.getPortletModes().get(1).getPortletMode()); assertEquals("MyResourceBundle", p1.getResourceBundle()); @@ -150,6 +152,9 @@ assertEquals("text/html", p2.getSupports().get(0).getMimeType()); assertEquals("test the portlet session", p2.getPortletInfo().getTitle()); + // default value should be 0 + assertEquals(0, p2.getExpirationCache()); + PortletMetaData p3 = md.getPortlet("Portlet3"); assertNotNull(p3); assertEquals(md, p3.getPortletApplication()); @@ -257,14 +262,14 @@ SupportsMetaData smd1 = p1.getSupports().get(0); assertEquals("text/html", smd1.getMimeType()); - assertEquals("VIEW", smd1.getPortletModes().get(0).getPortletMode()); - assertEquals("EDIT", smd1.getPortletModes().get(1).getPortletMode()); - assertEquals("HELP", smd1.getPortletModes().get(2).getPortletMode()); + assertEquals(Mode.create("VIEW"), smd1.getPortletModes().get(0).getPortletMode()); + assertEquals(Mode.create("EDIT"), smd1.getPortletModes().get(1).getPortletMode()); + assertEquals(Mode.create("HELP"), smd1.getPortletModes().get(2).getPortletMode()); SupportsMetaData smd2 = p1.getSupports().get(1); assertEquals("text/wml", smd2.getMimeType()); - assertEquals("VIEW", smd2.getPortletModes().get(0).getPortletMode()); - assertEquals("HELP", smd2.getPortletModes().get(1).getPortletMode()); + assertEquals(Mode.create("VIEW"), smd2.getPortletModes().get(0).getPortletMode()); + assertEquals(Mode.create("HELP"), smd2.getPortletModes().get(1).getPortletMode()); List<SupportedLocaleMetaData> localeList = p1.getSupportedLocale(); assertEquals(new Locale("en"), localeList.get(0).getLocale()); @@ -410,21 +415,21 @@ SupportsMetaData smd1 = p1.getSupports().get(0); assertEquals("text/html", smd1.getMimeType()); - assertEquals("VIEW", smd1.getPortletModes().get(0).getPortletMode()); - assertEquals("EDIT", smd1.getPortletModes().get(1).getPortletMode()); - assertEquals("HELP", smd1.getPortletModes().get(2).getPortletMode()); + assertEquals(Mode.create("VIEW"), smd1.getPortletModes().get(0).getPortletMode()); + assertEquals(Mode.create("EDIT"), smd1.getPortletModes().get(1).getPortletMode()); + assertEquals(Mode.create("HELP"), smd1.getPortletModes().get(2).getPortletMode()); // window state jsr 286 - assertEquals("MAXIMIZED", smd1.getWindowStates().get(0).getWindowState()); - assertEquals("NORMAL", smd1.getWindowStates().get(1).getWindowState()); + assertEquals(WindowState.create("MAXIMIZED"), smd1.getWindowStates().get(0).getWindowState()); + assertEquals(WindowState.create("NORMAL"), smd1.getWindowStates().get(1).getWindowState()); SupportsMetaData smd2 = p1.getSupports().get(1); assertEquals("foo", smd2.getId()); assertEquals("text/wml", smd2.getMimeType()); - assertEquals("VIEW", smd2.getPortletModes().get(0).getPortletMode()); - assertEquals("HELP", smd2.getPortletModes().get(1).getPortletMode()); + assertEquals(Mode.create("VIEW"), smd2.getPortletModes().get(0).getPortletMode()); + assertEquals(Mode.create("HELP"), smd2.getPortletModes().get(1).getPortletMode()); // window state jsr 286 - assertEquals("NORMAL", smd2.getWindowStates().get(0).getWindowState()); - assertEquals("CUSTOM", smd2.getWindowStates().get(1).getWindowState()); + assertEquals(WindowState.create("NORMAL"), smd2.getWindowStates().get(0).getWindowState()); + assertEquals(WindowState.create("CUSTOM"), smd2.getWindowStates().get(1).getWindowState()); List<SupportedLocaleMetaData> localeList = p1.getSupportedLocale(); assertEquals(new Locale("en"), localeList.get(0).getLocale()); Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-01-08 16:06:39 UTC (rev 9458) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-01-08 16:07:37 UTC (rev 9459) @@ -27,6 +27,8 @@ 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.portlet.TransportGuarantee; import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; @@ -583,7 +585,7 @@ PortletModeMetaData md = (PortletModeMetaData) object; if ("portlet-mode".equals(localName)) { - md.setPortletMode(value); + md.setPortletMode(Mode.create(value)); } } @@ -593,7 +595,7 @@ WindowStateMetaData md = (WindowStateMetaData) object; if ("window-state".equals(localName)) { - md.setWindowState(value); + md.setWindowState(WindowState.create(value)); } }