[portal-commits] JBoss Portal SVN: r11569 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal: core/impl/coordination and 1 other directories.

Author: julien(a)jboss.com Date: 2008-07-24 01:55:48 -0400 (Thu, 24 Jul 2008) New Revision: 11569 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.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: better naming: a qname is the type of a name and it should not affect the semantic of its named usage as a "name" Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java 2008-07-24 05:54:23 UTC (rev 11568) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/AliasBindingInfo.java 2008-07-24 05:55:48 UTC (rev 11569) @@ -31,5 +31,5 @@ */ public interface AliasBindingInfo extends ParameterBindingInfo { - Set<QName> getQNames(); + Set<QName> getNames(); } 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-07-24 05:54:23 UTC (rev 11568) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-07-24 05:55:48 UTC (rev 11569) @@ -189,7 +189,7 @@ { for (AliasBindingInfo info : getAliasBindings(window.getPage())) { - if (info.getQNames().contains(name)) + if (info.getNames().contains(name)) { names.add(info.getName()); } @@ -1073,7 +1073,7 @@ return name; } - public Set<QName> getQNames() + public Set<QName> getNames() { return immutableNames; } 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-07-24 05:54:23 UTC (rev 11568) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-07-24 05:55:48 UTC (rev 11569) @@ -30,7 +30,6 @@ import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.controller.coordination.CoordinationStrategy; import org.jboss.portal.core.controller.coordination.EventWiringInfo; -import org.jboss.portal.core.controller.coordination.ParameterBindingInfo; import org.jboss.portal.core.controller.coordination.WindowBindingInfo; import org.jboss.portal.core.controller.coordination.AliasBindingInfo; import org.jboss.portal.core.model.content.ContentType; @@ -326,10 +325,10 @@ AliasBindingInfo info = bindings1.iterator().next(); assertTrue(info.getName().equals("alias1")); - assertTrue(info.getQNames().size() == 3); - assertTrue(info.getQNames().contains(qname1)); - assertTrue(info.getQNames().contains(qname2)); - assertTrue(info.getQNames().contains(qname3)); + assertTrue(info.getNames().size() == 3); + assertTrue(info.getNames().contains(qname1)); + assertTrue(info.getNames().contains(qname2)); + assertTrue(info.getNames().contains(qname3)); cos.removeAliasBinding(info); assertTrue(cos.getAliasBindings(page1).size() == 0); @@ -359,16 +358,16 @@ assertNotNull(info3); assertTrue(info2.getName().equals("alias2")); - assertTrue(info2.getQNames().size() == 3); - assertTrue(info2.getQNames().contains(qname4)); - assertTrue(info2.getQNames().contains(qname5)); - assertTrue(info2.getQNames().contains(qname6)); + assertTrue(info2.getNames().size() == 3); + assertTrue(info2.getNames().contains(qname4)); + assertTrue(info2.getNames().contains(qname5)); + assertTrue(info2.getNames().contains(qname6)); assertTrue(info3.getName().equals("alias3")); - assertTrue(info3.getQNames().size() == 3); - assertTrue(info3.getQNames().contains(qname7)); - assertTrue(info3.getQNames().contains(qname8)); - assertTrue(info3.getQNames().contains(qname9)); + assertTrue(info3.getNames().size() == 3); + assertTrue(info3.getNames().contains(qname7)); + assertTrue(info3.getNames().contains(qname8)); + assertTrue(info3.getNames().contains(qname9));