Author: chris.laprun(a)jboss.com Date: 2008-03-19 23:12:17 -0400 (Wed, 19 Mar 2008) New Revision: 10346 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java Log: - remotable should be null if a value cannot be asserted (otherwise, will screw up remotable by default in Portal). 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-03-20 01:10:07 UTC (rev 10345) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-03-20 03:12:17 UTC (rev 10346) @@ -22,56 +22,56 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.info; +import org.apache.log4j.Logger; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +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; +import org.jboss.portal.common.util.ConversionException; +import org.jboss.portal.common.value.StringValue; +import org.jboss.portal.common.value.Value; +import org.jboss.portal.portlet.LifeCyclePhase; +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.common.ContainerRuntimeMetaData; +import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData; +import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData; +import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionReferenceMetaData; +import org.jboss.portal.portlet.impl.metadata.filter.FilterMappingMetaData; +import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData; +import org.jboss.portal.portlet.impl.metadata.portlet.PortletInfoMetaData; import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData; +import org.jboss.portal.portlet.impl.metadata.portlet.PortletModeMetaData; import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferenceMetaData; +import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferencesMetaData; +import org.jboss.portal.portlet.impl.metadata.portlet.SecurityRoleRefMetaData; import org.jboss.portal.portlet.impl.metadata.portlet.SupportedLocaleMetaData; import org.jboss.portal.portlet.impl.metadata.portlet.SupportsMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletModeMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.SecurityRoleRefMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferencesMetaData; import org.jboss.portal.portlet.impl.metadata.portlet.WindowStateMetaData; -import org.jboss.portal.portlet.impl.metadata.portlet.PortletInfoMetaData; import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData; -import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData; -import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaData; -import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionReferenceMetaData; -import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData; -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.ListenerMetaData; -import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData; -import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData; -import org.jboss.portal.portlet.impl.metadata.filter.FilterMappingMetaData; import org.jboss.portal.portlet.info.MetaInfo; -import org.jboss.portal.portlet.LifeCyclePhase; -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; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.apache.log4j.Logger; -import javax.xml.namespace.QName; import javax.xml.XMLConstants; -import java.util.Locale; -import java.util.Map; -import java.util.HashMap; -import java.util.List; -import java.util.ResourceBundle; -import java.util.MissingResourceException; +import javax.xml.namespace.QName; +import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedHashMap; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.MissingResourceException; +import java.util.ResourceBundle; import java.util.Set; -import java.net.URI; -import java.net.URISyntaxException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -114,7 +114,7 @@ private static final List<WindowStateMetaData> EMPTY_WINDOW_STATE_LIST = Collections.emptyList(); /** . */ - private static final Map<String,PortletPreferenceMetaData> EMPTY_PORTLET_PREFERENCE_MAP = Collections.emptyMap(); + private static final Map<String, PortletPreferenceMetaData> EMPTY_PORTLET_PREFERENCE_MAP = Collections.emptyMap(); /** . */ private static final PortletPreferencesMetaData EMPTY_PORTLET_PREFERENCES = new PortletPreferencesMetaData(); @@ -132,10 +132,10 @@ private static final List<FilterMappingMetaData> EMPTY_FILTER_MAPPING_LIST = Collections.emptyList(); /** . */ - private static final Map<String,FilterMetaData> EMPTY_FILTER_MAP = Collections.emptyMap(); + private static final Map<String, FilterMetaData> EMPTY_FILTER_MAP = Collections.emptyMap(); /** . */ - private static final Map<String,ContainerRuntimeMetaData> EMPTY_CONTAINER_RUNTIME_OPTION_MAP = Collections.emptyMap(); + private static final Map<String, ContainerRuntimeMetaData> EMPTY_CONTAINER_RUNTIME_OPTION_MAP = Collections.emptyMap(); /** . */ private final PortletApplication10MetaData portletApplicationMD; @@ -333,7 +333,7 @@ // FIXME -- basic for now log.error("Could not convert supported locale (" + supportedLocaleMD.getLocale() + ") for portlet: " + portletMD.getPortletName(), e); } - + } return locales; } @@ -498,7 +498,6 @@ type = new ContainerTypeInfo(clazz); } - // LocalizedString displayName = bundleMgr.getLocalizedValue( "javax.portlet.app.event-definition.." + name + ".display-name", @@ -614,7 +613,7 @@ context.getApplicationName(), portletMD.getPortletClass(), initParameters, - false, + null, context.getBundleManager(portletMD), options ); @@ -631,7 +630,7 @@ portletMD.getPortletClass(), context.getApplicationName(), Collections.unmodifiableMap(initParameters), - false, + null, context.getBundleManager(portletMD) ); } @@ -672,7 +671,7 @@ // if (parameter == null) { - // Do something + // Do something } else { @@ -901,25 +900,23 @@ PortletPreferencesMetaData preferencesMD = portletMD.getPortletPreferences(); // - String validatorClassName = null; + ContainerPreferencesInfo containerPreferences = null; if (preferencesMD != null) { - validatorClassName = preferencesMD.getPreferenceValidator(); - } + // + containerPreferences = new ContainerPreferencesInfo(preferencesMD.getPreferenceValidator()); - // - ContainerPreferencesInfo containerPreferences = new ContainerPreferencesInfo(validatorClassName); + // + ResourceBundleManager bundleMgr = context.getBundleManager(portletMD); - // - ResourceBundleManager bundleMgr = context.getBundleManager(portletMD); - - // - for (PortletPreferenceMetaData portletPreferenceMD : preferencesMD.getPortletPreferences().values()) - { - Value value = new StringValue(portletPreferenceMD.getValue()); - LocalizedString displayName = bundleMgr.getLocalizedValue("javax.portlet.preference.name." + portletPreferenceMD.getName(), portletPreferenceMD.getName()); - LocalizedString description = bundleMgr.getLocalizedValue("javax.portlet.preference.description." + portletPreferenceMD.getName(), portletPreferenceMD.getName()); - containerPreferences.addContainerPreference(portletPreferenceMD.getName(), value, portletPreferenceMD.isReadOnly(), displayName, description); + // + for (PortletPreferenceMetaData portletPreferenceMD : preferencesMD.getPortletPreferences().values()) + { + Value value = new StringValue(portletPreferenceMD.getValue()); + LocalizedString displayName = bundleMgr.getLocalizedValue("javax.portlet.preference.name." + portletPreferenceMD.getName(), portletPreferenceMD.getName()); + LocalizedString description = bundleMgr.getLocalizedValue("javax.portlet.preference.description." + portletPreferenceMD.getName(), portletPreferenceMD.getName()); + containerPreferences.addContainerPreference(portletPreferenceMD.getName(), value, portletPreferenceMD.isReadOnly(), displayName, description); + } } //