bloritsch 01/02/01 10:44:41
Modified: src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 AbstractMarkupLanguage.java
Logicsheet.java
Log:
Format changes for AbstractLogicSheet and LogicSheet. Also, separated out
the create logicsheet code so that it is consistently built.
Revision Changes Path
No revision
No revision
1.1.2.22 +245 -366
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- AbstractMarkupLanguage.java 2001/01/31 20:58:48 1.1.2.21
+++ AbstractMarkupLanguage.java 2001/02/01 18:44:38 1.1.2.22
@@ -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.components.language.markup;
import java.io.File;
@@ -18,7 +19,6 @@
import java.util.Hashtable;
import java.util.Enumeration;
import java.util.Iterator;
-
import org.xml.sax.InputSource;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -27,7 +27,6 @@
import org.xml.sax.Attributes;
import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.helpers.XMLReaderFactory;
-
import org.apache.avalon.Composer;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
@@ -35,143 +34,103 @@
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
import org.apache.avalon.Parameters;
-
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.util.NetUtils;
import org.apache.cocoon.components.store.MemoryStore;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
-
import org.apache.avalon.AbstractLoggable;
/**
* Base implementation of <code>MarkupLanguage</code>. This class uses
- * logicsheets as the only means of code generation. Code generation should
- * be decoupled from this context!!!
- *
+ * logicsheets as the only means of code generation. Code generation should
be decoupled from this context!!!
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/01/31 20:58:48 $
+ * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/02/01 18:44:38 $
*/
-public abstract class AbstractMarkupLanguage extends AbstractLoggable
- implements MarkupLanguage, Composer, Configurable
-{
- /**
- * The supported language table
- */
+public abstract class AbstractMarkupLanguage extends AbstractLoggable
implements MarkupLanguage, Composer, Configurable {
+ /** The supported language table */
protected Hashtable languages;
- /**
- * The in-memory code-generation logicsheet cache
- */
+ /** The in-memory code-generation logicsheet cache */
protected MemoryStore logicsheetCache;
- /**
- * The markup language's namespace uri
- */
+ /** The markup language's namespace uri */
protected String uri;
- /**
- * The markup language's namespace prefix
- */
+ /** The markup language's namespace prefix */
protected String prefix;
/** The component manager */
protected ComponentManager manager;
/**
- * Set the global component manager.
- *
- * @param manager The sitemap-specified component manager
- */
+ * Set the global component manager.
+ * @param manager The sitemap-specified component manager
+ */
public void compose(ComponentManager manager) {
this.manager = manager;
}
- /**
- * The default constructor.
- */
+ /** The default constructor. */
public AbstractMarkupLanguage() throws SAXException, IOException {
// Initialize language table
this.languages = new Hashtable();
-
// Initialize logicsheet cache
this.logicsheetCache = new MemoryStore();
}
/**
- * Initialize the (required) markup language namespace definition.
- *
- * @param params The sitemap-supplied parameters
- * @exception Exception Not actually thrown
- */
- protected void setParameters(Parameters params) throws Exception
- {
- this.uri = params.getParameter("uri",null);
+ * Initialize the (required) markup language namespace definition.
+ * @param params The sitemap-supplied parameters
+ * @exception Exception Not actually thrown
+ */
+ protected void setParameters(Parameters params) throws Exception {
+ this.uri = params.getParameter("uri", null);
this.prefix = params.getParameter("prefix", null);
}
/**
- * Process additional configuration. Load supported programming language
- * definitions
- *
- * @param conf The language configuration
- * @exception ConfigurationException If an error occurs loading
logichseets
- */
- public void configure(Configuration conf)
- throws ConfigurationException
- {
+ * Process additional configuration. Load supported programming language
definitions
+ *
+ * @param conf The language configuration
+ * @exception ConfigurationException If an error occurs loading
logichseets
+ */
+ public void configure(Configuration conf) throws ConfigurationException {
try {
+ // Set up each target-language
Iterator l = conf.getChildren("target-language");
while (l.hasNext()) {
- Configuration lc = (Configuration) l.next();
-
+ Configuration lc = (Configuration)l.next();
LanguageDescriptor language = new LanguageDescriptor();
language.setName(lc.getAttribute("name"));
-
Parameters lcp = Parameters.fromConfiguration(lc);
- String logicsheetLocation =
- lcp.getParameter("core-logicsheet",null);
- URL logicsheetURL = NetUtils.getURL(logicsheetLocation);
- String logicsheetName = logicsheetURL.toExternalForm();
- // FIXME (SSA) should be abstracted
- Logicsheet logicsheet = new Logicsheet();
- logicsheet.setLogger(getLogger());
- logicsheet.setInputSource(new
InputSource(logicsheetURL.openStream()));
- CachedURL entry = new CachedURL(logicsheetURL, logicsheet);
+ // Create & Store the core logicsheet
+ CachedURL entry = createLogicsheet(lcp, false);
entry.setLogger(getLogger());
+
+ String logicsheetName = entry.getURL().toExternalForm();
+
this.logicsheetCache.store(logicsheetName, entry);
language.setLogicsheet(logicsheetName);
+ // Set up each built-in logicsheet
Iterator n = lc.getChildren("builtin-logicsheet");
while (n.hasNext()) {
- Configuration nc = (Configuration) n.next();
+ Configuration nc = (Configuration)n.next();
Parameters ncp = Parameters.fromConfiguration(nc);
+
+ // Create & Store the named logicsheets
+ CachedURL namedEntry = createLogicsheet(ncp, true);
- String namedLogicsheetPrefix =
ncp.getParameter("prefix", null);
- String namedLogicsheetUri = ncp.getParameter("uri",
null);
- String namedLogicsheetLocation =
ncp.getParameter("href", null);
-
- // FIXME: This is repetitive; add method for both cases
- URL namedLogicsheetURL =
NetUtils.getURL(namedLogicsheetLocation);
- getLogger().info(namedLogicsheetLocation + ": " +
namedLogicsheetURL.toExternalForm());
- String namedLogicsheetName =
namedLogicsheetURL.toExternalForm();
- NamedLogicsheet namedLogicsheet = new NamedLogicsheet();
- namedLogicsheet.setLogger(getLogger());
- namedLogicsheet.setInputSource(
- new InputSource(namedLogicsheetURL.openStream())
- );
- namedLogicsheet.setPrefix(namedLogicsheetPrefix);
- namedLogicsheet.setUri(namedLogicsheetUri);
- CachedURL namedEntry =
- new CachedURL(namedLogicsheetURL, namedLogicsheet);
- namedEntry.setLogger(getLogger());
+ String namedLogicsheetName =
namedEntry.getURL().toExternalForm();
+ String namedLogicSheetPrefix = ((NamedLogicsheet)
namedEntry.getLogicsheet()).getPrefix();
+
this.logicsheetCache.store(namedLogicsheetName,
namedEntry);
- language.addNamedLogicsheet(
- namedLogicsheetPrefix, namedLogicsheetName
- );
- }
- this.languages.put(language.getName(), language);
+ // FIXME: Logicsheets should be found by uri--not prefix.
+ language.addNamedLogicsheet(namedLogicSheetPrefix,
namedLogicsheetName);
+ }
+ this.languages.put(language.getName(), language);
}
} catch (Exception e) {
getLogger().warn("Configuration Error: " + e.getMessage(), e);
@@ -180,216 +139,188 @@
}
/**
- * Return the source document's encoding. This can be <code>null</code>
for
- * the platform's default encoding. The default implementation returns
- * <code>null, but derived classes may override it if encoding applies to
- * their concrete languages. FIXME: There should be a way to get the
- * XML document's encoding as seen by the parser; unfortunately, this
- * information is not returned by current DOM or SAX parsers...
- *
- * @return The document-specified encoding
- */
+ * Abstract out the Logicsheet creation. Handles both Named and regular
logicsheets.
+ */
+ private CachedURL createLogicsheet(Parameters params, boolean named)
throws Exception {
+ String logicsheetLocation;
+ URL logicsheetURL;
+ Logicsheet logicsheet;
+ CachedURL entry = null;
+
+ if (named) {
+ logicsheetLocation = params.getParameter("href", null);
+
+ NamedLogicsheet namedLogicsheet = new NamedLogicsheet();
+ namedLogicsheet.setLogger(getLogger());
+ namedLogicsheet.setPrefix(params.getParameter("prefix", null));
+ namedLogicsheet.setUri(params.getParameter("href", null));
+
+ logicsheet = namedLogicsheet;
+ } else {
+ logicsheetLocation = params.getParameter("core-logicsheet",
null);
+ logicsheet = new Logicsheet();
+ logicsheet.setLogger(getLogger());
+ }
+
+ logicsheetURL = NetUtils.getURL(logicsheetLocation);
+
+ logicsheet.setInputSource(new
InputSource(logicsheetURL.openStream()));
+
+ entry = new CachedURL(logicsheetURL, logicsheet);
+ entry.setLogger(getLogger());
+
+ return entry;
+ }
+
+ /**
+ * Return the source document's encoding. This can be <code>null</code>
for
+ * the platform's default encoding. The default implementation returns
+ * <code>null, but derived classes may override it if encoding applies to
+ * their concrete languages. FIXME: There should be a way to get the
+ * XML document's encoding as seen by the parser; unfortunately, this
+ * information is not returned by current DOM or SAX parsers...
+ * @return The document-specified encoding
+ */
public String getEncoding() {
return null;
}
/**
- * Returns a filter that chains on the fly the requested transformers for
source
- * code generation. This method scans the input SAX events for built-in
logicsheet
- * declared as namespace attribute on the root element.
- *
- * Derived class should overide this method and the public inner class in
- * order to add more specif action and to build a more specific
transformer
- * chain.
- *
- * @param logicsheetMarkupGenerator the logicsheet markup generator
- * @param resolver the entity resolver
- * @return XMLFilter the filter that build on the fly the transformer
chain
- */
- protected TransformerChainBuilderFilter getTranformerChainBuilder (
- LogicsheetCodeGenerator
logicsheetMarkupGenerator,
- EntityResolver resolver) {
- return new TransformerChainBuilderFilter(logicsheetMarkupGenerator,
resolver);
+ * Returns a filter that chains on the fly the requested transformers
for source
+ * code generation. This method scans the input SAX events for built-in
logicsheet
+ * declared as namespace attribute on the root element. Derived class
should overide this method and the public inner class in
+ * order to add more specif action and to build a more specific
transformer chain.
+ * @param logicsheetMarkupGenerator the logicsheet markup generator
+ * @param resolver the entity resolver
+ * @return XMLFilter the filter that build on the fly the transformer
chain
+ */
+ protected TransformerChainBuilderFilter getTranformerChainBuilder
+ (LogicsheetCodeGenerator logicsheetMarkupGenerator, EntityResolver
resolver) {
+ return new
TransformerChainBuilderFilter(logicsheetMarkupGenerator, resolver);
}
/**
- * Prepare the input source for logicsheet processing and code generation
- * with a preprocess filter.
- * The return <code>XMLFilter</code> object is the first filter on the
- * transformer chain.
- *
- * The default implementation does nothing by returning a identity
filter, but
- * derived classes should (at least) use the passed programming language
to
- * quote <code>Strings</code>
- *
- * @param filename The source filename
- * @param language The target programming language
- * @return The preprocess filter
- */
- protected XMLFilter getPreprocessFilter(
- String filename, ProgrammingLanguage language
- )
- {
+ * Prepare the input source for logicsheet processing and code
generation with a preprocess filter.
+ * The return <code>XMLFilter</code> object is the first filter on the
transformer chain.
+ * The default implementation does nothing by returning a identity
filter, but
+ * derived classes should (at least) use the passed programming language
to quote <code>Strings</code>
+ * @param filename The source filename
+ * @param language The target programming language
+ * @return The preprocess filter
+ */
+ protected XMLFilter getPreprocessFilter(String filename,
ProgrammingLanguage language) {
return new XMLFilterImpl();
}
/**
- * Add a dependency on an external file to the document for inclusion in
- * generated code. This is used to populate a list of <code>File</code>'s
- * tested for change on each invocation; this information is used to
assert
- * whether regeneration is necessary.
- *
- * @param location The file path of the dependent file
- * @see <code>AbstractMarkupLanguage</code>,
<code>ServerPagesGenerator</code>
- * and <code>AbstractServerPage</code>
- */
+ * Add a dependency on an external file to the document for inclusion in
+ * generated code. This is used to populate a list of <code>File</code>'s
+ * tested for change on each invocation; this information is used to
assert whether regeneration is necessary.
+ * @param location The file path of the dependent file
+ * @see <code>AbstractMarkupLanguage</code>,
<code>ServerPagesGenerator</code> and <code>AbstractServerPage</code>
+ */
protected abstract void addDependency(String location);
/**
- * Generate source code from the input document for the target
- * <code>ProgrammingLanguage</code>. After preprocessing the input
document,
- * this method applies logicsheets in the following order:
- * <ul>
- * <li>User-defined logicsheets</li>
- * <li>Namespace-mapped logicsheets</li>
- * <li>Language-specific logicsheet</li>
- * </ul>
- *
- * @param input The input source
- * @param filename The input document's original filename
- * @param programmingLanguage The target programming language
- * @return The generated source code
- * @exception Exception If an error occurs during code generation
- */
- public String generateCode(
- InputSource input, String filename, ProgrammingLanguage
programmingLanguage,
- EntityResolver resolver
- ) throws Exception {
- String languageName = programmingLanguage.getLanguageName();
- LanguageDescriptor language =
- (LanguageDescriptor) this.languages.get(languageName);
-
- if (language == null) {
- throw new IllegalArgumentException(
- "Unsupported programming language: " + languageName
- );
- }
-
- // Create a XMLReader
- XMLReader reader = XMLReaderFactory.createXMLReader();
- reader.setFeature("http://xml.org/sax/features/namespace-prefixes";,
true);
-
- // Get the needed preprocess filter
- XMLFilter preprocessFilter = this.getPreprocessFilter(filename,
programmingLanguage);
- preprocessFilter.setParent(reader);
-
- // Create code generator
- LogicsheetCodeGenerator codeGenerator = new
LogicsheetCodeGenerator();
-
- // set the transformer chain builder filter
- TransformerChainBuilderFilter tranBuilder =
getTranformerChainBuilder(codeGenerator, resolver);
- tranBuilder.setLanguageDescriptor(language);
- tranBuilder.setParent(preprocessFilter);
-
- return codeGenerator.generateCode(tranBuilder, input, filename);
- }
-
- /**
- * Add a logicsheet to the code generator.
- *
- * @param codeGenerator The code generator
- * @param logicsheetLocation Location of the logicsheet to be added
- * @param document The input document
- * @exception MalformedURLException If location is invalid
- * @exception IOException IO Error
- * @exception SAXException Logicsheet parse error
- */
- protected void addLogicsheet(
- LogicsheetCodeGenerator codeGenerator,
- String logicsheetLocation,
- EntityResolver entityResolver
- ) throws MalformedURLException, IOException, SAXException
- {
- String systemId = null;
- InputSource inputSource = null;
-
- if (codeGenerator == null) {
- getLogger().debug("This should never happen: codeGenerator is
null");
- throw new SAXException("codeGenerator must never be null.");
- }
-
- if (logicsheetLocation.indexOf(":/") < 0) { // Relative to Cocoon
root
- inputSource = entityResolver.resolveEntity(null,
logicsheetLocation);
- systemId = inputSource.getSystemId();
- } else { // Fully resolved URL
- systemId = logicsheetLocation;
- inputSource = new InputSource(systemId);
- }
-
- URL url = new URL(systemId);
- String logicsheetName = url.toExternalForm();
-
- CachedURL entry = (CachedURL)
this.logicsheetCache.get(logicsheetName);
-
- Logicsheet logicsheet = null;
-
- if (entry == null) {
- logicsheet = new Logicsheet();
- logicsheet.setLogger(getLogger());
- logicsheet.setInputSource(inputSource);
- entry = new CachedURL(url, logicsheet);
- entry.setLogger(getLogger());
- this.logicsheetCache.store(logicsheetName, entry);
- }
-
- logicsheet = entry.getLogicsheet();
-
- if (entry.hasChanged()) {
- logicsheet.setInputSource(inputSource);
- }
-
- if (entry.isFile()) {
- this.addDependency(IOUtils.getFullFilename(entry.getFile()));
- }
-
- codeGenerator.addLogicsheet(logicsheet);
+ * Generate source code from the input document for the target
+ * <code>ProgrammingLanguage</code>. After preprocessing the input
document,
+ * this method applies logicsheets in the following order: <ul>
<li>User-defined logicsheets</li>
+ * <li>Namespace-mapped logicsheets</li> <li>Language-specific
logicsheet</li> </ul>
+ * @param input The input source
+ * @param filename The input document's original filename
+ * @param programmingLanguage The target programming language
+ * @return The generated source code
+ * @exception Exception If an error occurs during code generation
+ */
+ public String generateCode(InputSource input, String filename,
ProgrammingLanguage programmingLanguage,
+ EntityResolver resolver) throws Exception {
+ String languageName = programmingLanguage.getLanguageName();
+ LanguageDescriptor language =
(LanguageDescriptor)this.languages.get(languageName);
+ if (language == null) {
+ throw new IllegalArgumentException("Unsupported programming
language: " + languageName);
+ }
+ // Create a XMLReader
+ XMLReader reader = XMLReaderFactory.createXMLReader();
+
reader.setFeature("http://xml.org/sax/features/namespace-prefixes";, true);
+ // Get the needed preprocess filter
+ XMLFilter preprocessFilter = this.getPreprocessFilter(filename,
programmingLanguage);
+ preprocessFilter.setParent(reader);
+ // Create code generator
+ LogicsheetCodeGenerator codeGenerator = new
LogicsheetCodeGenerator();
+ // set the transformer chain builder filter
+ TransformerChainBuilderFilter tranBuilder =
getTranformerChainBuilder(codeGenerator, resolver);
+ tranBuilder.setLanguageDescriptor(language);
+ tranBuilder.setParent(preprocessFilter);
+ return codeGenerator.generateCode(tranBuilder, input, filename);
}
-//
-// Inner classes
-//
-
/**
- * This class holds transient information about a target programming
- * language.
- *
- */
+ * Add a logicsheet to the code generator.
+ * @param codeGenerator The code generator
+ * @param logicsheetLocation Location of the logicsheet to be added
+ * @param document The input document
+ * @exception MalformedURLException If location is invalid
+ * @exception IOException IO Error
+ * @exception SAXException Logicsheet parse error
+ */
+ protected void addLogicsheet(LogicsheetCodeGenerator codeGenerator,
String logicsheetLocation, EntityResolver entityResolver)
+ throws MalformedURLException, IOException, SAXException {
+ String systemId = null;
+ InputSource inputSource = null;
+ if (codeGenerator == null) {
+ getLogger().debug("This should never happen: codeGenerator
is null");
+ throw new SAXException("codeGenerator must never be null.");
+ }
+ if (logicsheetLocation.indexOf(":/") < 0) { // Relative to
Cocoon root
+ inputSource = entityResolver.resolveEntity(null,
logicsheetLocation);
+ systemId = inputSource.getSystemId();
+ } else { // Fully resolved URL
+ systemId = logicsheetLocation;
+ inputSource = new InputSource(systemId);
+ }
+ URL url = new URL(systemId);
+ String logicsheetName = url.toExternalForm();
+ CachedURL entry =
(CachedURL)this.logicsheetCache.get(logicsheetName);
+ Logicsheet logicsheet = null;
+ if (entry == null) {
+ logicsheet = new Logicsheet();
+ logicsheet.setLogger(getLogger());
+ logicsheet.setInputSource(inputSource);
+ entry = new CachedURL(url, logicsheet);
+ entry.setLogger(getLogger());
+ this.logicsheetCache.store(logicsheetName, entry);
+ }
+ logicsheet = entry.getLogicsheet();
+ if (entry.hasChanged()) {
+ logicsheet.setInputSource(inputSource);
+ }
+ if (entry.isFile()) {
+ this.addDependency(IOUtils.getFullFilename(entry.getFile()));
+ }
+ codeGenerator.addLogicsheet(logicsheet);
+ }
+ //
+ // Inner classes
+ //
+
+ /** This class holds transient information about a target programming
language. */
protected class LanguageDescriptor {
- /**
- * The progamming language name
- */
+ /** The progamming language name */
protected String name;
- /**
- * The progamming language core logicsheet
- */
+ /** The progamming language core logicsheet */
protected String logicsheet;
- /**
- * The list of built-in logicsheets defined for this target language
- */
+ /** The list of built-in logicsheets defined for this target
language */
protected Hashtable namedLogicsheets;
- /**
- * The default constructor
- */
+ /** The default constructor */
protected LanguageDescriptor() {
this.namedLogicsheets = new Hashtable();
}
/**
* Set the programming language's name
- *
* @param name The programming language's name
*/
protected void setName(String name) {
@@ -397,17 +328,15 @@
}
/**
- * Return the programming language's name
- *
- * @return The programming language's name
- */
+ * Return the programming language's name
+ * @return The programming language's name
+ */
protected String getName() {
return this.name;
}
/**
* Set the programming language's core logichseet location
- *
* @param logicsheet The programming language's core logichseet
location
*/
protected void setLogicsheet(String logicsheet) {
@@ -416,7 +345,6 @@
/**
* Return the programming language's core logichseet location
- *
* @return The programming language's core logichseet location
*/
protected String getLogicsheet() {
@@ -425,69 +353,54 @@
/**
* Add a namespace-mapped logicsheet to this language
- *
* @param prefix The logichseet's namespace prefix
* @param uri The logichseet's namespace uri
* @param namedLogicsheet The logichseet's location
*/
protected void addNamedLogicsheet(String prefix, String
namedLogicsheet) {
- this.namedLogicsheets.put(
- prefix,
- namedLogicsheet
- );
+ this.namedLogicsheets.put(prefix, namedLogicsheet);
}
/**
* Return a namespace-mapped logicsheet given its name
- *
* @return The namespace-mapped logicsheet
*/
protected String getNamedLogicsheet(String prefix) {
- return (String) this.namedLogicsheets.get(prefix);
+ return (String)this.namedLogicsheets.get(prefix);
}
}
- /**
- * This class holds a cached URL entry associated with a logicsheet
- *
- */
+
+ /** This class holds a cached URL entry associated with a logicsheet */
protected class CachedURL extends AbstractLoggable {
- /**
- * The logicsheet URL
- */
+ /** The logicsheet URL */
protected URL url;
+
/**
* The logicsheet's <code>File</code> if it's actually a file.
- * This is used to provide last modification information not
- * otherwise available for URL's in Java :-(
+ * This is used to provide last modification information not
otherwise available for URL's in Java :-(
*/
protected File file;
- /**
- * The cached logicsheet
- */
+
+ /** The cached logicsheet */
protected Logicsheet logicsheet;
- /**
- * The las time this logicsheet was changed/loaded
- */
+
+ /** The las time this logicsheet was changed/loaded */
protected long lastModified;
- /**
- * The constructor.
- */
+ /** The constructor. */
protected CachedURL(URL url, Logicsheet logicsheet) throws
IOException {
this.url = url;
this.logicsheet = logicsheet;
-
if (this.isFile()) {
this.file = new File(url.getFile());
}
-
- this.lastModified = (new Date()).getTime();
+ this.lastModified = (
+ new Date()).getTime();
}
/**
* Return this entry's URL
- *
* @return The cached logicsheet's URL
*/
protected URL getURL() {
@@ -500,7 +413,6 @@
/**
* Return this entry's <code>File</code>
- *
* @return The cached logicsheet's <code>File</code>
*/
protected File getFile() {
@@ -509,7 +421,6 @@
/**
* Return this entry's cached logicsheet
- *
* @return The cached logicsheet
*/
protected Logicsheet getLogicsheet() {
@@ -518,129 +429,97 @@
/**
* Assert whether this entry's logicsheet should be reloaded
- *
* @return Whether the cached logicsheet has changed
*/
protected boolean hasChanged() {
boolean hasChanged = false;
-
if (this.file == null) {
return false;
}
-
try {
hasChanged = this.lastModified < this.file.lastModified();
} catch (SecurityException se) {
getLogger().warn("SecurityException", se);
}
-
return hasChanged;
}
}
+
/**
- * a XMLFilter that build the chain of transformers on the fly.
- * Each time a stylesheet is found, a call to the code generator is done
- * to add the new transformer at the end of the current transformer chain.
- *
- */
+ * a XMLFilter that build the chain of transformers on the fly.
+ * Each time a stylesheet is found, a call to the code generator is done
+ * to add the new transformer at the end of the current transformer
chain.
+ */
public class TransformerChainBuilderFilter extends XMLFilterImpl {
-
- /**
- * The markup generator
- */
+ /** The markup generator */
protected LogicsheetCodeGenerator logicsheetMarkupGenerator;
- /**
- * the language description
- */
+ /** the language description */
protected LanguageDescriptor language;
- /**
- * the entity resolver
- */
+ /** the entity resolver */
protected EntityResolver resolver;
-
private boolean isRootElem;
-
private List startPrefixes;
/**
- * the constructor depends on the code generator, and the entity
resolver
- *
- * @param logicsheetMarkupGenerator The code generator
- * @param resolver
- */
- protected TransformerChainBuilderFilter (
- LogicsheetCodeGenerator logicsheetMarkupGenerator,
- EntityResolver resolver
- ) {
+ * the constructor depends on the code generator, and the entity
resolver
+ * @param logicsheetMarkupGenerator The code generator
+ * @param resolver
+ */
+ protected TransformerChainBuilderFilter(LogicsheetCodeGenerator
logicsheetMarkupGenerator, EntityResolver resolver) {
this.logicsheetMarkupGenerator = logicsheetMarkupGenerator;
this.resolver = resolver;
}
/**
- * This method should be called prior to receiving any SAX event.
- * Indeed the language information is needed to get the core
stylesheet.
- *
- * @language the language in used
- */
+ * This method should be called prior to receiving any SAX event.
+ * Indeed the language information is needed to get the core
stylesheet.
+ * @language the language in used
+ */
protected void setLanguageDescriptor(LanguageDescriptor language) {
this.language = language;
}
-
- /**
- * @see org.xml.sax.ContentHandler
- */
- public void startDocument () throws SAXException {
- isRootElem=true;
+ /** @see org.xml.sax.ContentHandler */
+ public void startDocument() throws SAXException {
+ isRootElem = true;
startPrefixes = new ArrayList();
}
- /**
- * @see org.xml.sax.ContentHandler
- */
+ /** @see org.xml.sax.ContentHandler */
public void startPrefixMapping(String prefix, String uri) throws
SAXException {
- if(!isRootElem) {
+ if (!isRootElem) {
super.startPrefixMapping(prefix, uri);
} else {
// cache the prefix mapping
- String[] prefixArray = new String [2];
- prefixArray[0]= prefix;
- prefixArray[1]= uri;
+ String[] prefixArray = new String[2];
+ prefixArray[0] = prefix;
+ prefixArray[1] = uri;
this.startPrefixes.add(prefixArray);
}
}
- /**
- * @see org.xml.sax.ContentHandler
- */
- public void startElement (
- String namespaceURI, String localName,
- String qName, Attributes atts
- ) throws SAXException {
- if(isRootElem) {
- isRootElem=false;
+ /** @see org.xml.sax.ContentHandler */
+ public void startElement(String namespaceURI, String localName,
String qName, Attributes atts) throws SAXException {
+ if (isRootElem) {
+ isRootElem = false;
try {
// Add namespace-mapped logicsheets
int prefixesCount = this.startPrefixes.size();
for (int i = 0; i < prefixesCount; i++) {
String[] prefixNamingArray = (String[])
this.startPrefixes.get(i);
- String namedLogicsheetName =
-
this.language.getNamedLogicsheet(prefixNamingArray[0]);
+ String namedLogicsheetName =
this.language.getNamedLogicsheet(prefixNamingArray[0]);
if (namedLogicsheetName != null) {
- AbstractMarkupLanguage.this.addLogicsheet(
- this.logicsheetMarkupGenerator,
namedLogicsheetName, resolver
- );
+
AbstractMarkupLanguage.this.addLogicsheet(this.logicsheetMarkupGenerator,
+ namedLogicsheetName, resolver);
}
}
// Add the language stylesheet (Always the last one)
- AbstractMarkupLanguage.this.addLogicsheet(
- this.logicsheetMarkupGenerator,
this.language.getLogicsheet(), resolver
- );
+
AbstractMarkupLanguage.this.addLogicsheet(this.logicsheetMarkupGenerator,
this.language.getLogicsheet(), resolver);
} catch (IOException ioe) {
- throw new SAXException (ioe);
+ throw new SAXException(ioe);
}
// All stylesheet have been configured and correctly setup.
// Starts firing SAX events, especially the startDocument
event,
1.1.2.13 +18 -32
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- Logicsheet.java 2001/01/31 20:25:40 1.1.2.12
+++ Logicsheet.java 2001/02/01 18:44:39 1.1.2.13
@@ -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.components.language.markup;
import java.io.IOException;
@@ -15,7 +16,6 @@
import java.util.Set;
import java.util.HashMap;
import java.util.Iterator;
-
import org.xml.sax.InputSource;
import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.SAXException;
@@ -30,14 +30,12 @@
import org.xml.sax.ErrorHandler;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.XMLReaderFactory;
-
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.Templates;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.sax.SAXTransformerFactory;
-
import org.apache.avalon.AbstractLoggable;
/**
@@ -45,49 +43,38 @@
* a "standard" XSLT stylesheet stored as <code>trax.Templates</code> object.
* Though this will change shortly: a new markup language will be used
* for logicsheet authoring; logicsheets written in this language will be
- * transformed into an equivalent XSLT stylesheet anyway...
- * This class should probably be based on an interface...
- *
+ * transformed into an equivalent XSLT stylesheet anyway... This class
should probably be based on an interface...
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/01/31 20:25:40 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/02/01 18:44:39 $
*/
public class Logicsheet extends AbstractLoggable {
- /**
- * The trax TransformerFactory
- */
+ /** The trax TransformerFactory */
protected SAXTransformerFactory tfactory;
- /**
- * The trax templates
- */
+
+ /** The trax templates */
protected Templates templates;
/**
- * The constructor. It does preserve the namespace from the stylesheet.
- *
- * @param inputSource The stylesheet's input source
- * @exception IOException IOError processing input source
- * @exception SAXException Input source parse error
- */
- public void setInputSource(InputSource inputSource)
- throws SAXException, IOException
- {
+ * The constructor. It does preserve the namespace from the stylesheet.
+ * @param inputSource The stylesheet's input source
+ * @exception IOException IOError processing input source
+ * @exception SAXException Input source parse error
+ */
+ public void setInputSource(InputSource inputSource) throws SAXException,
IOException {
try {
- tfactory = (SAXTransformerFactory)
TransformerFactory.newInstance();
+ tfactory =
(SAXTransformerFactory)TransformerFactory.newInstance();
templates = tfactory.newTemplates(new SAXSource(inputSource));
- } catch (TransformerConfigurationException e){
+ } catch (TransformerConfigurationException e) {
getLogger().error("Logicsheet.setInputSource", e);
-
}
}
/**
- * Get the TransformerHandler that performs the stylesheet transformation.
- *
- * @return The TransformerHandler for the associated stylesheet.
- */
- public TransformerHandler getTransformerHandler()
- {
+ * Get the TransformerHandler that performs the stylesheet
transformation.
+ * @return The TransformerHandler for the associated stylesheet.
+ */
+ public TransformerHandler getTransformerHandler() {
try {
return tfactory.newTransformerHandler(templates);
} catch (TransformerConfigurationException e) {
@@ -98,4 +85,3 @@
return null;
}
}
-
