cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/sitemap SitemapManager.java SitemapHandler.java
Date Thu, 17 Aug 2000 17:07:37 GMT
stefano     00/08/17 10:07:37

  Modified:    src/org/apache/cocoon/sitemap Tag: xml-cocoon2
                        SitemapManager.java SitemapHandler.java
  Log:
  fixed some NPE and cleaned up code a little
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +4 -3      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapManager.java
  
  Index: SitemapManager.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapManager.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- SitemapManager.java	2000/08/04 21:12:11	1.1.2.6
  +++ SitemapManager.java	2000/08/17 17:07:36	1.1.2.7
  @@ -5,6 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  + 
   package org.apache.cocoon.sitemap;
   
   import java.io.FileNotFoundException;
  @@ -31,7 +32,7 @@
    * checking regeneration of the sub <code>Sitemap</code>
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:12:11 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/08/17 17:07:36 $
    */
   public class SitemapManager implements Configurable, Composer {
   
  @@ -60,12 +61,12 @@
       throws Exception {
           SitemapHandler sitemapHandler = (SitemapHandler) sitemaps.get (source);
           if (sitemapHandler != null) {
  -            sitemapHandler.throwError();
  +            sitemapHandler.throwEventualException();
               if (sitemapHandler.available()) {
                   if (check_reload 
                    && sitemapHandler.hasChanged()
                    && !sitemapHandler.isRegenerating()) {
  -                    sitemapHandler.regenerateAsynchroniously(environment);
  +                    sitemapHandler.regenerateAsynchronously(environment);
                   }
                   environment.changeContext (uri_prefix, source);
                   return sitemapHandler.process (environment);
  
  
  
  1.1.2.8   +36 -44    xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapHandler.java
  
  Index: SitemapHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapHandler.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- SitemapHandler.java	2000/08/04 21:12:11	1.1.2.7
  +++ SitemapHandler.java	2000/08/17 17:07:36	1.1.2.8
  @@ -5,6 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  + 
   package org.apache.cocoon.sitemap;
   
   import java.io.File;
  @@ -15,6 +16,7 @@
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   
  +import org.apache.cocoon.Processor;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.language.generator.ProgramGenerator;
   import org.apache.cocoon.environment.Environment;
  @@ -28,9 +30,10 @@
    * Handles the manageing and stating of one <code>Sitemap</code>
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/08/04 21:12:11 $
  + * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/08/17 17:07:36 $
    */
  -public class SitemapHandler implements Runnable, Configurable, Composer {
  +public class SitemapHandler implements Runnable, Configurable, Composer, Processor {
   
       /** the configuration */
       private Configuration conf = null;
  @@ -64,42 +67,42 @@
           this.conf = conf;
       }
   
  -    protected SitemapHandler (String source, boolean check_reload) throws FileNotFoundException
{
  +    protected SitemapHandler (String source, boolean check_reload) 
  +    throws FileNotFoundException {
           this.check_reload = check_reload;
           String s = null;
  -        if (source.charAt(source.length()-1) == File.separatorChar) {
  -            s = source+"sitemap.xmap";
  +        if (source.charAt(source.length() - 1) == File.separatorChar) {
  +            s = source + "sitemap.xmap";
               this.sourceFile = new File (s);
           } else {
               sourceFile = new File (source);
               if (!sourceFile.isFile()) {
  -                s = source+File.separatorChar+"sitemap.xmap";
  +                s = source + File.separatorChar + "sitemap.xmap";
                   sourceFile = new File (s);
               }
               if (!sourceFile.canRead()) {
  -                throw new FileNotFoundException ("file "+s+" not found or cannot be opened
for reading");
  +                throw new FileNotFoundException ("file " + s + " not found or cannot be
opened for reading");
               }
           }
       }
   
  -    protected void throwError () 
  +    protected void throwEventualException () 
       throws ProcessingException, SAXException, IOException, InterruptedException {
  -        Exception e = exception;
  -        exception = null;
  -        if (e instanceof ProcessingException) {
  +        if (exception == null) return; // No exception was caught
  +        
  +        if (exception instanceof ProcessingException) {
               throw (ProcessingException) exception;
  -        } else if (e instanceof SAXException) {
  +        } else if (exception instanceof SAXException) {
               throw (SAXException) exception;
  -        } else if (e instanceof IOException) {
  +        } else if (exception instanceof IOException) {
               throw (IOException) exception;
  -        } else if (e instanceof InterruptedException) {
  +        } else if (exception instanceof InterruptedException) {
               throw (InterruptedException) exception;
  -        } else if (e != null) {
  -            throw new ProcessingException ("Unknown Exception raised: "
  -                                         + exception.toString());
  +        } else {
  +            throw new ProcessingException ("Unknown Exception raised: " + exception.toString());
           }
       }
  -
  + 
       protected boolean available () {
           return (sitemap != null);
       }
  @@ -118,7 +121,8 @@
           return isRegenerationRunning; 
       }
   
  -    protected synchronized void regenerateAsynchroniously (Environment environment) {
  +    protected synchronized void regenerateAsynchronously (Environment environment)
  +    throws ProcessingException, SAXException, IOException, InterruptedException { 
           if (!this.isRegenerationRunning) {
               isRegenerationRunning = true;
               regeneration = new Thread (this);
  @@ -129,25 +133,23 @@
   
       protected synchronized void regenerate (Environment environment) 
       throws ProcessingException, SAXException, IOException, InterruptedException { 
  -        if (!this.isRegenerationRunning) {
  -            isRegenerationRunning = true;
  -            regeneration = new Thread (this);
  -            this.environment = environment;
  -            regeneration.start();
  -        }
  +        regenerateAsynchronously(environment);
           regeneration.join();
  -        throwError();
  +        throwEventualException();
       }
   
       public boolean process (Environment environment) 
       throws Exception {
  -        this.throwError();
  +        throwEventualException();
           return sitemap.process (environment);
       }
   
  +    public void setBasePath (String basePath) {
  +        this.basePath = basePath;
  +    }
  +
       /** Generate the Sitemap class */
       public void run() {
  -
           Sitemap smap = null;
           InputSource inputSource = new InputSource (sourceFile.getPath());
           String systemId = inputSource.getSystemId();
  @@ -157,28 +159,18 @@
           String markupLanguage = "sitemap";
           String programmingLanguage = "java";
   
  -        ProgramGenerator programGenerator = null;
  -
  -        programGenerator = (ProgramGenerator) this.manager.getComponent("program-generator");
  -
           try {
  -            smap = (Sitemap) programGenerator.load(file, markupLanguage, 
  -                                 programmingLanguage, environment);
  +            ProgramGenerator programGenerator = (ProgramGenerator) this.manager.getComponent("program-generator");
  +            smap = (Sitemap) programGenerator.load(file, markupLanguage, programmingLanguage,
environment);
               if (smap instanceof Composer) smap.setComponentManager(this.manager);
               if (smap instanceof Configurable) smap.setConfiguration(this.conf);
               this.sitemap = smap;
           } catch (Exception e) {
  -            synchronized (this.exception) {
  -                this.exception = e;
  -            }
  +            this.exception = e;
           } finally {
  -            regeneration = null;
  -            environment = null;
  -            isRegenerationRunning = false;
  +            this.regeneration = null;
  +            this.environment = null;
  +            this.isRegenerationRunning = false;
           }
  -    }
  -
  -    public void setBasePath (String basePath) {
  -        this.basePath = basePath;
       }
   } 
  
  
  

Mime
View raw message