cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/j2ee WarValidator.java ValidationFormatter.java

[dion]

dion        02/05/14 21:57:10

  Modified:    src/java/org/apache/maven/j2ee WarValidator.java
                        ValidationFormatter.java
  Log:
  Fixed error message formatting
  
  Revision  Changes    Path
  1.9       +2 -2      
jakarta-turbine-maven/src/java/org/apache/maven/j2ee/WarValidator.java
  
  Index: WarValidator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/j2ee/WarValidator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WarValidator.java 15 May 2002 04:50:55 -0000      1.8
  +++ WarValidator.java 15 May 2002 04:57:10 -0000      1.9
  @@ -150,7 +150,7 @@
           try
           {
               getBroadcaster().fireStartedEvent( new ValidationEvent(this, 
  -                getWarFileName(), "started"));
  +                getWarFileName(), "war validation started"));
           
               warFile = new File(getWarFileName());
   
  @@ -189,7 +189,7 @@
           finally
           {
               getBroadcaster().fireEndedEvent( new ValidationEvent(this, 
  -                getWarFileName(), "ended"));
  +                getWarFileName(), "war validation ended"));
           }
       }
       
  
  
  
  1.4       +8 -7      
jakarta-turbine-maven/src/java/org/apache/maven/j2ee/ValidationFormatter.java
  
  Index: ValidationFormatter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/j2ee/ValidationFormatter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ValidationFormatter.java  12 May 2002 15:34:07 -0000      1.3
  +++ ValidationFormatter.java  15 May 2002 04:57:10 -0000      1.4
  @@ -61,7 +61,7 @@
   /**
    * Base class for formatters of validation events - handles plain and xml
    * formats.
  - * @version $Id: ValidationFormatter.java,v 1.3 2002/05/12 15:34:07 dion Exp $
  + * @version $Id: ValidationFormatter.java,v 1.4 2002/05/15 04:57:10 dion Exp $
    * @author  dion
    */
   public class ValidationFormatter implements ValidationListener
  @@ -119,9 +119,10 @@
       /** print an event in plain format
        * @param event the event to print
        */
  -    private void printEvent(ValidationEvent event)
  +    private void printEvent(String type, ValidationEvent event)
       {
  -        getStream().println(event.getSubject() + ": " + event.getMessage());
  +        getStream().println(event.getSubject() + " " + type + ": " + 
  +            event.getMessage());
       }
       
       /**
  @@ -132,7 +133,7 @@
       {
           if (isPlain())
           {
  -            printEvent(event);
  +            printEvent("ended", event);
           }
           else
           {
  @@ -149,7 +150,7 @@
       {
           if (isPlain())
           {
  -            printEvent(event);
  +            printEvent("error", event);
           }
           else
           {
  @@ -165,7 +166,7 @@
       {
           if (isPlain())
           {
  -            printEvent(event);
  +            printEvent("started", event);
           }
           else
           {
  @@ -183,7 +184,7 @@
       {
           if (isPlain())
           {
  -            printEvent(event);
  +            printEvent("warning", event);
           }
           else
           {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>