[portal-commits] JBoss Portal SVN: r11783 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF/classes and 1 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Tue Sep 2 06:36:05 EDT 2008
Author: chris.laprun at jboss.com
Date: 2008-09-02 06:36:05 -0400 (Tue, 02 Sep 2008)
New Revision: 11783
Removed:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
- Removed WindowBindingManagerBean as it wasn't removed in the previous commit...
- Use list in ui:repeat for better legibility
- Fixed issue with incorrect key in localization
Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-09-01 20:03:05 UTC (rev 11782)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-09-02 10:36:05 UTC (rev 11783)
@@ -1,285 +0,0 @@
-/*
-* 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.core.admin.ui.coordination;
-
-import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
-import org.jboss.portal.core.controller.coordination.WindowBindingInfo;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.portlet.info.NavigationInfo;
-import org.jboss.portal.portlet.info.ParameterInfo;
-import org.jboss.portal.portlet.info.PortletInfo;
-
-import javax.faces.model.SelectItem;
-import javax.xml.namespace.QName;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
- * @version $Revision$
- */
-public class WindowBindingManagerBean extends CoordinationManagerBean.CoordinationBean
-{
- private Map<String, DisplayParameterBinding> displayParameterBindings;
- private List<ParameterWindowSelectItem> availableParameterWindowPairs;
- private List<String> selectedParameterWindowPairs;
- private String windowBindingName;
-
- public List<ParameterWindowSelectItem> getAvailableParameterWindowPairs()
- {
- return availableParameterWindowPairs;
- }
-
- public List<String> getSelectedParameterWindowPairs()
- {
- return selectedParameterWindowPairs;
- }
-
- public void setSelectedParameterWindowPairs(List<String> selectedParameterWindowPairs)
- {
- this.selectedParameterWindowPairs = selectedParameterWindowPairs;
- }
-
- public String getWindowBindingName()
- {
- return windowBindingName;
- }
-
- public void setWindowBindingName(String windowBindingName)
- {
- this.windowBindingName = windowBindingName;
- }
-
- public void extractInfoFrom(Window window, PortletInfo info)
- {
- // retrieve metadata on public render parameters
- NavigationInfo navInfo = info.getNavigation();
- for (ParameterInfo pInfo : navInfo.getPublicParameters())
- {
- availableParameterWindowPairs.add(new ParameterWindowSelectItem(pInfo, window));
- }
- }
-
- public Collection<DisplayParameterBinding> getDisplayParameterBindings()
- {
- if (displayParameterBindings == null)
- {
- return Collections.emptyList();
- }
-
- List<DisplayParameterBinding> result = new LinkedList<DisplayParameterBinding>(displayParameterBindings.values());
- Collections.sort(result);
-
- return result;
- }
-
- public void initKnowing(Collection<PortalObject> children)
- {
- availableParameterWindowPairs = new LinkedList<ParameterWindowSelectItem>();
- }
-
- public void loadInfoFrom(Page page)
- {
- Collection<? extends WindowBindingInfo> windowBindingInfos = managerBean.getCoordinationService().getWindowBindings(page);
- if (windowBindingInfos != null && !windowBindingInfos.isEmpty())
- {
- displayParameterBindings = new HashMap<String, DisplayParameterBinding>(windowBindingInfos.size());
- for (WindowBindingInfo wbInfo : windowBindingInfos)
- {
- displayParameterBindings.put(wbInfo.getName(), new DisplayParameterBinding(wbInfo));
- }
- }
- else
- {
- displayParameterBindings = Collections.emptyMap();
- }
- }
-
- public String create() throws IllegalCoordinationException
- {
- if (windowBindingName != null)
- {
- Map<Window, QName> windowBinding = new HashMap<Window, QName>();
- for (String pairAsString : selectedParameterWindowPairs)
- {
- // get ParameterWindowPair from String
- String[] names = ParameterWindowPair.resolveFrom(pairAsString);
-
- Window window = (Window)managerBean.getSelectedPage().getChild(names[ParameterWindowPair.WINDOW_NAME]);
- windowBinding.put(window, QName.valueOf(names[ParameterWindowPair.PARAM_NAME]));
- }
-
- managerBean.getCoordinationService().setWindowBinding(windowBindingName, windowBinding);
- }
-
- return resetSelection();
- }
-
- public String resetSelection()
- {
- windowBindingName = null;
- selectedParameterWindowPairs = null;
-
- return CoordinationManagerBean.EDIT_COORDINATION;
- }
-
- public String delete(String name) throws IllegalCoordinationException
- {
- DisplayParameterBinding displayParam = displayParameterBindings.get(name);
- if (displayParam != null)
- {
- WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
- managerBean.getCoordinationService().removeWindowBinding(bindingInfo);
- }
- return CoordinationManagerBean.EDIT_COORDINATION;
- }
-
- public String rename(String name, String newName) throws IllegalCoordinationException
- {
- DisplayParameterBinding displayParam = displayParameterBindings.get(name);
- if (displayParam != null)
- {
- WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
- managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName);
- }
- return CoordinationManagerBean.EDIT_COORDINATION;
- }
-
- public static class DisplayParameterBinding implements Comparable
- {
- private List<ParameterWindowPair> parameterWindowPairs;
- private WindowBindingInfo bindingInfo;
-
- public DisplayParameterBinding(WindowBindingInfo bindingInfo)
- {
- this.bindingInfo = bindingInfo;
- Set<Map.Entry<Window,QName>> entries = bindingInfo.getWindows().entrySet();
- parameterWindowPairs = new LinkedList<ParameterWindowPair>();
- for (Map.Entry<Window, QName> entry : entries)
- {
- parameterWindowPairs.add(new ParameterWindowPair(entry.getValue(), entry.getKey()));
- }
- }
-
- public String getName()
- {
- return bindingInfo.getName();
- }
-
- public WindowBindingInfo getBindingInfo()
- {
- return bindingInfo;
- }
-
- public List<ParameterWindowPair> getParameterWindowPairs()
- {
- return parameterWindowPairs;
- }
-
- public int compareTo(Object o)
- {
- DisplayParameterBinding other = (DisplayParameterBinding)o;
- return getName().compareTo(other.getName());
- }
- }
-
- public static class ParameterWindowSelectItem extends SelectItem implements Comparable
- {
- public ParameterWindowSelectItem(ParameterInfo parameterInfo, Window window)
- {
- super(new ParameterWindowPair(parameterInfo, window), ParameterWindowPair.asString(parameterInfo.getName(), window));
- }
-
- public int compareTo(Object o)
- {
- ParameterWindowSelectItem pair = (ParameterWindowSelectItem)o;
- return toString().compareTo(pair.toString());
- }
-
- private ParameterWindowPair getPair()
- {
- return (ParameterWindowPair)getValue();
- }
- }
-
- public static class ParameterWindowPair
- {
- private Window window;
- private QName name;
- public static final int PARAM_NAME = 0;
- public static final int WINDOW_NAME = 1;
-
- public ParameterWindowPair(ParameterInfo info, Window window)
- {
- this(info.getName(), window);
- }
-
- public ParameterWindowPair(QName name, Window window)
- {
- this.window = window;
- this.name = name;
- }
-
- public QName getName()
- {
- return name;
- }
-
- public Window getWindow()
- {
- return window;
- }
-
- public String getSeparator()
- {
- return ":";
- }
-
- @Override
- public String toString()
- {
- return ParameterWindowPair.asString(name, window);
- }
-
- static String asString(QName qname, Window window)
- {
- return qname + ":" + window.getName();
- }
-
- public static String[] resolveFrom(String pairAsString)
- {
- int separatorIndex = pairAsString.indexOf(':');
- String name = pairAsString.substring(0, separatorIndex);
- String windowName = pairAsString.substring(separatorIndex + 1);
-
- return new String[] {name, windowName};
- }
- }
-}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-09-01 20:03:05 UTC (rev 11782)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-09-02 10:36:05 UTC (rev 11783)
@@ -307,7 +307,7 @@
COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS=Destination windows
COORDINATION_EVENT_EXISTING_ACTIONS=Actions
COORDINATION_EVENT_CREATE=Create new event wiring:
-COORDINATION_EVENT_CREATE_NO_EVENT=No available events. Cannot create new event wirings.
+COORDINATION_EVENT_CREATE_NO_EVENTS=No available events. Cannot create new event wirings.
COORDINATION_EVENT_CREATE_STEP1=1. Select source event:
COORDINATION_EVENT_CREATE_STEP2=2. Select source windows producing event ''{0}'':
COORDINATION_EVENT_CREATE_STEP3=3. Select destination event:
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-01 20:03:05 UTC (rev 11782)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-02 10:36:05 UTC (rev 11783)
@@ -54,9 +54,11 @@
</h:column>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ORIGINAL}</f:facet>
- <ui:repeat var="qname" value="#{binding.names}">
- #{qname}
- </ui:repeat>
+ <ul>
+ <ui:repeat var="qname" value="#{binding.names}">
+ <li>#{qname}</li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ACTIONS}</f:facet>
@@ -240,42 +242,54 @@
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS}"/>
</f:facet>
- <ui:repeat var="window" value="#{wiring.sourceWindows}">
- <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
- <f:param name="id" value="#{window.id}"/>
- #{window.name}
- </h:commandLink>
- </ui:repeat>
+ <ul>
+ <ui:repeat var="window" value="#{wiring.sourceWindows}">
+ <li>
+ <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
+ <f:param name="id" value="#{window.id}"/>
+ #{window.name}
+ </h:commandLink>
+ </li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS}"/>
</f:facet>
- <ui:repeat var="event" value="#{wiring.sourceEvents}">
- #{event}
- </ui:repeat>
+ <ul>
+ <ui:repeat var="event" value="#{wiring.sourceEvents}">
+ <li>#{event}</li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS}"/>
</f:facet>
- <ui:repeat var="event" value="#{wiring.destinationEvents}">
- #{event}
- </ui:repeat>
+ <ul>
+ <ui:repeat var="event" value="#{wiring.destinationEvents}">
+ <li>#{event}</li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS}"/>
</f:facet>
- <ui:repeat var="window" value="#{wiring.destinationWindows}">
- <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
- <f:param name="id" value="#{window.id}"/>
- #{window.name}
- </h:commandLink>
- </ui:repeat>
+ <ul>
+ <ui:repeat var="window" value="#{wiring.destinationWindows}">
+ <li>
+ <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">
+ <f:param name="id" value="#{window.id}"/>
+ #{window.name}
+ </h:commandLink>
+ </li>
+ </ui:repeat>
+ </ul>
</h:column>
<h:column>
More information about the portal-commits
mailing list