vgritsenko 02/03/07 08:49:04
Modified: src/java/org/apache/cocoon/components/language/generator
ProgramGeneratorImpl.java
Log:
cleanup
Revision Changes Path
1.13 +8 -12
xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ProgramGeneratorImpl.java 28 Feb 2002 14:25:51 -0000 1.12
+++ ProgramGeneratorImpl.java 7 Mar 2002 16:49:03 -0000 1.13
@@ -69,11 +69,9 @@
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.components.language.LanguageException;
import org.apache.cocoon.components.language.markup.MarkupLanguage;
-import org.apache.cocoon.components.language.markup.sitemap.SitemapMarkupLanguage;
import org.apache.cocoon.components.language.programming.CodeFormatter;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.components.language.programming.Program;
-import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.IOUtils;
@@ -87,7 +85,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: ProgramGeneratorImpl.java,v 1.12 2002/02/28 14:25:51
vgritsenko Exp $
+ * @version CVS $Id: ProgramGeneratorImpl.java,v 1.13 2002/03/07 16:49:03
vgritsenko Exp $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Parameterizable,
@@ -173,8 +171,8 @@
/**
* Set the sitemap-provided configuration. This method sets the persistent code
repository and the auto-reload option
- * @param conf The configuration information
- * @exception ConfigurationException Not thrown here
+ * @param params The configuration information
+ * @exception ParameterException Not thrown here
*/
public void parameterize(Parameters params) throws ParameterException {
this.autoReload = params.getParameterAsBoolean("auto-reload", autoReload);
@@ -203,9 +201,9 @@
/**
* Load a program built from an XML document written in a
<code>MarkupLanguage</code>
*
- * @param file The input document's <code>File</code>
- * @param markupLanguage The <code>MarkupLanguage</code> in which the input
document is written
- * @param programmingLanguage The <code>ProgrammingLanguage</code> in which the
program must be written
+ * @param fileName The input document's <code>File</code>
+ * @param markupLanguageName The <code>MarkupLanguage</code> in which the input
document is written
+ * @param programmingLanguageName The <code>ProgrammingLanguage</code> in which
the program must be written
* @return The loaded program instance
* @exception Exception If an error occurs during generation or loading
*/
@@ -238,7 +236,6 @@
if (programInstance == null && this.preload) {
// Preloading: Load program if its source/[object file] is available
- String className = normalizedName.replace(File.separatorChar, '.');
try {
markupLanguage =
(MarkupLanguage)this.markupSelector.select(markupLanguageName);
@@ -328,7 +325,7 @@
// If failed, generate. This is for the first thread entering this block
getLogger().debug("Creating resource " + normalizedName);
try {
- Program program = this.generateResource(newManager, source,
+ Program program = this.generateResource(source,
normalizedName, markupLanguage, programmingLanguage,
resolver);
// Store generated program in cache
@@ -353,8 +350,7 @@
/**
* Generates Program out of Source using specified languages.
*/
- private Program generateResource(ComponentManager newManager,
- Source source,
+ private Program generateResource(Source source,
String normalizedName,
MarkupLanguage markupLanguage,
ProgrammingLanguage programmingLanguage,
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
