Author: julien(a)jboss.com Date: 2008-06-26 20:18:38 -0400 (Thu, 26 Jun 2008) New Revision: 11164 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java Log: add on capabilities info the way to obtain the description of a mode or a window state. this can be used to know for instance whether a portlet mode is managed by the portal or the portlet Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-06-27 00:12:01 UTC (rev 11163) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2008-06-27 00:18:38 UTC (rev 11164) @@ -133,11 +133,39 @@ return supportedModes.getValues(); } + public ModeInfo getMode(Mode value) + { + for (ModeInfo mode : getAllModes()) + { + if (mode.getMode().equals(value)) + { + return mode; + } + } + + // + return null; + } + public Set<WindowStateInfo> getAllWindowStates() { return supportedWindowStates.getValues(); } + public WindowStateInfo getWindowState(WindowState value) + { + for (WindowStateInfo windowState : getAllWindowStates()) + { + if (windowState.getWindowState().equals(value)) + { + return windowState; + } + } + + // + return null; + } + public Set<Locale> getAllLocales() { return supportedLocales; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2008-06-27 00:12:01 UTC (rev 11163) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2008-06-27 00:18:38 UTC (rev 11164) @@ -61,6 +61,14 @@ Set<ModeInfo> getModes(MediaType mediaType); /** + * Returns a mode info matching a specifed mode or null. + * + * @param mode the mode + * @return the mode info + */ + ModeInfo getMode(Mode mode); + + /** * Retrieves all the window states supported by the associated Portlet. * * @return a Set of {@link WindowStateInfo} reprensenting the supported window states @@ -76,6 +84,14 @@ Set<WindowStateInfo> getWindowStates(MediaType mimeType); /** + * Returns a window state info matching a specifed window state or null. + * + * @param windowState the window state + * @return the window state info + */ + WindowStateInfo getWindowState(WindowState windowState); + + /** * Retrieves all the locales supported by the associated Portlet. * * @return the Set of supported {@link java.util.Locale}s Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2008-06-27 00:12:01 UTC (rev 11163) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2008-06-27 00:18:38 UTC (rev 11164) @@ -94,6 +94,20 @@ return Collections.emptySet(); } + public ModeInfo getMode(Mode value) + { + for (ModeInfo mode : getAllModes()) + { + if (mode.getMode().equals(value)) + { + return mode; + } + } + + // + return null; + } + public Set<WindowStateInfo> getAllWindowStates() { return windowStates; @@ -113,6 +127,20 @@ return locales; } + public WindowStateInfo getWindowState(WindowState value) + { + for (WindowStateInfo windowState : getAllWindowStates()) + { + if (windowState.getWindowState().equals(value)) + { + return windowState; + } + } + + // + return null; + } + public Set<Locale> getLocales(MediaType mimeType) { if (mediaTypes.contains(mimeType))