You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jo...@apache.org on 2001/04/26 01:40:47 UTC

cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/intake/xmlmodel XmlGroup.java

jon         01/04/25 16:40:47

  Modified:    src/dtd  intake.dtd
               src/java/org/apache/turbine/services/intake/xmlmodel
                        XmlGroup.java
  Log:
  after discussion with John...we are changing <group> class= to name=
  
  Revision  Changes    Path
  1.3       +2 -2      jakarta-turbine/src/dtd/intake.dtd
  
  Index: intake.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/dtd/intake.dtd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- intake.dtd	2001/04/06 22:56:26	1.2
  +++ intake.dtd	2001/04/25 23:40:44	1.3
  @@ -1,6 +1,6 @@
   <!-- 
       Intake XML input constraints DTD 
  -    $Id: intake.dtd,v 1.2 2001/04/06 22:56:26 jmcnally Exp $
  +    $Id: intake.dtd,v 1.3 2001/04/25 23:40:44 jon Exp $
   -->
   
   <!ELEMENT input-data (group+)>
  @@ -11,7 +11,7 @@
   <!ELEMENT group (field+)>
   <!ATTLIST group 
     key CDATA #REQUIRED
  -  class CDATA #REQUIRED
  +  name CDATA #REQUIRED
     mapToObject CDATA #IMPLIED
   >
   
  
  
  
  1.6       +9 -9      jakarta-turbine/src/java/org/apache/turbine/services/intake/xmlmodel/XmlGroup.java
  
  Index: XmlGroup.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/xmlmodel/XmlGroup.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XmlGroup.java	2001/04/11 04:41:35	1.5
  +++ XmlGroup.java	2001/04/25 23:40:46	1.6
  @@ -66,7 +66,7 @@
    * A Class for holding data about a grouping of inputs used in an Application.
    *
    * @author <a href="mailto:jmcnally@collab.net>John McNally</a>
  - * @version $Id: XmlGroup.java,v 1.5 2001/04/11 04:41:35 jmcnally Exp $
  + * @version $Id: XmlGroup.java,v 1.6 2001/04/25 23:40:46 jon Exp $
    */
   public class XmlGroup
   {
  @@ -74,7 +74,7 @@
       private List mapToObjects;
       private String defaultMapToObject;
       private AppData parent;
  -    private String classname;
  +    private String groupName;
       private String key;
       private String poolCapacity;
   
  @@ -92,7 +92,7 @@
        */
       public void loadFromXML (Attributes attrib)
       {
  -        classname = attrib.getValue("class");
  +        groupName = attrib.getValue("name");
           key = attrib.getValue("key");
           poolCapacity = attrib.getValue("pool-capacity");
           
  @@ -104,19 +104,19 @@
       }
   
       /**
  -     * Get the class name that handles this group
  +     * Get the name that handles this group
        */
       public String getName()
       {
  -        return classname;
  +        return groupName;
       }
   
       /**
  -     * Set the class name that handles this group
  +     * Set the name that handles this group
        */
  -    public void setName(String newClass)
  +    public void setName(String newGroupName)
       {
  -        classname = newClass;
  +        groupName = newGroupName;
       }
   
       /**
  @@ -299,7 +299,7 @@
       {
           StringBuffer result = new StringBuffer();
   
  -        result.append ("<group class=\"").append(classname);
  +        result.append ("<group name=\"").append(getName());
           result.append(" key=\""+key+"\"");
           result.append(">\n");
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org