Author: chris.laprun(a)jboss.com
Date: 2008-09-06 07:52:19 -0400 (Sat, 06 Sep 2008)
New Revision: 11825
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java
Log:
- Oops, getWindowBindingInfo should really be getWindowBinding...
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java 2008-09-06
11:51:06 UTC (rev 11824)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java 2008-09-06
11:52:19 UTC (rev 11825)
@@ -205,7 +205,7 @@
* @return
* @throws IllegalCoordinationException
*/
- WindowBindingInfo getWindowBindingInfo(Page page, String name) throws
IllegalCoordinationException;
+ WindowBindingInfo getWindowBinding(Page page, String name) throws
IllegalCoordinationException;
/**
* Set parameter binding implicit mode for a given page container. This will be
inherited recursively by all children
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-09-06
11:51:06 UTC (rev 11824)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-09-06
11:52:19 UTC (rev 11825)
@@ -567,12 +567,12 @@
public void renameWindowBinding(Page page, String bindingName, String newName) throws
IllegalCoordinationException
{
- WindowBindingInfo info = getWindowBindingInfo(page, bindingName);
+ WindowBindingInfo info = getWindowBinding(page, bindingName);
removeWindowBinding(page, bindingName);
setWindowBinding(newName, info.getWindows());
}
- public WindowBindingInfo getWindowBindingInfo(Page page, String name) throws
IllegalCoordinationException
+ public WindowBindingInfo getWindowBinding(Page page, String name) throws
IllegalCoordinationException
{
ParameterValidation.throwIllegalArgExceptionIfNull(page, "Page");
ParameterValidation.throwIllegalArgExceptionIfNull(name, "window binding
name");
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-09-06
11:51:06 UTC (rev 11824)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-09-06
11:52:19 UTC (rev 11825)
@@ -322,7 +322,7 @@
ws.put(w4, qName21);
cos.setWindowBinding("binding2", ws);
- WindowBindingInfo info = cos.getWindowBindingInfo(page1, "binding1");
+ WindowBindingInfo info = cos.getWindowBinding(page1, "binding1");
assertNotNull(info);
assertEquals("binding1", info.getName());
assertEquals(page1, info.getPage());
@@ -334,7 +334,7 @@
assertEquals(qName11, windows.get(w1));
assertEquals(qName12, windows.get(w2));
- info = cos.getWindowBindingInfo(page1, "binding2");
+ info = cos.getWindowBinding(page1, "binding2");
assertNotNull(info);
assertEquals("binding2", info.getName());
assertEquals(page1, info.getPage());
@@ -377,8 +377,8 @@
infos = cos.getWindowBindings(page1);
assertNotNull(infos);
assertEquals(1, infos.size());
- assertNotNull(cos.getWindowBindingInfo(page1, "binding1"));
- assertNull(cos.getWindowBindingInfo(page1, "binding2"));
+ assertNotNull(cos.getWindowBinding(page1, "binding1"));
+ assertNull(cos.getWindowBinding(page1, "binding2"));
TransactionAssert.commitTransaction();
}
@@ -662,7 +662,7 @@
cos.renameWindowBinding(page1, "new", "newer");
- info = cos.getWindowBindingInfo(page1, "newer");
+ info = cos.getWindowBinding(page1, "newer");
assertNotNull(info);
TransactionAssert.commitTransaction();