Author: ekoneil
Date: Wed Apr 27 19:13:41 2005
New Revision: 165088
URL: http://svn.apache.org/viewcvs?rev=165088&view=rev
Log:
NetUI bug fix:
BEEHIVE-574 netui's dataSource expression language is able to bind to
public fields
This aligns the NetUI expression language more closely with the JSP 2.0 EL in
that both bind only to JavaBean properties and not to public class fields.
The change could cause some compatability problems with previously written
JPFs; to fix this problem simply add JavaBean a getter and setter for the
public field.
BB: self
DRT: NetUI pass
BVT: NetUI pass
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowBeanContext.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/PropertyCache.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b34263/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b37913/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38183/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38184/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39434/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b43011/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/cr137279/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/checkboxDemo/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/lifecycleExceptions/lifecycleExceptionsController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/readonlyAction/readonlyActionController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/anotherNonLongLived/AnotherNonLongLivedController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/longLived/LongLivedController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/nonLongLived/NonLongLivedController.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/a/FlowA.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/b/FlowB.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/pfScopingController.jpf
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowBeanContext.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowBeanContext.java?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowBeanContext.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowBeanContext.java
Wed Apr 27 19:13:41 2005
@@ -17,7 +17,7 @@
*/
package org.apache.beehive.netui.pageflow.internal;
-import org.apache.beehive.controls.runtime.servlet.ServletBeanContext;
+import org.apache.beehive.controls.runtime.servlet. ServletBeanContext;
import org.apache.beehive.netui.pageflow.ActionResolver;
import javax.servlet.ServletRequest;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/tokens/ExpressionToken.java
Wed Apr 27 19:13:41 2005
@@ -154,32 +154,6 @@
String id = identifier.toString();
Class beanType = bean.getClass();
- Field f = PROPERTY_CACHE.getField(beanType, id);
- if(f != null) {
- Class targetType = f.getType();
- try {
- if(java.util.List.class.isAssignableFrom(targetType)) {
- List list = (List)f.get(bean);
- applyValuesToList(value, list);
-
- return;
- } else {
- if(LOGGER.isDebugEnabled())
- LOGGER.debug("Apply value via field: " + f);
-
- Object converted = ParseUtils.convertType(value,
targetType);
- f.set(bean, converted);
-
- return;
- }
- } catch(Exception e) {
- String msg = "Could not update field named \"" + id + "\" on
bean of type \"" + beanType + "\". Cause: " + e;
- if(LOGGER.isErrorEnabled())
- LOGGER.error(msg, e);
- throw new RuntimeException(msg, e);
- }
- }
-
Class propType = PROPERTY_CACHE.getPropertyType(beanType, id);
if(propType != null) {
try {
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java
Wed Apr 27 19:13:41 2005
@@ -17,11 +17,8 @@
*/
package org.apache.beehive.netui.script.el.util;
-import org.apache.beehive.netui.util.internal.InternalStringBuilder;
-
import java.io.StringReader;
import java.lang.reflect.Array;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -31,6 +28,7 @@
import org.apache.beehive.netui.script.el.ExpressionParseException;
import org.apache.beehive.netui.script.el.parser.TokenMgrError;
import org.apache.beehive.netui.script.el.parser.ParseException;
+import org.apache.beehive.netui.util.internal.InternalStringBuilder;
import org.apache.beehive.netui.util.internal.cache.PropertyCache;
import org.apache.beehive.netui.util.type.TypeUtils;
import org.apache.beehive.netui.util.logging.Logger;
@@ -42,12 +40,10 @@
private static final Logger LOGGER = Logger.getInstance(ParseUtils.class);
- private static final HashMap/*<String, ParsedExpression>*/ PARSED_CACHE =
- new HashMap/*<String, ParsedExpression>*/();
+ private static final HashMap/*<String, ParsedExpression>*/ PARSED_CACHE =
new HashMap/*<String, ParsedExpression>*/();
/* do not construct */
- private ParseUtils() {
- }
+ private ParseUtils() {}
public static final ParsedExpression parse(String exprStr) {
ParsedExpression pe = (ParsedExpression) PARSED_CACHE.get(exprStr);
@@ -69,13 +65,11 @@
return expr;
} catch(ParseException e) {
String msg = "Error occurred parsing expression \"" + exprStr +
"\".";
- if(LOGGER.isErrorEnabled())
- LOGGER.error(msg, e);
+ LOGGER.error(msg, e);
throw new ExpressionParseException(msg, e);
} catch(TokenMgrError tm) {
String msg = "Error occurred parsing expression \"" + exprStr +
"\".";
- if(LOGGER.isErrorEnabled())
- LOGGER.error(msg, tm);
+ LOGGER.error(msg, tm);
throw new ExpressionParseException(msg, tm);
}
}
@@ -97,16 +91,11 @@
assert cache != null;
Class type = value.getClass();
- Field f = cache.getField(type, name);
- if(f != null)
- return f.getType();
Method m = cache.getPropertySetter(type, name);
if(m == null) {
String msg = "Can not find setter method for property \"" + name +
"\" on object of type \"" + value.getClass() + "\".";
-
- if(LOGGER.isErrorEnabled())
- LOGGER.error(msg);
+ LOGGER.error(msg);
throw new RuntimeException(msg);
}
// PropertyCache guarantees that props are found and match JavaBean
naming rules
@@ -122,32 +111,19 @@
Class type = value.getClass();
- Field f = cache.getField(type, name);
- if(f != null) {
- try {
- return f.get(value);
- } catch(Exception e) {
- String msg = "An error occurred evaluating the field \"" +
name + "\" on an object of type \"" + type + "\".";
- if(LOGGER.isDebugEnabled())
- LOGGER.debug(msg, e);
- throw new RuntimeException(msg, e);
- }
- }
-
Method m = cache.getPropertyGetter(type, name);
if(m != null) {
try {
return m.invoke(value, (Object[])null);
} catch(Exception e) {
String msg = "An error occurred invoking a getter for the
property \"" + name + "\" on an object of type \"" + type + "\".";
- if(LOGGER.isDebugEnabled()) LOGGER.debug(msg, e);
+ LOGGER.error(msg, e);
throw new RuntimeException(msg, e);
}
}
String msg = "Could not find property or field \"" + name + "\" on
object of type \"" + type + "\"";
- if(LOGGER.isDebugEnabled())
- LOGGER.debug(msg);
+ LOGGER.error(msg);
throw new RuntimeException(msg);
}
@@ -179,11 +155,11 @@
for(int i = 0; i < strs.length; i++) {
Object o = null;
try {
+ /* todo: support getting the Locale here in an
ExpressionContext object */
o = TypeUtils.convertToObject(strs[i], compType);
} catch(IllegalArgumentException e) {
String msg = "Can not set Object types via
expressions that are not supported by the set of registered type converters.
Cause: " + e;
- if(LOGGER.isErrorEnabled())
- LOGGER.error(msg, e);
+ LOGGER.error(msg, e);
throw new RuntimeException(msg, e);
}
@@ -195,10 +171,7 @@
}
// convert the String into its target type and return the result
else {
- if(LOGGER.isDebugEnabled())
- LOGGER.debug("convert value \"" + value + "\" to type: " +
toType);
-
- // If the "value" is multi-valued (String[]), it needs to be
converted into a single-valued object.
+ // If the "value" is multi-valued (String[]), it needs to be
converted into a single-valued object.
// There is no policy defined for how we do this right now, so
the first one will always win when
// multiple expressions reference the same property. When
that property is a String type, the result
// is an HttpServletRequest that contains a String[], and
here, we'll always the String[0].
@@ -214,16 +187,14 @@
return TypeUtils.convertToObject((String)value, toType);
} catch(IllegalArgumentException e) {
- String msg = "The type \"" + toType.getName() + "\" can
not be set through XScript with the update value \"" + value + "\"";
- if(LOGGER.isErrorEnabled())
- LOGGER.error(msg, e);
+ String msg = "The type \"" + toType.getName() + "\" can
not be set through the NetUI expression language.";
+ LOGGER.error(msg, e);
throw new RuntimeException(msg, e);
}
}
} catch(Exception e) {
String msg = "Unable to convert a value of type \"" +
value.getClass() + "\" to the array element type of \"" + toType + "\". Cause:
" + e;
- if(LOGGER.isErrorEnabled())
- LOGGER.error(msg, e);
+ LOGGER.error(msg, e);
throw new RuntimeException(msg, e);
}
}
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/PropertyCache.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/PropertyCache.java?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/PropertyCache.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/internal/cache/PropertyCache.java
Wed Apr 27 19:13:41 2005
@@ -20,13 +20,12 @@
import java.beans.Introspector;
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import
org.apache.beehive.netui.util.internal.concurrent.InternalConcurrentHashMap;
import java.util.HashMap;
import java.util.Iterator;
+import
org.apache.beehive.netui.util.internal.concurrent.InternalConcurrentHashMap;
import org.apache.beehive.netui.util.logging.Logger;
/**
@@ -36,10 +35,8 @@
* of Java classes. It is primarily used in the NetUI expression engine
* to provide fast access to the properties and fields of classes
* against which expressions are being evaluated.
- *
- * @exclude
*/
-public class PropertyCache {
+public final class PropertyCache {
private static final Logger LOGGER =
Logger.getInstance(PropertyCache.class);
@@ -51,7 +48,7 @@
/**
* Get an array of [EMAIL PROTECTED] java.beans.PropertyDescriptor}
objects that
- * describe JavaBean properties of the given <code>type</code>. This
+ * describe JavaBean properties of the given <code>_type</code>. This
* array <b>should not</b> be modified.
*
* @param type the [EMAIL PROTECTED] java.lang.Class} whose JavaBean
properties to find
@@ -64,30 +61,28 @@
public final Method getPropertyGetter(Class type, String property) {
CachedClass cc = getCachedClass(type);
- if(cc == null) return null;
+ if(cc == null)
+ return null;
CachedProperty cp = cc.getProperty(property);
return (cp != null ? cp.getReadMethod() : null);
}
public final Method getPropertySetter(Class type, String property) {
CachedClass cc = getCachedClass(type);
- if(cc == null) return null;
+ if(cc == null)
+ return null;
CachedProperty cp = cc.getProperty(property);
return (cp != null ? cp.getWriteMethod() : null);
}
public final Class getPropertyType(Class type, String property) {
CachedClass cc = getCachedClass(type);
- if(cc == null) return null;
+ if(cc == null)
+ return null;
CachedProperty cp = cc.getProperty(property);
return (cp != null ? cp.getType() : null);
}
- public final Field getField(Class type, String field) {
- CachedClass cc = getCachedClass(type);
- return (cc != null ? cc.getField(field) : null);
- }
-
private final CachedClass getCachedClass(Class type) {
Object obj = _classCache.get(type);
if(obj == null) {
@@ -95,8 +90,7 @@
obj = new CachedClass(type);
_classCache.put(type, obj);
} catch(Exception e) {
- if(LOGGER.isErrorEnabled())
- LOGGER.error("Error introspecting a class of _type \"" +
type + "\" when determining its JavaBean property info", e);
+ LOGGER.error("Error introspecting a class of _type \"" + type
+ "\" when determining its JavaBean property info", e);
return null;
}
}
@@ -105,40 +99,32 @@
}
/**
- * @exclude
+ *
*/
private class CachedClass {
- private Class type = null;
- private HashMap props = null;
- private HashMap fields = null;
- private PropertyDescriptor[] pds = null;
+ private Class _type = null;
+ private HashMap _properties = null;
+ private PropertyDescriptor[] _propertyDescriptors = null;
CachedClass(Class type)
throws IntrospectionException {
- this.type = type;
+ this._type = type;
init(type);
}
private void init(Class type)
throws IntrospectionException {
- props = new HashMap();
+ _properties = new HashMap();
if(Modifier.isPublic(type.getModifiers())) {
PropertyDescriptor[] pds =
Introspector.getBeanInfo(type).getPropertyDescriptors();
for(int i = 0; i < pds.length; i++) {
- props.put(pds[i].getName(), new CachedProperty(pds[i]));
+ _properties.put(pds[i].getName(), new
CachedProperty(pds[i]));
}
-
- fields = new HashMap();
- Field[] fs = type.getFields();
- for(int i = 0; i < fs.length; i++) {
- if(Modifier.isPublic(fs[i].getModifiers()) &&
- !Modifier.isStatic(fs[i].getModifiers()))
- fields.put(fs[i].getName(), new CachedField(fs[i]));
- }
- } else // not looking at a public class, get all of the JavaBean
PDs off of its interfaces
- {
+ }
+ // not looking at a public class, get all of the JavaBean PDs off
of its interfaces
+ else {
// look on the public interfaces on this class and all
superclasses
for(Class c = type; c != null; c = c.getSuperclass()) {
Class[] interfaces = c.getInterfaces();
@@ -147,13 +133,13 @@
if(Modifier.isPublic(iface.getModifiers())) {
PropertyDescriptor[] pds =
Introspector.getBeanInfo(iface).getPropertyDescriptors();
for(int j = 0; j < pds.length; j++) {
- if(!props.containsKey(pds[j].getName()))
- props.put(pds[j].getName(), new
CachedProperty(pds[j]));
+ if(!_properties.containsKey(pds[j].getName()))
+ _properties.put(pds[j].getName(), new
CachedProperty(pds[j]));
}
}
}
}
-
+
// look on the nearest public base class
Class baseClass = type.getSuperclass();
while(!Modifier.isPublic(baseClass.getModifiers())) {
@@ -162,44 +148,31 @@
PropertyDescriptor[] pds =
Introspector.getBeanInfo(baseClass).getPropertyDescriptors();
for(int j = 0; j < pds.length; j++) {
- if(!props.containsKey(pds[j].getName()))
- props.put(pds[j].getName(), new
CachedProperty(pds[j]));
- }
-
- // look for the public fields on this base class
- fields = new HashMap();
- Field[] fs = baseClass.getFields();
- for(int i = 0; i < fs.length; i++) {
- if(Modifier.isPublic(fs[i].getModifiers()) &&
!Modifier.isStatic(fs[i].getModifiers()))
- fields.put(fs[i].getName(), new CachedField(fs[i]));
+ if(!_properties.containsKey(pds[j].getName()))
+ _properties.put(pds[j].getName(), new
CachedProperty(pds[j]));
}
}
- if(props.size() > 0) {
- pds = new PropertyDescriptor[props.size()];
- Iterator iterator = props.values().iterator();
+ if(_properties.size() > 0) {
+ _propertyDescriptors = new
PropertyDescriptor[_properties.size()];
+ Iterator iterator = _properties.values().iterator();
for(int i = 0; iterator.hasNext(); i++) {
- pds[i] =
((CachedProperty)iterator.next()).getPropertyDescriptor();
+ _propertyDescriptors[i] =
((CachedProperty)iterator.next()).getPropertyDescriptor();
}
}
}
PropertyDescriptor[] getPropertyDescriptors() {
- return pds;
- }
-
- Field getField(String name) {
- CachedField cf = (CachedField)fields.get(name);
- return (cf != null ? cf.getField() : null);
+ return _propertyDescriptors;
}
CachedProperty getProperty(String name) {
- return (CachedProperty)props.get(name);
+ return (CachedProperty)_properties.get(name);
}
}
/**
- * @exclude
+ *
*/
private class CachedProperty {
@@ -235,28 +208,6 @@
Class getType() {
return _type;
- }
- }
-
- /**
- * @exclude
- */
- private class CachedField {
-
- private Field _field = null;
- private String _name = null;
-
- CachedField(Field field) {
- _name = field.getName();
- _field = field;
- }
-
- Field getField() {
- return _field;
- }
-
- String getName() {
- return _name;
}
}
}
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/beans/ComplexTypeActionForm.java
Wed Apr 27 19:13:41 2005
@@ -17,33 +17,19 @@
*/
package org.apache.beehive.netui.test.beans;
-// java imports
-
import java.math.BigDecimal;
-
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-// internal imports
-
-// external imports
-
/**
*
*/
public class ComplexTypeActionForm
extends SimpleTypeActionForm {
- public Map pubMap = null;
- public List pubList = null;
- public SimpleTypeActionForm[] pubArray = null;
-
- public BigDecimal publicBigDecimal = null;
- public Date publicDate = null;
-
private Map _map = null;
private List _list = null;
private SimpleTypeActionForm[] _array = null;
@@ -54,10 +40,6 @@
_map = new HashMap();
_list = new ArrayList();
_array = new SimpleTypeActionForm[10];
-
- pubMap = _map;
- pubList = _list;
- pubArray = _array;
populate();
}
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
Wed Apr 27 19:13:41 2005
@@ -207,18 +207,11 @@
{
{"{requestScope.myNewBean}", new SimpleTypeActionForm()},
{"{sessionScope.anotherBean}", new ComplexTypeActionForm()},
-
{"{actionForm.bigDecimal}", new
BigDecimal("1234567890.98273835093245")},
{"{actionForm.date}", new Date()},
- {"{actionForm.publicBigDecimal}", new
BigDecimal("1234567890.98273835093245")},
- {"{actionForm.publicDate}", new Date()},
-
{"{sessionScope.complexBean}", new ComplexTypeActionForm()}, //
this must precede the next four tests
-
{"{sessionScope.complexBean.bigDecimal}", new
BigDecimal("1234567890.98273835093245")},
{"{sessionScope.complexBean.date}", new Date()},
- {"{sessionScope.complexBean.publicBigDecimal}", new
BigDecimal("1234567890.98273835093245")},
- {"{sessionScope.complexBean.publicDate}", new Date()},
{"{actionForm.array[2].intWrapperProperty}", new Integer(42)},
{"{actionForm.array[2].intWrapperArrayProperty}", new
Integer[]{new Integer(42)}},
// {"{request.complexBean.array[2].intWrapperArrayProperty}", new
Integer(42)} // should this work?
@@ -227,24 +220,24 @@
private Object[][] complexUpdateData =
{
// expr, value, update expr, expected object result, comparator
- {"{actionForm.pubMap.bean.shortProperty}",
+ {"{actionForm.map.bean.shortProperty}",
"4",
new Short((short)4),
new UpdateComparatorAdaptor() {
public void compareComplex(Object expected,
ComplexTypeActionForm complexBean) {
assertEquals(((Short)expected).shortValue(),
-
((SimpleTypeActionForm)complexBean.pubMap.get("bean")).getShortProperty());
+
((SimpleTypeActionForm)complexBean.getMap().get("bean")).getShortProperty());
}
}
},
- {"{actionForm.pubArray[0].shortProperty}",
+ {"{actionForm.array[0].shortProperty}",
"7",
new Short((short)7),
new UpdateComparatorAdaptor() {
public void compareComplex(Object expected,
ComplexTypeActionForm complexBean) {
assertEquals(((Short)expected).shortValue(),
-
((SimpleTypeActionForm)complexBean.pubArray[0]).getShortProperty());
+
((SimpleTypeActionForm)complexBean.getArray()[0]).getShortProperty());
}
}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b34263/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b34263/Controller.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b34263/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b34263/Controller.jpf
Wed Apr 27 19:13:41 2005
@@ -23,215 +23,20 @@
import org.apache.beehive.netui.pageflow.annotations.Jpf;
/**
- * @jpf:view-properties view-properties::
- * <!-- This data is auto-generated. Hand-editing this section is not
recommended. -->
- * <view-properties>
- * <pageflow-object id="pageflow:/bugs/b34263/Controller.jpf"/>
- * <pageflow-object id="page:begin.jsp">
- * <property value="280" name="x"/>
- * <property value="120" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="formbean:bugs.b34263.Controller.Search"/>
- * <pageflow-object
id="formbeanprop:bugs.b34263.Controller.Search#query#java.lang.String"/>
- * <pageflow-object id="formbean:bugs.b34263.Controller.Name"/>
- * <pageflow-object
id="formbeanprop:bugs.b34263.Controller.Name#firstName#java.lang.String"/>
- * <pageflow-object
id="formbeanprop:bugs.b34263.Controller.Name#lastName#java.lang.String"/>
- * <pageflow-object id="action:begin.do">
- * <property value="100" name="x"/>
- * <property value="120" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@">
- * <property value="136,190,190,244" name="elbowsX"/>
- * <property value="112,112,112,112" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * <property value="begin" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="action:EnterName.do#bugs.b34263.Controller.Name">
- * <property value="440" name="x"/>
- * <property value="120" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:EnterSearch.do#bugs.b34263.Controller.Search">
- * <property value="440" name="x"/>
- * <property value="260" name="y"/>
- * </pageflow-object>
- * <pageflow-object
id="action:EnterAdvancedSearch.do#bugs.b34263.Controller.Search">
- * <property value="440" name="x"/>
- * <property value="340" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:DeleteName.do#bugs.b34263.Controller.Name">
- * <property value="440" name="x"/>
- * <property value="180" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:EnterName.do#bugs.b34263.Controller.Name@">
- * <property value="316,360,360,404" name="elbowsX"/>
- * <property value="112,112,112,112" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:DeleteName.do#bugs.b34263.Controller.Name@">
- * <property value="316,360,360,404" name="elbowsX"/>
- * <property value="123,123,172,172" name="elbowsY"/>
- * <property value="East_2" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:EnterSearch.do#bugs.b34263.Controller.Search@">
- * <property value="316,360,360,404" name="elbowsX"/>
- * <property value="123,123,252,252" name="elbowsY"/>
- * <property value="East_2" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:EnterAdvancedSearch.do#bugs.b34263.Controller.Search@">
- * <property value="316,360,360,404" name="elbowsX"/>
- * <property value="123,123,332,332" name="elbowsY"/>
- * <property value="East_2" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:begin.do@">
- * <property value="244,190,190,136" name="elbowsX"/>
- * <property value="101,101,101,101" name="elbowsY"/>
- * <property value="West_0" name="fromPort"/>
- * <property value="East_0" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL
PROTECTED]:EnterName.do#bugs.b34263.Controller.Name@">
- * <property value="476,476,136,136" name="elbowsX"/>
- * <property value="101,156,156,101" name="elbowsY"/>
- * <property value="East_0" name="fromPort"/>
- * <property value="East_0" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL
PROTECTED]:DeleteName.do#bugs.b34263.Controller.Name@">
- * <property value="476,476,306,136" name="elbowsX"/>
- * <property value="172,123,123,123" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="East_2" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL
PROTECTED]:EnterSearch.do#bugs.b34263.Controller.Search@">
- * <property value="476,476,306,136" name="elbowsX"/>
- * <property value="252,123,123,123" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="East_2" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL
PROTECTED]:EnterAdvancedSearch.do#bugs.b34263.Controller.Search@">
- * <property value="476,476,306,136" name="elbowsX"/>
- * <property value="332,123,123,123" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="East_2" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * </view-properties>
- * ::
- *
+ * @jpf:controller
*/
[EMAIL PROTECTED](
- )
[EMAIL PROTECTED](
- value = {
- "<!-- This data is auto-generated. Hand-editing this section is not
recommended. -->",
- "<view-properties>",
- "<pageflow-object id='pageflow:/bugs/b34263/Controller.jpf'/>",
- "<pageflow-object id='page:begin.jsp'>",
- " <property value='280' name='x'/>",
- " <property value='120' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='formbean:bugs.b34263.Controller.Search'/>",
- "<pageflow-object
id='formbeanprop:bugs.b34263.Controller.Search#query#java.lang.String'/>",
- "<pageflow-object id='formbean:bugs.b34263.Controller.Name'/>",
- "<pageflow-object
id='formbeanprop:bugs.b34263.Controller.Name#firstName#java.lang.String'/>",
- "<pageflow-object
id='formbeanprop:bugs.b34263.Controller.Name#lastName#java.lang.String'/>",
- "<pageflow-object id='action:begin.do'>",
- " <property value='100' name='x'/>",
- " <property value='120' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>",
- " <property value='136,190,190,244' name='elbowsX'/>",
- " <property value='112,112,112,112' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- " <property value='begin' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object
id='action:EnterName.do#bugs.b34263.Controller.Name'>",
- " <property value='440' name='x'/>",
- " <property value='120' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object
id='action:EnterSearch.do#bugs.b34263.Controller.Search'>",
- " <property value='440' name='x'/>",
- " <property value='260' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object
id='action:EnterAdvancedSearch.do#bugs.b34263.Controller.Search'>",
- " <property value='440' name='x'/>",
- " <property value='340' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object
id='action:DeleteName.do#bugs.b34263.Controller.Name'>",
- " <property value='440' name='x'/>",
- " <property value='180' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:EnterName.do#bugs.b34263.Controller.Name@'>",
- " <property value='316,360,360,404' name='elbowsX'/>",
- " <property value='112,112,112,112' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:DeleteName.do#bugs.b34263.Controller.Name@'>",
- " <property value='316,360,360,404' name='elbowsX'/>",
- " <property value='123,123,172,172' name='elbowsY'/>",
- " <property value='East_2' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:EnterSearch.do#bugs.b34263.Controller.Search@'>",
- " <property value='316,360,360,404' name='elbowsX'/>",
- " <property value='123,123,252,252' name='elbowsY'/>",
- " <property value='East_2' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:EnterAdvancedSearch.do#bugs.b34263.Controller.Search@'>",
- " <property value='316,360,360,404' name='elbowsX'/>",
- " <property value='123,123,332,332' name='elbowsY'/>",
- " <property value='East_2' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='244,190,190,136' name='elbowsX'/>",
- " <property value='101,101,101,101' name='elbowsY'/>",
- " <property value='West_0' name='fromPort'/>",
- " <property value='East_0' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL
PROTECTED]:EnterName.do#bugs.b34263.Controller.Name@'>",
- " <property value='476,476,136,136' name='elbowsX'/>",
- " <property value='101,156,156,101' name='elbowsY'/>",
- " <property value='East_0' name='fromPort'/>",
- " <property value='East_0' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL
PROTECTED]:DeleteName.do#bugs.b34263.Controller.Name@'>",
- " <property value='476,476,306,136' name='elbowsX'/>",
- " <property value='172,123,123,123' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='East_2' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL
PROTECTED]:EnterSearch.do#bugs.b34263.Controller.Search@'>",
- " <property value='476,476,306,136' name='elbowsX'/>",
- " <property value='252,123,123,123' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='East_2' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL
PROTECTED]:EnterAdvancedSearch.do#bugs.b34263.Controller.Search@'>",
- " <property value='476,476,306,136' name='elbowsX'/>",
- " <property value='332,123,123,123' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='East_2' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "</view-properties>"
- })
[EMAIL PROTECTED]()
public class Controller extends PageFlowController
{
- public boolean advanced = true;
- public boolean verbose = false;
+ private boolean advanced = true;
+ public boolean getAdvanced() {
+ return advanced;
+ }
+
+ private boolean verbose = false;
+ public boolean getVerbose() {
+ return verbose;
+ }
/**
* @jpf:action
@@ -248,10 +53,6 @@
return new Forward("begin");
}
- /**
- * @jpf:action
- * @jpf:forward name="success" path="begin.do"
- */
@Jpf.Action(
forwards = {
@Jpf.Forward(
@@ -315,7 +116,6 @@
{
private java.lang.String query;
-
public void setQuery(java.lang.String query)
{
this.query = query;
@@ -335,7 +135,6 @@
private java.lang.String lastName;
private java.lang.String firstName;
-
public void setFirstName(java.lang.String firstName)
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b37913/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b37913/Controller.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b37913/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b37913/Controller.jpf
Wed Apr 27 19:13:41 2005
@@ -29,9 +29,15 @@
)
public class Controller extends PageFlowController
{
+ private String[] stringValues;
+ public String[] getStringValues() {
+ return stringValues;
+ }
- public String[] stringValues;
- public ArrayList listValues;
+ private ArrayList listValues;
+ public ArrayList getListValues() {
+ return listValues;
+ }
/**
* This method represents the point of entry into the pageflow
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/Controller.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38182/Controller.jpf
Wed Apr 27 19:13:41 2005
@@ -28,10 +28,10 @@
)
public class Controller extends PageFlowController
{
+ private String[] selectOptions = {"Option 1", "Option 2", "Option 3",
"Option 4", "Option 5"};
public String[] getSelectOptions() {
return selectOptions;
}
- private String[] selectOptions = {"Option 1", "Option 2", "Option 3",
"Option 4", "Option 5"};
@Jpf.Action(
forwards = {
@@ -57,6 +57,10 @@
public static class Form extends FormData
{
- public String[] select = {"Option 1","Option 3"};
+ private String[] select = {"Option 1","Option 3"};
+
+ public String[] getSelect() {
+ return select;
+ }
}
}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38183/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38183/Controller.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38183/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38183/Controller.jpf
Wed Apr 27 19:13:41 2005
@@ -28,8 +28,11 @@
)
public class Controller extends PageFlowController
{
+ private String[] data = {"Radio 1", "Radio 2", "Radio 3"};
- public String[] data = {"Radio 1", "Radio 2", "Radio 3"};
+ public String[] getData() {
+ return data;
+ }
/**
* @jpf:action
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38184/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38184/Controller.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38184/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b38184/Controller.jpf
Wed Apr 27 19:13:41 2005
@@ -31,8 +31,17 @@
)
public class Controller extends PageFlowController
{
- transient public Enumeration e;
- public ArrayList list;
+ private transient Enumeration e;
+
+ public Enumeration getE() {
+ return e;
+ }
+
+ private ArrayList list;
+
+ public ArrayList getList() {
+ return list;
+ }
/**
* @jpf:action
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39434/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39434/Controller.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39434/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b39434/Controller.jpf
Wed Apr 27 19:13:41 2005
@@ -28,68 +28,17 @@
/**
* @jpf:controller
- * @jpf:view-properties view-properties::
- * <!-- This data is auto-generated. Hand-editing this section is not
recommended. -->
- * <view-properties>
- * <pageflow-object id="pageflow:/b39434/Controller.jpf"/>
- * <pageflow-object id="action:begin.do">
- * <property value="80" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="page:index.jsp">
- * <property value="240" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@">
- * <property value="116,160,160,204" name="elbowsX"/>
- * <property value="92,92,92,92" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * </view-properties>
- * ::
*/
[EMAIL PROTECTED](
- )
[EMAIL PROTECTED](
- value = {
- "<!-- This data is auto-generated. Hand-editing this section is not
recommended. -->",
- "<view-properties>",
- "<pageflow-object id='pageflow:/b39434/Controller.jpf'/>",
- "<pageflow-object id='action:begin.do'>",
- " <property value='80' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:index.jsp'>",
- " <property value='240' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>",
- " <property value='116,160,160,204' name='elbowsX'/>",
- " <property value='92,92,92,92' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "</view-properties>"
- })
[EMAIL PROTECTED]()
public class Controller extends PageFlowController
{
- public String[] stringDates = {"2003-7-4","2012-8-10"};
-
-
-
- // Uncomment this declaration to access Global.app.
- //
- // protected global.Global globalApp;
- //
-
- // For an example of page flow exception handling see the example "catch"
and "exception-handler"
- // annotations in {project}/WEB-INF/src/global/Global.app
+ private String[] stringDates = {"2003-7-4","2012-8-10"};
+
+ public String[] getStringDates() {
+ return stringDates;
+ }
/**
- * This method represents the point of entry into the pageflow
* @jpf:action
* @jpf:forward name="success" path="index.jsp"
*/
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b43011/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b43011/Controller.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b43011/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b43011/Controller.jpf
Wed Apr 27 19:13:41 2005
@@ -24,16 +24,21 @@
/**
* @jpf:controller
*/
[EMAIL PROTECTED](
- )
[EMAIL PROTECTED]()
public class Controller
extends PageFlowController
{
+ private String field1 = "foo";
- public String field1 = "foo";
+ public String getField1() {
+ return field1;
+ }
+
+ public void setField1(String field1) {
+ this.field1 = field1;
+ }
/**
- * This method represents the point of entry into the pageflow
* @jpf:action
* @jpf:forward name="success" path="index.jsp"
*/
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/cr137279/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/cr137279/Controller.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/cr137279/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/cr137279/Controller.jpf
Wed Apr 27 19:13:41 2005
@@ -22,38 +22,36 @@
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.netui.tags.tree.TreeElement;
-/**
- * This is the default controller for a blank web application.
- */
[EMAIL PROTECTED]
[EMAIL PROTECTED](
- value = {
- "<!-- This data is auto-generated. Hand-editing this section is
not recommended. -->",
- "<view-properties>",
- "<pageflow-object id='action:begin.do'>",
- " <property value='80' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>",
- " <property value='116,150,150,184' name='elbowsX'/>",
- " <property value='92,92,92,92' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:index.jsp'>",
- " <property value='220' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "</view-properties>"
- }
- )
[EMAIL PROTECTED]()
public class Controller extends PageFlowController
{
- public TreeElement tree;
- public TreeElement treeTwo;
- public TreeElement treeThree;
+ private TreeElement tree;
+ public TreeElement getTree() {
+ return tree;
+ }
+
+ public void setTree(TreeElement tree) {
+ this.tree = tree;
+ }
+ private TreeElement treeTwo;
+ public TreeElement getTreeTwo() {
+ return treeTwo;
+ }
+
+ public void setTreeTwo(TreeElement treeTwo) {
+ this.treeTwo = treeTwo;
+ }
+
+ private TreeElement treeThree;
+ public TreeElement getTreeThree() {
+ return treeThree;
+ }
+
+ public void setTreeThree(TreeElement treeThree) {
+ this.treeThree = treeThree;
+ }
+
@Jpf.Action(
forwards={
@Jpf.Forward(name = "index", path = "index.jsp")}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/checkboxDemo/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/checkboxDemo/Controller.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/checkboxDemo/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/checkboxDemo/Controller.jpf
Wed Apr 27 19:13:41 2005
@@ -35,7 +35,11 @@
})
public class Controller extends PageFlowController
{
- public Form fileInfo;
+ private Form fileInfo;
+
+ public Form getFileInfo() {
+ return fileInfo;
+ }
public static class FileInfo implements java.io.Serializable
{
@@ -50,10 +54,15 @@
public static class Form extends FormData
{
+ private FileInfo[] files;
+
public Form() {
files = new FileInfo[6];
}
- public FileInfo[] files;
+
+ public FileInfo[] getFiles() {
+ return files;
+ }
public void reset(ActionMapping mapping, ServletRequest request) {
files = new FileInfo[6];
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/lifecycleExceptions/lifecycleExceptionsController.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/lifecycleExceptions/lifecycleExceptionsController.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/lifecycleExceptions/lifecycleExceptionsController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/lifecycleExceptions/lifecycleExceptionsController.jpf
Wed Apr 27 19:13:41 2005
@@ -45,7 +45,11 @@
)
public class lifecycleExceptionsController extends PageFlowController
{
- public ArrayList history = new ArrayList();
+ private ArrayList history = new ArrayList();
+
+ public ArrayList getHistory() {
+ return history;
+ }
@Jpf.Action(
forwards = {
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/readonlyAction/readonlyActionController.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/readonlyAction/readonlyActionController.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/readonlyAction/readonlyActionController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/readonlyAction/readonlyActionController.jpf
Wed Apr 27 19:13:41 2005
@@ -33,120 +33,6 @@
* @jpf:controller read-only="false"
* @jpf:catch type="readonlyActionController.TestExceptionRO"
method="handleExceptionRO"
* @jpf:catch type="readonlyActionController.TestException"
method="handleException"
- *
- * @jpf:view-properties view-properties::
- * <!-- This data is auto-generated. Hand-editing this section is not
recommended. -->
- * <view-properties>
- * <pageflow-object
id="pageflow:/miniTests/readonlyAction/readonlyActionController.jpf"/>
- * <pageflow-object id="action:begin.do">
- * <property value="100" name="x"/>
- * <property value="200" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:readonlyAction.do">
- * <property value="300" name="x"/>
- * <property value="80" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:nonReadonlyAction.do">
- * <property value="460" name="x"/>
- * <property value="80" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:goNested.do">
- * <property value="300" name="x"/>
- * <property value="320" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:nestedDone.do">
- * <property value="100" name="x"/>
- * <property value="320" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:readonlyAction.do@">
- * <property value="300,300,300,300" name="elbowsX"/>
- * <property value="156,140,140,124" name="elbowsY"/>
- * <property value="North_1" name="fromPort"/>
- * <property value="South_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:nonReadonlyAction.do@">
- * <property value="336,380,380,424" name="elbowsX"/>
- * <property value="181,181,72,72" name="elbowsY"/>
- * <property value="East_0" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:goNested.do@">
- * <property value="300,300,300,300" name="elbowsX"/>
- * <property value="244,260,260,276" name="elbowsY"/>
- * <property value="South_1" name="fromPort"/>
- * <property value="North_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="page:index.jsp">
- * <property value="300" name="x"/>
- * <property value="200" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@">
- * <property value="136,200,200,264" name="elbowsX"/>
- * <property value="192,192,192,192" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:readonlyAction.do@">
- * <property value="289,289,289,289" name="elbowsX"/>
- * <property value="124,140,140,156" name="elbowsY"/>
- * <property value="South_0" name="fromPort"/>
- * <property value="North_0" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:nonReadonlyAction.do@">
- * <property value="460,460,398,336" name="elbowsX"/>
- * <property value="124,192,192,192" name="elbowsY"/>
- * <property value="South_1" name="fromPort"/>
- * <property value="East_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object
id="action-call:@external-jpf:/miniTests/readonlyAction/nested/[EMAIL
PROTECTED]@action:nestedDone.do@">
- * <property value="264,200,200,136" name="elbowsX"/>
- * <property value="452,452,312,312" name="elbowsY"/>
- * <property value="West_1" name="fromPort"/>
- * <property value="East_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object
id="external-jpf:/miniTests/readonlyAction/nested/nestedController.jpf">
- * <property value="300" name="x"/>
- * <property value="460" name="y"/>
- * </pageflow-object>
- * <pageflow-object
id="forward:path#success#/miniTests/readonlyAction/nested/[EMAIL
PROTECTED]:goNested.do@">
- * <property value="300,300,300,300" name="elbowsX"/>
- * <property value="364,390,390,416" name="elbowsY"/>
- * <property value="South_1" name="fromPort"/>
- * <property value="North_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:nestedDone.do@">
- * <property value="136,200,200,264" name="elbowsX"/>
- * <property value="301,301,203,203" name="elbowsY"/>
- * <property value="East_0" name="fromPort"/>
- * <property value="West_2" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="action:readonlyExceptionHandler.do">
- * <property value="620" name="x"/>
- * <property value="280" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:nonReadonlyExceptionHandler.do">
- * <property value="520" name="x"/>
- * <property value="380" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:readonlyExceptionHandler.do@">
- * <property value="336,460,460,584" name="elbowsX"/>
- * <property value="203,203,272,272" name="elbowsY"/>
- * <property value="East_2" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:nonReadonlyExceptionHandler.do@">
- * <property value="311,311,520,520" name="elbowsX"/>
- * <property value="244,290,290,336" name="elbowsY"/>
- * <property value="South_2" name="fromPort"/>
- * <property value="North_1" name="toPort"/>
- * </pageflow-object>
- * </view-properties>
- * ::
*/
@Jpf.Controller(
readOnly = false,
@@ -158,124 +44,13 @@
type = readonlyActionController.TestException.class,
method = "handleException")
})
[EMAIL PROTECTED](
- value = {
- "<!-- This data is auto-generated. Hand-editing this section is not
recommended. -->",
- "<view-properties>",
- "<pageflow-object
id='pageflow:/miniTests/readonlyAction/readonlyActionController.jpf'/>",
- "<pageflow-object id='action:begin.do'>",
- " <property value='100' name='x'/>",
- " <property value='200' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:readonlyAction.do'>",
- " <property value='300' name='x'/>",
- " <property value='80' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:nonReadonlyAction.do'>",
- " <property value='460' name='x'/>",
- " <property value='80' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:goNested.do'>",
- " <property value='300' name='x'/>",
- " <property value='320' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:nestedDone.do'>",
- " <property value='100' name='x'/>",
- " <property value='320' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:readonlyAction.do@'>",
- " <property value='300,300,300,300' name='elbowsX'/>",
- " <property value='156,140,140,124' name='elbowsY'/>",
- " <property value='North_1' name='fromPort'/>",
- " <property value='South_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:nonReadonlyAction.do@'>",
- " <property value='336,380,380,424' name='elbowsX'/>",
- " <property value='181,181,72,72' name='elbowsY'/>",
- " <property value='East_0' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:goNested.do@'>",
- " <property value='300,300,300,300' name='elbowsX'/>",
- " <property value='244,260,260,276' name='elbowsY'/>",
- " <property value='South_1' name='fromPort'/>",
- " <property value='North_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:index.jsp'>",
- " <property value='300' name='x'/>",
- " <property value='200' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>",
- " <property value='136,200,200,264' name='elbowsX'/>",
- " <property value='192,192,192,192' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:readonlyAction.do@'>",
- " <property value='289,289,289,289' name='elbowsX'/>",
- " <property value='124,140,140,156' name='elbowsY'/>",
- " <property value='South_0' name='fromPort'/>",
- " <property value='North_0' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL
PROTECTED]:nonReadonlyAction.do@'>",
- " <property value='460,460,398,336' name='elbowsX'/>",
- " <property value='124,192,192,192' name='elbowsY'/>",
- " <property value='South_1' name='fromPort'/>",
- " <property value='East_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object
id='action-call:@external-jpf:/miniTests/readonlyAction/nested/[EMAIL
PROTECTED]@action:nestedDone.do@'>",
- " <property value='264,200,200,136' name='elbowsX'/>",
- " <property value='452,452,312,312' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='East_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object
id='external-jpf:/miniTests/readonlyAction/nested/nestedController.jpf'>",
- " <property value='300' name='x'/>",
- " <property value='460' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object
id='forward:path#success#/miniTests/readonlyAction/nested/[EMAIL
PROTECTED]:goNested.do@'>",
- " <property value='300,300,300,300' name='elbowsX'/>",
- " <property value='364,390,390,416' name='elbowsY'/>",
- " <property value='South_1' name='fromPort'/>",
- " <property value='North_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:nestedDone.do@'>",
- " <property value='136,200,200,264' name='elbowsX'/>",
- " <property value='301,301,203,203' name='elbowsY'/>",
- " <property value='East_0' name='fromPort'/>",
- " <property value='West_2' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:readonlyExceptionHandler.do'>",
- " <property value='620' name='x'/>",
- " <property value='280' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:nonReadonlyExceptionHandler.do'>",
- " <property value='520' name='x'/>",
- " <property value='380' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:readonlyExceptionHandler.do@'>",
- " <property value='336,460,460,584' name='elbowsX'/>",
- " <property value='203,203,272,272' name='elbowsY'/>",
- " <property value='East_2' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:nonReadonlyExceptionHandler.do@'>",
- " <property value='311,311,520,520' name='elbowsX'/>",
- " <property value='244,290,290,336' name='elbowsY'/>",
- " <property value='South_2' name='fromPort'/>",
- " <property value='North_1' name='toPort'/>",
- "</pageflow-object>",
- "</view-properties>"
- })
public class readonlyActionController extends PageFlowController
{
- public ArrayList history = new ArrayList();
-
+ private ArrayList history = new ArrayList();
+
+ public ArrayList getHistory() {
+ return history;
+ }
/**
* @jpf:action
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/anotherNonLongLived/AnotherNonLongLivedController.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/anotherNonLongLived/AnotherNonLongLivedController.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/anotherNonLongLived/AnotherNonLongLivedController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/anotherNonLongLived/AnotherNonLongLivedController.jpf
Wed Apr 27 19:13:41 2005
@@ -23,7 +23,11 @@
@Jpf.Controller()
public class AnotherNonLongLivedController extends PageFlowController
{
- public String val = "";
+ private String val = "";
+
+ public String getVal() {
+ return val;
+ }
@Jpf.Action(
forwards = {
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/longLived/LongLivedController.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/longLived/LongLivedController.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/longLived/LongLivedController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/longLived/LongLivedController.jpf
Wed Apr 27 19:13:41 2005
@@ -23,7 +23,15 @@
@Jpf.Controller(longLived = true)
public class LongLivedController extends PageFlowController
{
- public String val = "";
+ private String val = "";
+
+ public String getVal() {
+ return val;
+ }
+
+ public void setVal(String val) {
+ this.val = val;
+ }
@Jpf.Action(
forwards = {
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/nonLongLived/NonLongLivedController.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/nonLongLived/NonLongLivedController.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/nonLongLived/NonLongLivedController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfLongLived/nonLongLived/NonLongLivedController.jpf
Wed Apr 27 19:13:41 2005
@@ -23,8 +23,16 @@
@Jpf.Controller()
public class NonLongLivedController extends PageFlowController
{
- public String val = "";
+ private String val = "";
+ public String getVal() {
+ return val;
+ }
+
+ public void setVal(String val) {
+ this.val = val;
+ }
+
/**
* @jpf:action
* @jpf:forward name="success" path="index.jsp"
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/a/FlowA.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/a/FlowA.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/a/FlowA.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/a/FlowA.jpf
Wed Apr 27 19:13:41 2005
@@ -22,143 +22,19 @@
/**
* @jpf:controller
- * @jpf:view-properties view-properties::
- * <!-- This data is auto-generated. Hand-editing this section is not
recommended. -->
- * <view-properties>
- * <pageflow-object id="pageflow:/pageFlowCore/pfScoping/a/FlowA.jpf"/>
- * <pageflow-object id="action:begin.do">
- * <property value="80" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:goNested.do">
- * <property value="400" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:nestedDone.do">
- * <property value="400" name="x"/>
- * <property value="340" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:goNested.do@">
- * <property value="276,320,320,364" name="elbowsX"/>
- * <property value="92,92,92,92" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:begin.do@">
- * <property value="204,160,160,116" name="elbowsX"/>
- * <property value="103,103,103,103" name="elbowsY"/>
- * <property value="West_2" name="fromPort"/>
- * <property value="East_2" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="page:index.jsp">
- * <property value="240" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="external-jpf:nested/NestedController.jpf">
- * <property value="400" name="x"/>
- * <property value="220" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@">
- * <property value="116,160,160,204" name="elbowsX"/>
- * <property value="92,92,92,92" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:path#success#nested/[EMAIL
PROTECTED]:goNested.do@">
- * <property value="400,400,400,400" name="elbowsX"/>
- * <property value="144,160,160,176" name="elbowsY"/>
- * <property value="South_1" name="fromPort"/>
- * <property value="North_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:nestedDone.do@">
- * <property value="364,80,80,80" name="elbowsX"/>
- * <property value="332,332,238,144" name="elbowsY"/>
- * <property value="West_1" name="fromPort"/>
- * <property value="South_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@external-jpf:nested/[EMAIL
PROTECTED]@action:nestedDone.do@">
- * <property value="364,364,400,400" name="elbowsX"/>
- * <property value="212,276,276,296" name="elbowsY"/>
- * <property value="West_1" name="fromPort"/>
- * <property value="North_1" name="toPort"/>
- * </pageflow-object>
- * </view-properties>
- * ::
*/
[EMAIL PROTECTED](
- )
[EMAIL PROTECTED](
- value = {
- "<!-- This data is auto-generated. Hand-editing this section is not
recommended. -->",
- "<view-properties>",
- "<pageflow-object id='pageflow:/pageFlowCore/pfScoping/a/FlowA.jpf'/>",
- "<pageflow-object id='action:begin.do'>",
- " <property value='80' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:goNested.do'>",
- " <property value='400' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:nestedDone.do'>",
- " <property value='400' name='x'/>",
- " <property value='340' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:goNested.do@'>",
- " <property value='276,320,320,364' name='elbowsX'/>",
- " <property value='92,92,92,92' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='204,160,160,116' name='elbowsX'/>",
- " <property value='103,103,103,103' name='elbowsY'/>",
- " <property value='West_2' name='fromPort'/>",
- " <property value='East_2' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:index.jsp'>",
- " <property value='240' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='external-jpf:nested/NestedController.jpf'>",
- " <property value='400' name='x'/>",
- " <property value='220' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>",
- " <property value='116,160,160,204' name='elbowsX'/>",
- " <property value='92,92,92,92' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:path#success#nested/[EMAIL
PROTECTED]:goNested.do@'>",
- " <property value='400,400,400,400' name='elbowsX'/>",
- " <property value='144,160,160,176' name='elbowsY'/>",
- " <property value='South_1' name='fromPort'/>",
- " <property value='North_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:nestedDone.do@'>",
- " <property value='364,80,80,80' name='elbowsX'/>",
- " <property value='332,332,238,144' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='South_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@external-jpf:nested/[EMAIL
PROTECTED]@action:nestedDone.do@'>",
- " <property value='364,364,400,400' name='elbowsX'/>",
- " <property value='212,276,276,296' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='North_1' name='toPort'/>",
- "</pageflow-object>",
- "</view-properties>"
- })
[EMAIL PROTECTED]()
public class FlowA extends PageFlowController
{
- public String foo;
+ private String foo;
+
+ public String getFoo() {
+ return foo;
+ }
+
+ public void setFoo(String foo) {
+ this.foo = foo;
+ }
/**
* @jpf:action
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/b/FlowB.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/b/FlowB.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/b/FlowB.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/b/FlowB.jpf
Wed Apr 27 19:13:41 2005
@@ -16,73 +16,26 @@
* $Header:$
*/
package pageFlowCore.pfScoping.b;
+
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
/**
* @jpf:controller
- * @jpf:view-properties view-properties::
- * <!-- This data is auto-generated. Hand-editing this section is not
recommended. -->
- * <view-properties>
- * <pageflow-object id="pageflow:/pageFlowCore/pfScoping/b/FlowB.jpf"/>
- * <pageflow-object id="action:begin.do">
- * <property value="80" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:begin.do@">
- * <property value="204,160,160,116" name="elbowsX"/>
- * <property value="103,103,92,92" name="elbowsY"/>
- * <property value="West_2" name="fromPort"/>
- * <property value="East_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="page:index.jsp">
- * <property value="240" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@">
- * <property value="116,160,160,204" name="elbowsX"/>
- * <property value="92,92,92,92" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * </view-properties>
- * ::
*/
[EMAIL PROTECTED](
- )
[EMAIL PROTECTED](
- value = {
- "<!-- This data is auto-generated. Hand-editing this section is not
recommended. -->",
- "<view-properties>",
- "<pageflow-object id='pageflow:/pageFlowCore/pfScoping/b/FlowB.jpf'/>",
- "<pageflow-object id='action:begin.do'>",
- " <property value='80' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:begin.do@'>",
- " <property value='204,160,160,116' name='elbowsX'/>",
- " <property value='103,103,92,92' name='elbowsY'/>",
- " <property value='West_2' name='fromPort'/>",
- " <property value='East_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:index.jsp'>",
- " <property value='240' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>",
- " <property value='116,160,160,204' name='elbowsX'/>",
- " <property value='92,92,92,92' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "</view-properties>"
- })
[EMAIL PROTECTED]()
public class FlowB extends PageFlowController
{
- public String foo;
+ private String foo;
+
+ public String getFoo() {
+ return foo;
+ }
+
+ public void setFoo(String foo) {
+ this.foo = foo;
+ }
/**
* @jpf:action
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/pfScopingController.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/pfScopingController.jpf?rev=165088&r1=165087&r2=165088&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/pfScopingController.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfScoping/pfScopingController.jpf
Wed Apr 27 19:13:41 2005
@@ -23,155 +23,10 @@
/**
* @jpf:controller
- * @jpf:view-properties view-properties::
- * <!-- This data is auto-generated. Hand-editing this section is not
recommended. -->
- * <view-properties>
- * <pageflow-object
id="pageflow:/pageFlowCore/pfScoping/pfScopingController.jpf"/>
- * <pageflow-object id="action:begin.do">
- * <property value="80" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:doFrames.do">
- * <property value="380" name="x"/>
- * <property value="240" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:updateTree.do">
- * <property value="400" name="x"/>
- * <property value="80" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action:launchTreeB.do">
- * <property value="380" name="x"/>
- * <property value="380" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="page:frames.jsp">
- * <property value="240" name="x"/>
- * <property value="100" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="action-call:@page:[EMAIL
PROTECTED]@action:updateTree.do@">
- * <property value="524,480,480,436" name="elbowsX"/>
- * <property value="61,61,72,72" name="elbowsY"/>
- * <property value="West_0" name="fromPort"/>
- * <property value="East_1" name="toPort"/>
- * </pageflow-object>
- * <pageflow-object id="page:windows.jsp">
- * <property value="560" name="x"/>
- * <property value="80" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="external-jpf:b/FlowB.jpf">
- * <property value="540" name="x"/>
- * <property value="380" name="y"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@">
- * <property value="44,32,32,60" name="elbowsX"/>
- * <property value="92,92,-4,-4" name="elbowsY"/>
- * <property value="West_1" name="fromPort"/>
- * <property value="North_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:doFrames.do@">
- * <property value="344,310,310,276" name="elbowsX"/>
- * <property value="232,232,92,92" name="elbowsY"/>
- * <property value="West_1" name="fromPort"/>
- * <property value="East_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:[EMAIL PROTECTED]:updateTree.do@">
- * <property value="436,480,480,524" name="elbowsX"/>
- * <property value="83,83,83,83" name="elbowsY"/>
- * <property value="East_2" name="fromPort"/>
- * <property value="West_2" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="forward:path#success#b/[EMAIL
PROTECTED]:launchTreeB.do@">
- * <property value="416,460,460,504" name="elbowsX"/>
- * <property value="372,372,372,372" name="elbowsY"/>
- * <property value="East_1" name="fromPort"/>
- * <property value="West_1" name="toPort"/>
- * <property value="success" name="label"/>
- * </pageflow-object>
- * <pageflow-object id="page:index.jsp">
- * <property value="60" name="x"/>
- * <property value="40" name="y"/>
- * </pageflow-object>
- * </view-properties>
- * ::
*/
[EMAIL PROTECTED](
- )
[EMAIL PROTECTED](
- value = {
- "<!-- This data is auto-generated. Hand-editing this section is not
recommended. -->",
- "<view-properties>",
- "<pageflow-object
id='pageflow:/pageFlowCore/pfScoping/pfScopingController.jpf'/>",
- "<pageflow-object id='action:begin.do'>",
- " <property value='80' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:doFrames.do'>",
- " <property value='380' name='x'/>",
- " <property value='240' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:updateTree.do'>",
- " <property value='400' name='x'/>",
- " <property value='80' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:launchTreeB.do'>",
- " <property value='380' name='x'/>",
- " <property value='380' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:frames.jsp'>",
- " <property value='240' name='x'/>",
- " <property value='100' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action-call:@page:[EMAIL
PROTECTED]@action:updateTree.do@'>",
- " <property value='524,480,480,436' name='elbowsX'/>",
- " <property value='61,61,72,72' name='elbowsY'/>",
- " <property value='West_0' name='fromPort'/>",
- " <property value='East_1' name='toPort'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:windows.jsp'>",
- " <property value='560' name='x'/>",
- " <property value='80' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='external-jpf:b/FlowB.jpf'>",
- " <property value='540' name='x'/>",
- " <property value='380' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>",
- " <property value='44,32,32,60' name='elbowsX'/>",
- " <property value='92,92,-4,-4' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='North_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:doFrames.do@'>",
- " <property value='344,310,310,276' name='elbowsX'/>",
- " <property value='232,232,92,92' name='elbowsY'/>",
- " <property value='West_1' name='fromPort'/>",
- " <property value='East_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:[EMAIL PROTECTED]:updateTree.do@'>",
- " <property value='436,480,480,524' name='elbowsX'/>",
- " <property value='83,83,83,83' name='elbowsY'/>",
- " <property value='East_2' name='fromPort'/>",
- " <property value='West_2' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:path#success#b/[EMAIL
PROTECTED]:launchTreeB.do@'>",
- " <property value='416,460,460,504' name='elbowsX'/>",
- " <property value='372,372,372,372' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:index.jsp'>",
- " <property value='60' name='x'/>",
- " <property value='40' name='y'/>",
- "</pageflow-object>",
- "</view-properties>"
- })
-public class pfScopingController extends PageFlowController
[EMAIL PROTECTED]()
+public class pfScopingController
+ extends PageFlowController
{
/**
* @jpf:action
