Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Date: 20 Dec 2000 13:49:25 -0000
Message-ID: <20001220134925.31831.qmail@locus.apache.org>
From: prussell@locus.apache.org
To: xml-cocoon-cvs@apache.org
Subject: cvs commit:
 xml-cocoon/src/org/apache/cocoon/components/language/programming
 CompiledProgrammingLanguage.java

prussell    00/12/20 05:49:24

  Modified:    src/org/apache/cocoon/components/language/programming Tag:
                        xml-cocoon2 CompiledProgrammingLanguage.java
  Log:
  Display file extensions when failing to load a source file.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.13  +4 -7      xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java
  
  Index: CompiledProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java,v
  retrieving revision 1.1.2.12
  retrieving revision 1.1.2.13
  diff -u -r1.1.2.12 -r1.1.2.13
  --- CompiledProgrammingLanguage.java	2000/12/14 14:43:16	1.1.2.12
  +++ CompiledProgrammingLanguage.java	2000/12/20 13:49:24	1.1.2.13
  @@ -23,7 +23,7 @@
    * A compiled programming language. This class extends <code>AbstractProgrammingLanguage</code> adding support for compilation
    * and object program files
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.12 $ $Date: 2000/12/14 14:43:16 $
  + * @version CVS $Revision: 1.1.2.13 $ $Date: 2000/12/20 13:49:24 $
    */
   public abstract class CompiledProgrammingLanguage extends AbstractProgrammingLanguage implements Composer {
       /** The compiler */
  @@ -129,16 +129,13 @@
           // Does source file exist?
           File sourceFile = new File(baseDirectory, filename + "." + this.getSourceExtension());
           if (!sourceFile.exists()) {
  -            throw new LanguageException("Can't load program - File doesn't exist: " + baseDirectory.toString() +
  -                File.separator + filename);
  +            throw new LanguageException("Can't load program - File doesn't exist: " + sourceFile.toString());
           }
           if (!sourceFile.isFile()) {
  -            throw new LanguageException("Can't load program - File is not a normal file: " + baseDirectory.toString() +
  -                File.separator + filename);
  +            throw new LanguageException("Can't load program - File is not a normal file: " + sourceFile.toString());
           }
           if (!sourceFile.canRead()) {
  -            throw new LanguageException("Can't load program - File cannot be read: " + baseDirectory.toString() +
  -                File.separator + filename);
  +            throw new LanguageException("Can't load program - File cannot be read: " + sourceFile.toString());
           }
           this.compile(filename, baseDirectory, encoding);
           if (this.deleteSources) {