You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2001/01/31 21:25:42 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/components/language/markup AbstractMarkupLanguage.java Logicsheet.java
bloritsch 01/01/31 12:25:42
Modified: src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 AbstractMarkupLanguage.java
Logicsheet.java
Log:
NullPointerException error fixed.
Revision Changes Path
No revision
No revision
1.1.2.20 +4 -1 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.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- AbstractMarkupLanguage.java 2001/01/31 15:03:52 1.1.2.19
+++ AbstractMarkupLanguage.java 2001/01/31 20:25:39 1.1.2.20
@@ -49,7 +49,7 @@
* be decoupled from this context!!!
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/01/31 15:03:52 $
+ * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/01/31 20:25:39 $
*/
public abstract class AbstractMarkupLanguage extends AbstractLoggable
implements MarkupLanguage, Composer, Configurable
@@ -135,6 +135,7 @@
String logicsheetName = logicsheetURL.toExternalForm();
// FIXME (SSA) should be abstracted
Logicsheet logicsheet = new Logicsheet();
+ logicsheet.setLogger(getLogger());
logicsheet.setInputSource(new InputSource(logicsheetURL.toString()));
CachedURL entry = new CachedURL(logicsheetURL, logicsheet);
entry.setLogger(getLogger());
@@ -155,6 +156,7 @@
getLogger().info(namedLogicsheetLocation + ": " + namedLogicsheetURL.toExternalForm());
String namedLogicsheetName = namedLogicsheetURL.toExternalForm();
NamedLogicsheet namedLogicsheet = new NamedLogicsheet();
+ namedLogicsheet.setLogger(getLogger());
namedLogicsheet.setInputSource(
new InputSource(namedLogicsheetName)
);
@@ -333,6 +335,7 @@
if (entry == null) {
logicsheet = new Logicsheet();
+ logicsheet.setLogger(getLogger());
logicsheet.setInputSource(inputSource);
entry = new CachedURL(url, logicsheet);
entry.setLogger(getLogger());
1.1.2.12 +6 -18 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.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- Logicsheet.java 2001/01/22 21:56:34 1.1.2.11
+++ Logicsheet.java 2001/01/31 20:25:40 1.1.2.12
@@ -38,8 +38,7 @@
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.sax.SAXTransformerFactory;
-import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.AbstractLoggable;
/**
* A code-generation logicsheet. This class is actually a wrapper for
@@ -51,15 +50,10 @@
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/01/22 21:56:34 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/01/31 20:25:40 $
*/
-public class Logicsheet implements Loggable {
+public class Logicsheet extends AbstractLoggable {
/**
- * The logger.
- */
- protected Logger log;
-
- /**
* The trax TransformerFactory
*/
protected SAXTransformerFactory tfactory;
@@ -68,12 +62,6 @@
*/
protected Templates templates;
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
- }
-
/**
* The constructor. It does preserve the namespace from the stylesheet.
*
@@ -88,7 +76,7 @@
tfactory = (SAXTransformerFactory) TransformerFactory.newInstance();
templates = tfactory.newTemplates(new SAXSource(inputSource));
} catch (TransformerConfigurationException e){
- log.error("Logicsheet.setInputSource", e);
+ getLogger().error("Logicsheet.setInputSource", e);
}
}
@@ -103,9 +91,9 @@
try {
return tfactory.newTransformerHandler(templates);
} catch (TransformerConfigurationException e) {
- log.error("Logicsheet.getTransformerHandler:TransformerConfigurationException", e);
+ getLogger().error("Logicsheet.getTransformerHandler:TransformerConfigurationException", e);
} catch (Exception e) {
- log.error("Logicsheet.getTransformerHandler:Exception", e);
+ getLogger().error("Logicsheet.getTransformerHandler:Exception", e);
}
return null;
}