Author: gvanmatre
Date: Sat Oct 29 07:54:24 2005
New Revision: 329420
URL: http://svn.apache.org/viewcvs?rev=329420&view=rev
Log:
This fix addresses the ComponentBean potentially having two id property states.
The id is now stored in the attributes map.
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentBean.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentBean.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentBean.java?rev=329420&r1=329419&r2=329420&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentBean.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentBean.java
Sat Oct 29 07:54:24 2005
@@ -63,12 +63,7 @@
protected static Messages messages = new Messages(
"org.apache.shale.clay.Bundle", ComponentBean.class
.getClassLoader());
-
- /**
- * <p>This value will be used to set the <code>UIComponent.id</code>
property</p>
- */
- private String id = null;
-
+
/**
* <p>Unique id that points to component meta information</p>
*/
@@ -684,7 +679,11 @@
* </p>
*/
public String getId() {
- return id;
+ AttributeBean attr = (AttributeBean) attributes.get("id");
+ if (attr != null)
+ return attr.getValue();
+
+ return null;
}
/**
@@ -692,7 +691,11 @@
* property. </p>
*/
public void setId(String string) {
- id = string;
+ AttributeBean attr = new AttributeBean();
+ attr.setBindingType(AttributeBean.BINDING_TYPE_NONE);
+ attr.setValue(string);
+ attr.setName("id");
+ addAttribute(attr);
}
/**
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java?rev=329420&r1=329419&r2=329420&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
Sat Oct 29 07:54:24 2005
@@ -499,10 +499,7 @@
// inherit component type
if (b.getComponentType() == null)
b.setComponentType(b.getIsAParent().getComponentType());
-
- if (b.getId() == null)
- b.setId(b.getIsAParent().getId());
-
+
if (b.getAllowBody() == null)
b.setAllowBody(b.getIsAParent().getAllowBody());
Modified:
struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html?rev=329420&r1=329419&r2=329420&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html
(original)
+++
struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html
Sat Oct 29 07:54:24 2005
@@ -5,6 +5,9 @@
<input id=street1 value="#{managed-bean-name.street1}" type=text
size=45>
</span>
<span jsfid="subview" allowBody="true">
- <input id=street1 value="#{managed-bean-name.street1}" type=text
size=45>
+ <input id=street1 value="#{managed-bean-name.street1}" type=text
size=45>
+ <input [EMAIL PROTECTED] value="#{managed-bean-name.street1}" type=text
size=45>
+ <input [EMAIL PROTECTED] value="#{managed-bean-name.street1}" type=text
size=45>
+
</span>
</form>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
