Author: chris.laprun(a)jboss.com Date: 2009-03-19 11:14:30 -0400 (Thu, 19 Mar 2009) New Revision: 13053 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java Log: - JBPORTAL-2349: Get the information from the metadata if it's not found in resource bundle... - Fixed typo in event definition display name resource bundle key. 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 2009-03-19 14:23:07 UTC (rev 13052) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2009-03-19 15:14:30 UTC (rev 13053) @@ -31,13 +31,13 @@ import org.jboss.portal.common.reflect.NoSuchClassException; import org.jboss.portal.common.util.ConversionException; import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; +import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData; import org.jboss.portal.portlet.impl.metadata.ListenerMetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaData; import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData; -import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; -import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData; import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaData; import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData; import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData; @@ -476,7 +476,9 @@ ResourceBundleManager bundleMgr = context.getBundleManager(); // - LocalizedString displayName = bundleMgr.getLocalizedValue("javax.portlet.app.custom-portlet-mode." + mode + ".decoration-name", "" + mode); + LocalizedString displayName = bundleMgr.getLocalizedValue( + "javax.portlet.app.custom-portlet-mode." + mode + ".decoration-name", + "" + mode); // if (description != null) @@ -557,10 +559,9 @@ QName name = getName(parameterMD.getQname(), parameterMD.getName()); ResourceBundleManager bundleMgr = context.getBundleManager(); - // LocalizedString description = bundleMgr.getLocalizedValue( "javax.portlet.app.public-render-parameter." + name + ".description", - "Description of public render parameter " + name); + getDefaultStringFor(parameterMD.getDescription(), "Description of public render parameter " + name)); // return new ContainerParameterInfo( @@ -571,6 +572,11 @@ ); } + private String getDefaultStringFor(LocalizedString desc, String defaultValue) + { + return desc != null ? desc.getDefaultString() : defaultValue; + } + private ContainerEventInfo build(EventDefinitionMetaData eventDefinitionMD) throws NoSuchClassException { QName name = getName(eventDefinitionMD.getQname(), eventDefinitionMD.getName()); @@ -587,11 +593,11 @@ // LocalizedString displayName = bundleMgr.getLocalizedValue( - "javax.portlet.app.event-definition.." + name + ".display-name", + "javax.portlet.app.event-definition." + name + ".display-name", "Event " + name); LocalizedString description = bundleMgr.getLocalizedValue( "javax.portlet.app.event-definition." + name + ".description", - "Description of event " + name); + getDefaultStringFor(eventDefinitionMD.getDescription(), "Description of event " + name)); // return new ContainerEventInfo(name, type, displayName, description);