Author: bdaw
Date: 2008-07-24 10:11:47 -0400 (Thu, 24 Jul 2008)
New Revision: 11578
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.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:
change <name>-> <id> in xml for <alias-binding> and
<parameter-binding>
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java 2008-07-24
14:09:33 UTC (rev 11577)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java 2008-07-24
14:11:47 UTC (rev 11578)
@@ -34,7 +34,7 @@
*/
public interface ParameterBindingInfo
{
- String getName();
+ String getId();
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
14:09:33 UTC (rev 11577)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-07-24
14:11:47 UTC (rev 11578)
@@ -159,7 +159,7 @@
{
if (entry.getKey().getName().equals(window.getName()) &&
entry.getValue().equals(name))
{
- names.add(info.getName());
+ names.add(info.getId());
}
}
}
@@ -171,7 +171,7 @@
{
if (info.getNames().contains(name))
{
- names.add(info.getName());
+ names.add(info.getId());
}
}
}
@@ -562,7 +562,7 @@
}
// Remove all entries
- String prop_wiring = PREFIX_PARAMETER_BINDING + "." + info.getName();
+ String prop_wiring = PREFIX_PARAMETER_BINDING + "." + info.getId();
//
for (Window window : info.getWindows().keySet())
@@ -670,7 +670,7 @@
AliasInfoPOJO alias = (AliasInfoPOJO)aliasInfo;
//
- String propName = PREFIX_PARAMETER_ALIAS_NAME + "." +
aliasInfo.getName();
+ String propName = PREFIX_PARAMETER_ALIAS_NAME + "." + aliasInfo.getId();
if (alias.page.getProperties().keySet().contains(propName))
{
alias.page.setDeclaredProperty(propName,null);
@@ -978,7 +978,7 @@
this.immutableWindows = Collections.unmodifiableMap(windows);
}
- public String getName()
+ public String getId()
{
return name;
}
@@ -1012,7 +1012,7 @@
this.immutableNames = Collections.unmodifiableSet(names);
}
- public String getName()
+ public String getId()
{
return 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-07-24
14:09:33 UTC (rev 11577)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-07-24
14:11:47 UTC (rev 11578)
@@ -354,7 +354,7 @@
assertTrue(bindings1.size() == 1);
AliasBindingInfo info = bindings1.iterator().next();
- assertTrue(info.getName().equals("alias1"));
+ assertTrue(info.getId().equals("alias1"));
assertTrue(info.getNames().size() == 3);
assertTrue(info.getNames().contains(qname1));
assertTrue(info.getNames().contains(qname2));
@@ -372,11 +372,11 @@
for (AliasBindingInfo aliasBindingInfo : bindings2)
{
- if (aliasBindingInfo.getName().equals("alias2"))
+ if (aliasBindingInfo.getId().equals("alias2"))
{
info2 = aliasBindingInfo;
}
- if (aliasBindingInfo.getName().equals("alias3"))
+ if (aliasBindingInfo.getId().equals("alias3"))
{
info3 = aliasBindingInfo;
}
@@ -387,13 +387,13 @@
assertNotNull(info2);
assertNotNull(info3);
- assertTrue(info2.getName().equals("alias2"));
+ assertTrue(info2.getId().equals("alias2"));
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.getId().equals("alias3"));
assertTrue(info3.getNames().size() == 3);
assertTrue(info3.getNames().contains(qname7));
assertTrue(info3.getNames().contains(qname8));
Show replies by date