CVS: plexus-components/formica/src/java/org/codehaus/plexus/formica DefaultFormElement.java,1.3,1.4 FormElement.java,1.2,1.3 FormElementFactory.java,1.2,1.3

Update of /cvsroot/plexus/plexus-components/formica/src/java/org/codehaus/plexus/formica
In directory eng.werken.com:/tmp/cvs-serv8909/src/java/org/codehaus/plexus/formica

Modified Files:
	DefaultFormElement.java FormElement.java 
	FormElementFactory.java 
Log Message:
o cleaning up some tests
o changing from property expression to populator expression as eventually
someone might want to use jexl, jxpath or something else to populate
target objects.


Index: DefaultFormElement.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/formica/src/java/org/codehaus/plexus/formica/DefaultFormElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DefaultFormElement.java	1 Jun 2003 21:06:24 -0000	1.3
+++ DefaultFormElement.java	1 Jun 2003 21:54:10 -0000	1.4
@@ -64,7 +64,7 @@
     private String messageKey;
     private String defaultValue;
     private boolean optional;
-    private String propertyExpression;
+    private String populatorExpression;
     private Validator validator;
     private Map validatorParameters;
 
@@ -178,9 +178,9 @@
         return messageKey;
     }
 
-    public void setPropertyExpression( String propertyExpression )
+    public void setPopulatorExpression( String populatorExpression )
     {
-        this.propertyExpression = propertyExpression;
+        this.populatorExpression = populatorExpression;
     }
 
     /** Get a predefined write method for the given form element.  If the
@@ -189,9 +189,9 @@
      @return The write method
      */
 
-    public String getPropertyExpression()
+    public String getPopulatorExpression()
     {
-        return propertyExpression;
+        return populatorExpression;
     }
 
     // ----------------------------------------------------------------------

Index: FormElement.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/formica/src/java/org/codehaus/plexus/formica/FormElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FormElement.java	1 Jun 2003 20:55:00 -0000	1.2
+++ FormElement.java	1 Jun 2003 21:54:10 -0000	1.3
@@ -76,8 +76,8 @@
     void setMessageKey( String message );
     String getMessageKey();
 
-    void setPropertyExpression( String propertyExpression );
-    String getPropertyExpression();
+    void setPopulatorExpression( String propertyExpression );
+    String getPopulatorExpression();
 
     void setValidator( Validator validator );
     Validator getValidator();

Index: FormElementFactory.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/formica/src/java/org/codehaus/plexus/formica/FormElementFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FormElementFactory.java	1 Jun 2003 20:55:00 -0000	1.2
+++ FormElementFactory.java	1 Jun 2003 21:54:10 -0000	1.3
@@ -68,11 +68,11 @@
 
         String id = configuration.getAttribute( "id" );
         fe.setId( id );
-        fe.setLabelKey( configuration.getChild( "labelKey" ).getValue( null ) );
-        fe.setMessageKey( configuration.getChild( "messageKey" ).getValue( null ) );
+        fe.setLabelKey( configuration.getChild( "label-key" ).getValue( null ) );
+        fe.setMessageKey( configuration.getChild( "message-key" ).getValue( null ) );
         fe.setDefaultValue( configuration.getChild( "default" ).getValue( null ) );
         fe.setOptional( configuration.getAttributeAsBoolean( "optional", false ) );
-        fe.setPropertyExpression( configuration.getChild( "property-expression" ).getValue( null ) );
+        fe.setPopulatorExpression( configuration.getChild( "populator-expression" ).getValue( null ) );
 
         // Validators