Author: chris.laprun(a)jboss.com Date: 2008-09-02 18:46:46 -0400 (Tue, 02 Sep 2008) New Revision: 11792 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java Log: - Properly refresh page when needed (except that without working persistence, this is kind of moot right now >_<). - Fixed ParameterBindingManagerBean.resolveFrom to use the proper separator length. - Do not recreate EventWiringInfoCreator each time the page is redisplayed. - Still no idea why persistence isn't working... Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-02 21:31:05 UTC (rev 11791) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-02 22:46:46 UTC (rev 11792) @@ -263,6 +263,7 @@ try { getCoordinationService().setEventWiringImplicitMode(getSelectedPage(), !usingExplicitEvents); + refresh(); } catch (IllegalCoordinationException e) { @@ -287,6 +288,7 @@ try { getCoordinationService().setParameterBindingImplicitMode(getSelectedPage(), !usingExplicitParameters); + refresh(); } catch (IllegalCoordinationException e) { @@ -469,10 +471,7 @@ try { selectedType.bean().delete(selectedName); - - // reload data: we need to make sure we select the current page - pomb.selectObject(selectedObjectId); - editCoordination(); + refresh(); } catch (IllegalCoordinationException e) { @@ -486,6 +485,16 @@ return EDIT_COORDINATION; } + /** + * Refreshes the page data. + */ + private void refresh() + { + // need to make sure that POMB has a selection... + pomb.selectObject(selectedObjectId); + editCoordination(); + } + public void setNewName(String newName) { this.newName = newName; @@ -501,10 +510,7 @@ if (selectedType != null) { selectedType.bean().rename(selectedName, newName); - - // reload data: we need to make sure we select the current page - pomb.selectObject(selectedObjectId); - editCoordination(); + refresh(); } // reset selection Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-09-02 21:31:05 UTC (rev 11791) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-09-02 22:46:46 UTC (rev 11792) @@ -153,7 +153,10 @@ public List<QNameSelectItem> getSourceEvents() { // create new wiring - currentWiring = new EventWiringInfoCreator(); + if (currentWiring == null) + { + currentWiring = new EventWiringInfoCreator(); + } // return list of produced events return getPossibleEvents(eventNameToWindowSources); 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-02 21:31:05 UTC (rev 11791) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-09-02 22:46:46 UTC (rev 11792) @@ -287,7 +287,7 @@ { int separatorIndex = pairAsString.indexOf(SEP); String name = pairAsString.substring(0, separatorIndex); - String windowName = pairAsString.substring(separatorIndex + 1); + String windowName = pairAsString.substring(separatorIndex + SEP.length()); return new String[] {name, windowName}; }