cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept InstanceFactory.java
Date Thu, 20 Nov 2003 17:11:02 GMT
joerg       2003/11/20 09:11:02

  Modified:    src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/constraints
                        RegexprConstraint.java ChoiceConstraint.java
               src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax
                        PreceptorBuilderImpl.java
               src/blocks/precept/java/org/apache/cocoon/precept
                        InstanceFactory.java
  Log:
  removed System.out's - should the exception be rethrown as ProcessingExceptions?
  
  Revision  Changes    Path
  1.3       +6 -22     cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/constraints/RegexprConstraint.java
  
  Index: RegexprConstraint.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/constraints/RegexprConstraint.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RegexprConstraint.java	16 Mar 2003 17:49:05 -0000	1.2
  +++ RegexprConstraint.java	20 Nov 2003 17:11:02 -0000	1.3
  @@ -85,20 +85,9 @@
   
       public boolean isSatisfiedBy(Object value, Context context) {
           boolean isValid = expression.match(String.valueOf(value));
  -        System.out.println(
  -                "checking regexpr ["
  -                + String.valueOf(value)
  -                + "] matches ["
  -                + String.valueOf(expressionString)
  -                + "] is "
  -                + isValid);
  -        getLogger().debug(
  -                "checking regexpr ["
  -                + String.valueOf(value)
  -                + "] matches ["
  -                + String.valueOf(expressionString)
  -                + "] is "
  -                + isValid);
  +        getLogger().debug("checking regexpr [" + String.valueOf(value)
  +                          + "] matches [" + String.valueOf(expressionString)
  +                          + "] is " + isValid);
           return (isValid);
       }
   
  @@ -111,13 +100,8 @@
       }
   
       public String toString() {
  -        return (
  -                String.valueOf(getType())
  -                + "["
  -                + String.valueOf(getId())
  -                + "] -> ["
  -                + String.valueOf(expressionString)
  -                + "]");
  +        return (String.valueOf(getType()) + "[" + String.valueOf(getId())
  +                + "] -> [" + String.valueOf(expressionString) + "]");
       }
   
       public void toSAX(ContentHandler handler) throws SAXException {
  
  
  
  1.3       +4 -3      cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/constraints/ChoiceConstraint.java
  
  Index: ChoiceConstraint.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/constraints/ChoiceConstraint.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ChoiceConstraint.java	16 Mar 2003 17:49:05 -0000	1.2
  +++ ChoiceConstraint.java	20 Nov 2003 17:11:02 -0000	1.3
  @@ -99,8 +99,9 @@
   
       public boolean isSatisfiedBy(Object value, Context context) {
           boolean isValid = validValues.contains(value);
  -        System.out.println("checking choice [" + String.valueOf(value) + "] contains ["
+ String.valueOf(validValues) + "] is " + isValid);
  -        getLogger().debug("checking choice [" + String.valueOf(value) + "] contains ["
+ String.valueOf(validValues) + "] is " + isValid);
  +        getLogger().debug("checking choice [" + String.valueOf(value)
  +                          + "] contains [" + String.valueOf(validValues)
  +                          + "] is " + isValid);
           return (isValid);
       }
   
  
  
  
  1.4       +1 -3      cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/PreceptorBuilderImpl.java
  
  Index: PreceptorBuilderImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/PreceptorBuilderImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PreceptorBuilderImpl.java	20 Nov 2003 16:39:31 -0000	1.3
  +++ PreceptorBuilderImpl.java	20 Nov 2003 17:11:02 -0000	1.4
  @@ -176,8 +176,6 @@
               parser.parse(source);
           }
           catch (Exception e) {
  -            e.printStackTrace(System.out);
  -
               getLogger().error("", e);
           }
       }
  
  
  
  1.4       +1 -2      cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/InstanceFactory.java
  
  Index: InstanceFactory.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/InstanceFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InstanceFactory.java	20 Nov 2003 16:39:31 -0000	1.3
  +++ InstanceFactory.java	20 Nov 2003 17:11:02 -0000	1.4
  @@ -140,7 +140,6 @@
                   }
                   catch (Exception e) {
                       getLogger().error("", e);
  -                    e.printStackTrace(System.out);
                   }
                   finally {
                       manager.release(preceptorBuilder);
  
  
  

Mime
View raw message