Author: craigmcc
Date: Tue Jun 27 22:07:41 2006
New Revision: 417670
URL: http://svn.apache.org/viewvc?rev=417670&view=rev
Log:
Fix botched support for @Property ... need to recognize the default
value ("") for the name attribute, as well as null.
Modified:
struts/shale/trunk/shale-tiger/src/main/java/org/apache/shale/tiger/faces/LifecycleListener.java
struts/shale/trunk/shale-tiger/src/main/java/org/apache/shale/tiger/managed/config/ManagedPropertyConfig.java
struts/shale/trunk/shale-tiger/src/test/java/org/apache/shale/tiger/config/TestBean.java
Modified:
struts/shale/trunk/shale-tiger/src/main/java/org/apache/shale/tiger/faces/LifecycleListener.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-tiger/src/main/java/org/apache/shale/tiger/faces/LifecycleListener.java?rev=417670&r1=417669&r2=417670&view=diff
==============================================================================
---
struts/shale/trunk/shale-tiger/src/main/java/org/apache/shale/tiger/faces/LifecycleListener.java
(original)
+++
struts/shale/trunk/shale-tiger/src/main/java/org/apache/shale/tiger/faces/LifecycleListener.java
Tue Jun 27 22:07:41 2006
@@ -598,16 +598,19 @@
default:
break;
}
- // FIXME - should we look for inherited fields with @Value too?
+ // FIXME - should we look for inherited fields with
@Property/@Value too?
for (Field field : clazz.getDeclaredFields()) {
if (log().isTraceEnabled()) {
log().trace(" Scanning field '" + field.getName() + "'");
}
Property property = (Property)
field.getAnnotation(Property.class);
if (property != null) {
+ if (log().isDebugEnabled()) {
+ log().debug(" Field '" + field.getName() + "' has a
@Property annotation");
+ }
ManagedPropertyConfig mpc = new ManagedPropertyConfig();
String name = property.name();
- if (name == null) {
+ if ((name == null) || "".equals(name)) {
name = field.getName();
}
mpc.setName(name);
@@ -618,17 +621,17 @@
}
// Support deprecated @Value annotation as well
Value value = (Value) field.getAnnotation(Value.class);
- if (value == null) {
+ if (value != null) {
+ if (log().isDebugEnabled()) {
+ log().debug(" Field '" + field.getName() + "' has a
@Value annotation");
+ }
+ ManagedPropertyConfig mpc = new ManagedPropertyConfig();
+ mpc.setName(field.getName());
+ mpc.setType(field.getType().getName()); // FIXME -
primitives, arrays, etc.
+ mpc.setValue(value.value());
+ mbc.addProperty(mpc);
continue;
}
- if (log().isDebugEnabled()) {
- log().debug(" Field '" + field.getName() + "' has a
@Value annotation");
- }
- ManagedPropertyConfig mpc = new ManagedPropertyConfig();
- mpc.setName(field.getName());
- mpc.setType(field.getType().getName()); // FIXME - primitives,
arrays, etc.
- mpc.setValue(value.value());
- mbc.addProperty(mpc);
}
config.addManagedBean(mbc);
}
Modified:
struts/shale/trunk/shale-tiger/src/main/java/org/apache/shale/tiger/managed/config/ManagedPropertyConfig.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-tiger/src/main/java/org/apache/shale/tiger/managed/config/ManagedPropertyConfig.java?rev=417670&r1=417669&r2=417670&view=diff
==============================================================================
---
struts/shale/trunk/shale-tiger/src/main/java/org/apache/shale/tiger/managed/config/ManagedPropertyConfig.java
(original)
+++
struts/shale/trunk/shale-tiger/src/main/java/org/apache/shale/tiger/managed/config/ManagedPropertyConfig.java
Tue Jun 27 22:07:41 2006
@@ -178,4 +178,20 @@
this.mapEntries = mapEntries;
}
+
+ /**
+ * <p>Pretty printing toString() method.</p>
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("ManagedPropertyConfig");
+ sb.append("[name=" + getName());
+ sb.append(",type=" + getType());
+ sb.append(",value=" + getValue());
+ sb.append(",nullValue=" + isNullValue());
+ return sb.toString();
+
+ }
+
+
}
Modified:
struts/shale/trunk/shale-tiger/src/test/java/org/apache/shale/tiger/config/TestBean.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-tiger/src/test/java/org/apache/shale/tiger/config/TestBean.java?rev=417670&r1=417669&r2=417670&view=diff
==============================================================================
---
struts/shale/trunk/shale-tiger/src/test/java/org/apache/shale/tiger/config/TestBean.java
(original)
+++
struts/shale/trunk/shale-tiger/src/test/java/org/apache/shale/tiger/config/TestBean.java
Tue Jun 27 22:07:41 2006
@@ -34,8 +34,8 @@
/**
* Holds value of property byteProperty.
*/
- @Property(name="byteProperty", value="-1")
- private byte m_byteProperty = (byte) 1;
+ @Property("-1")
+ private byte byteProperty = (byte) 1;
/**
* Getter for property byteProperty.
@@ -43,7 +43,7 @@
*/
public byte getByteProperty() {
- return this.m_byteProperty;
+ return this.byteProperty;
}
/**
@@ -82,8 +82,8 @@
/**
* Holds value of property doubleProperty.
*/
- @Property("-2.0")
- private double doubleProperty = (double) 2.0;
+ @Property(name="doubleProperty", value="-2.0")
+ private double m_doubleProperty = (double) 2.0;
/**
* Getter for property doubleProperty.
@@ -91,7 +91,7 @@
*/
public double getDoubleProperty() {
- return this.doubleProperty;
+ return this.m_doubleProperty;
}
/**
@@ -100,7 +100,7 @@
*/
public void setDoubleProperty(double doubleProperty) {
- this.doubleProperty = doubleProperty;
+ this.m_doubleProperty = doubleProperty;
}
/**
@@ -130,8 +130,8 @@
/**
* Holds value of property intProperty.
*/
- @Property("-4")
- private int intProperty = 4;
+ @Property(name="intProperty", value="-4")
+ private int _intProperty = 4;
/**
* Getter for property intProperty.
@@ -139,7 +139,7 @@
*/
public int getIntProperty() {
- return this.intProperty;
+ return this._intProperty;
}
/**
@@ -148,7 +148,7 @@
*/
public void setIntProperty(int intProperty) {
- this.intProperty = intProperty;
+ this._intProperty = intProperty;
}
/**
