cvs commit: xml-cocoon2/src/org/apache/cocoon/util HashMap.java

[dims]

dims        01/07/23 15:04:48

  Modified:    src/org/apache/cocoon/components/language/generator
                        ProgramGeneratorImpl.java
               src/org/apache/cocoon/util HashMap.java
  Log:
  - Patch for Bug ID#2737
  - Remove extra ;
  
  Revision  Changes    Path
  1.12      +7 -1      
xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
  
  Index: ProgramGeneratorImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ProgramGeneratorImpl.java 2001/07/16 13:35:12     1.11
  +++ ProgramGeneratorImpl.java 2001/07/23 22:04:47     1.12
  @@ -36,6 +36,7 @@
   import org.apache.cocoon.components.language.programming.CodeFormatter;
   import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
   import org.apache.cocoon.components.store.Store;
  +import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.util.IOUtils;
  @@ -48,7 +49,7 @@
   /**
    * The default implementation of <code>ProgramGenerator</code>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
  - * @version CVS $Revision: 1.11 $ $Date: 2001/07/16 13:35:12 $
  + * @version CVS $Revision: 1.12 $ $Date: 2001/07/23 22:04:47 $
    */
   public class ProgramGeneratorImpl extends AbstractLoggable
       implements ProgramGenerator, Contextualizable, Composable, Configurable, 
ThreadSafe, Disposable {
  @@ -141,6 +142,11 @@
   
           // Set filenames
           StringBuffer contextFilename = new 
StringBuffer(this.rootPackage.replace('.', File.separatorChar));
  +             // Add uri if any (for sub-sitemap's)
  +             if(resolver instanceof Environment) {
  +                     contextFilename.append(File.separator);
  +                     contextFilename.append(((Environment)resolver).getURI());
  +             }
           contextFilename.append(File.separator);
           contextFilename.append(fileName);
           String normalizedName = 
IOUtils.normalizedFilename(contextFilename.toString());
  
  
  
  1.2       +2 -2      xml-cocoon2/src/org/apache/cocoon/util/HashMap.java
  
  Index: HashMap.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/HashMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HashMap.java      2001/07/23 15:50:10     1.1
  +++ HashMap.java      2001/07/23 22:04:48     1.2
  @@ -14,7 +14,7 @@
    * Extended Version of {@link java.util.HashMap}.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/07/23 15:50:10 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/07/23 22:04:48 $
    */
   public class HashMap extends java.util.HashMap {
   
  @@ -48,7 +48,7 @@
            return this.get(key);
        } else {
            return _default;
  -     };
  +     }
       }
   
   }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]