[portal-commits] JBoss Portal SVN: r11826 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination.

Author: chris.laprun(a)jboss.com Date: 2008-09-06 08:14:37 -0400 (Sat, 06 Sep 2008) New Revision: 11826 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java Log: - Rename and delete should now work. - Create needs to be re-worked as interface is crappy and allows things that shouldn't be possible. Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-09-06 11:52:19 UTC (rev 11825) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-09-06 12:14:37 UTC (rev 11826) @@ -161,23 +161,13 @@ public String delete(String name) throws IllegalCoordinationException { - DisplayParameterBinding displayParam = displayParameterBindings.get(name); - if (displayParam != null) - { - WindowBindingInfo bindingInfo = displayParam.getBindingInfo(); - managerBean.getCoordinationService().removeWindowBinding(bindingInfo); - } + managerBean.getCoordinationService().removeWindowBinding(managerBean.getSelectedPage(), name); return resetSelection(); } 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); - } + managerBean.getCoordinationService().renameWindowBinding(managerBean.getSelectedPage(), name, newName); return resetSelection(); } @@ -189,7 +179,7 @@ public DisplayParameterBinding(WindowBindingInfo bindingInfo) { this.bindingInfo = bindingInfo; - Set<Map.Entry<Window,QName>> entries = bindingInfo.getWindows().entrySet(); + Set<Map.Entry<Window, QName>> entries = bindingInfo.getWindows().entrySet(); parameterWindowPairs = new LinkedList<ParameterWindowPair>(); for (Map.Entry<Window, QName> entry : entries) { @@ -285,11 +275,11 @@ public static String[] resolveFrom(String pairAsString) { - int separatorIndex = pairAsString.indexOf(SEP); + int separatorIndex = pairAsString.indexOf(SEP); String name = pairAsString.substring(0, separatorIndex); String windowName = pairAsString.substring(separatorIndex + SEP.length()); - return new String[] {name, windowName}; + return new String[]{name, windowName}; } } }