[Nice-commit] Nice/src/bossa/syntax Constructor.java,1.12,1.13

[Daniel B. <bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5942/src/bossa/syntax

Modified Files:
	Constructor.java 
Log Message:
Clearer error message when a required field is missing.


Index: Constructor.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Constructor.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Constructor.java	7 Oct 2004 15:29:29 -0000	1.12
--- Constructor.java	7 Oct 2004 19:34:00 -0000	1.13
***************
*** 108,127 ****
      res = new StringBuffer();
      List missing = arguments.missingArgs(parameters);
!     Iterator missingFields = null;
  
!     if (arguments.size() == 0 || missing.size() > 0)
        {
!         res.append("Fields of class ").append(name).append(" require initial values.\n");
!         if (arguments.size() == 0)
!           {
!             res.append(syntaxExample())
!               .append("Class ").append(name).append(" has the following fields:\n");
!             missingFields = parameters.iterator();
!           }
!         else
!           {
!             res.append("These fields are missing:\n");
!             missingFields = missing.iterator();
!           }
        }
      else
--- 108,125 ----
      res = new StringBuffer();
      List missing = arguments.missingArgs(parameters);
!     Iterator fieldsToList;
  
!     if (arguments.size() == 0)
        {
!         res.append("Fields of class ").append(name)
!           .append(" require initial values.\n");
!         res.append(syntaxExample())
!           .append("Class ").append(name).append(" has the following fields:\n");
!         fieldsToList = parameters.iterator();
!       }
!     else if (missing.size() > 0)
!       {
!         res.append("The following fields require initial values:\n");
!         fieldsToList = missing.iterator();
        }
      else
***************
*** 131,140 ****
            .append(".\n")
            .append("The constructor accepts the following arguments:\n" );
!         missingFields = parameters.iterator();
        }
!     while(missingFields.hasNext())
        {
          res.append("  ")
!           .append(missingFields.next())
            .append("\n");
        }
--- 129,138 ----
            .append(".\n")
            .append("The constructor accepts the following arguments:\n" );
!         fieldsToList = parameters.iterator();
        }
!     while (fieldsToList.hasNext())
        {
          res.append("  ")
!           .append(fieldsToList.next())
            .append("\n");
        }