vgritsenko 2002/06/05 10:19:30 Modified: src/scratchpad/src/org/apache/cocoon/validation/schematron Tag: cocoon_2_0_3_branch SchematronFactory.java SchematronValidator.java ValidationResult.java Log: fix java 1.4 compilation warnings Revision Changes Path No revision No revision 1.1.2.2 +11 -11 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronFactory.java Index: SchematronFactory.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronFactory.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- SchematronFactory.java 24 May 2002 09:06:54 -0000 1.1.2.1 +++ SchematronFactory.java 5 Jun 2002 17:19:30 -0000 1.1.2.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronFactory.java,v 1.1.2.1 2002/05/24 09:06:54 cziegeler Exp $ - * $Revision: 1.1.2.1 $ - * $Date: 2002/05/24 09:06:54 $ + * $Header: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronFactory.java,v 1.1.2.2 2002/06/05 17:19:30 vgritsenko Exp $ + * $Revision: 1.1.2.2 $ + * $Date: 2002/06/05 17:19:30 $ * * ==================================================================== * The Apache Software License, Version 1.1 @@ -283,27 +283,27 @@ for (int i = 1; i <= elementCount; i++) { logger.debug( "Assert# : " + i); - Assert assert = new Assert(); + Assert anAssert = new Assert(); String assertPrefix = pathPrefix + "/assert[" + i + "]"; String test = (String) jxpContext.getValue ( assertPrefix + "/@test", String.class ); - assert.setTest( test ); - logger.debug( "Assert test : " + assert.getTest()); + anAssert.setTest( test ); + logger.debug( "Assert test : " + anAssert.getTest()); // since diagnostics is a non-mandatory element // we will try to get its value in a lenient mode jxpContext.setLenient(true); String diagnostics = (String) jxpContext.getValue ( assertPrefix + "/@diagnostics", String.class ); - assert.setDiagnostics( diagnostics ); - logger.debug( "Assert diagnostics : " + assert.getDiagnostics()); + anAssert.setDiagnostics( diagnostics ); + logger.debug( "Assert diagnostics : " + anAssert.getDiagnostics()); jxpContext.setLenient(false); String message = (String) jxpContext.getValue ( assertPrefix, String.class ); - assert.setMessage( message ); - logger.debug( "Assert message : " + assert.getMessage()); + anAssert.setMessage( message ); + logger.debug( "Assert message : " + anAssert.getMessage()); - rule.addAssert( assert ); + rule.addAssert( anAssert ); } } 1.1.2.2 +6 -6 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronValidator.java Index: SchematronValidator.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronValidator.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- SchematronValidator.java 24 May 2002 09:06:54 -0000 1.1.2.1 +++ SchematronValidator.java 5 Jun 2002 17:19:30 -0000 1.1.2.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronValidator.java,v 1.1.2.1 2002/05/24 09:06:54 cziegeler Exp $ - * $Revision: 1.1.2.1 $ - * $Date: 2002/05/24 09:06:54 $ + * $Header: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/SchematronValidator.java,v 1.1.2.2 2002/06/05 17:19:30 vgritsenko Exp $ + * $Revision: 1.1.2.2 $ + * $Date: 2002/06/05 17:19:30 $ * * ==================================================================== * The Apache Software License, Version 1.1 @@ -357,13 +357,13 @@ Iterator assertIter = rule.getAssert().iterator(); while (assertIter.hasNext()) { - Assert assert = (Assert) assertIter.next(); + Assert anAssert = (Assert) assertIter.next(); // if an assert test fails, then it should be added // to the result - boolean passed = evalTest( localJxpContext, assert.getTest() ); + boolean passed = evalTest( localJxpContext, anAssert.getTest() ); if (!passed) { - nextFailedRule.addAssert ( assert ); + nextFailedRule.addAssert ( anAssert ); } } 1.2.2.2 +6 -6 xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/ValidationResult.java Index: ValidationResult.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/ValidationResult.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- ValidationResult.java 24 May 2002 09:06:54 -0000 1.2.2.1 +++ ValidationResult.java 5 Jun 2002 17:19:30 -0000 1.2.2.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/ValidationResult.java,v 1.2.2.1 2002/05/24 09:06:54 cziegeler Exp $ - * $Revision: 1.2.2.1 $ - * $Date: 2002/05/24 09:06:54 $ + * $Header: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/validation/schematron/Attic/ValidationResult.java,v 1.2.2.2 2002/06/05 17:19:30 vgritsenko Exp $ + * $Revision: 1.2.2.2 $ + * $Date: 2002/06/05 17:19:30 $ * * ==================================================================== * The Apache Software License, Version 1.1 @@ -147,14 +147,14 @@ Iterator assertIter = rule.getAssert().iterator(); while (assertIter.hasNext ()) { - Assert assert = (Assert)assertIter.next (); + Assert anAssert = (Assert)assertIter.next (); // add the next assert to the violations set Violation v = new Violation(); v.setPath( rule.getContext() ); - v.setMessage( assert.getMessage() ); + v.setMessage( anAssert.getMessage() ); violations.add( v ); - // System.out.println(" Assert test: " + assert.getTest() + ", message: " + assert.getMessage() ); + // System.out.println(" Assert test: " + anAssert.getTest() + ", message: " + anAssert.getMessage() ); } Iterator reportIter = rule.getReport().iterator();
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]