Author: vgritsenko
Date: Tue Apr 26 09:46:29 2005
New Revision: 164830
URL: http://svn.apache.org/viewcvs?rev=164830&view=rev
Log:
Use EMPTY_PROPERTIES
Modified:
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java
Modified:
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java?rev=164830&r1=164829&r2=164830&view=diff
==============================================================================
---
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
(original)
+++
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
Tue Apr 26 09:46:29 2005
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,13 +19,14 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.xml.AbstractXMLPipe;
import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
+import org.apache.cocoon.xml.XMLUtils;
import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
@@ -47,7 +48,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Id: CocoonMarkupLanguage.java,v 1.3 2004/05/01 00:05:44 joerg
Exp $
+ * @version CVS $Id$
*/
public abstract class CocoonMarkupLanguage extends AbstractMarkupLanguage
{
@@ -432,7 +433,7 @@
Iterator iter =
CocoonMarkupLanguage.this.dependencies.iterator();
while(iter.hasNext()) {
super.startElement(
- (String)rootElement[0], "dependency",
localPrefix + ":dependency", new AttributesImpl()
+ (String) rootElement[0], "dependency",
localPrefix + ":dependency", XMLUtils.EMPTY_ATTRIBUTES
);
locationChars = ((String)
iter.next()).toCharArray();
super.characters(locationChars, 0 ,
locationChars.length);
Modified:
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java?rev=164830&r1=164829&r2=164830&view=diff
==============================================================================
---
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
(original)
+++
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
Tue Apr 26 09:46:29 2005
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,10 @@
import org.apache.cocoon.components.language.markup.CocoonMarkupLanguage;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.xml.AbstractXMLPipe;
+import org.apache.cocoon.xml.XMLUtils;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
import java.util.Stack;
@@ -32,7 +32,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Sahuc</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Id: XSPMarkupLanguage.java,v 1.1 2004/03/10 12:58:05 stephan
Exp $
+ * @version $Id$
*/
public class XSPMarkupLanguage extends CocoonMarkupLanguage {
@@ -117,7 +117,7 @@
String value = String.valueOf(ch, start, length);
// Create a new element <xsp:text> that wrap the quoted PCDATA
super.startElement(XSPMarkupLanguage.this.getURI(), "text",
- localPrefix + ":text", new AttributesImpl());
+ localPrefix + ":text", XMLUtils.EMPTY_ATTRIBUTES);
super.characters(value.toCharArray(), 0, value.length());
super.endElement(XSPMarkupLanguage.this.getURI(), "text",
localPrefix + ":text");
Modified:
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java?rev=164830&r1=164829&r2=164830&view=diff
==============================================================================
---
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java
(original)
+++
cocoon/blocks/unsupported/xsp/trunk/java/org/apache/cocoon/components/language/markup/xsp/XSPObjectHelper.java
Tue Apr 26 09:46:29 2005
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
+ * Copyright 1999-2005 The Apache Software Foundation.
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,6 +19,8 @@
import java.util.Iterator;
import org.apache.cocoon.xml.dom.DOMStreamer;
+import org.apache.cocoon.xml.XMLUtils;
+
import org.apache.excalibur.xml.sax.XMLizable;
import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
@@ -31,13 +33,9 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
* (Cocoon1 <code>xspExpr()</code> methods port)
- * @version CVS $Id: XSPObjectHelper.java,v 1.1 2004/03/10 12:58:05 stephan
Exp $
+ * @version $Id$
*/
public class XSPObjectHelper {
- /**
- * Empty attributes used for contentHandler.startElement()
- */
- protected static final AttributesImpl emptyAttr = new AttributesImpl();
/**
* Output an element containing text only and no attributes
@@ -46,13 +44,12 @@
* @param name The element name
* @param data The data contained by the element
*/
- protected static void elementData(
- String uri,
- String prefix,
- ContentHandler contentHandler,
- String name,
- String data)
- throws SAXException {
+ protected static void elementData(String uri,
+ String prefix,
+ ContentHandler contentHandler,
+ String name,
+ String data)
+ throws SAXException {
start(uri, prefix, contentHandler, name);
data(contentHandler, data);
end(uri, prefix, contentHandler, name);
@@ -66,14 +63,13 @@
* @param data The data contained by the element
* @param attr The element attributes
*/
- protected static void elementData(
- String uri,
- String prefix,
- ContentHandler contentHandler,
- String name,
- String data,
- AttributesImpl attr)
- throws SAXException {
+ protected static void elementData(String uri,
+ String prefix,
+ ContentHandler contentHandler,
+ String name,
+ String data,
+ AttributesImpl attr)
+ throws SAXException {
start(uri, prefix, contentHandler, name, attr);
data(contentHandler, data);
end(uri, prefix, contentHandler, name);
@@ -86,17 +82,12 @@
* @param contentHandler The SAX content handler
* @param name The element name
*/
- protected static void start(
- String uri,
- String prefix,
- ContentHandler contentHandler,
- String name)
- throws SAXException {
- contentHandler.startElement(
- uri,
- name,
- new StringBuffer(prefix).append(":").append(name).toString(),
- emptyAttr);
+ protected static void start(String uri,
+ String prefix,
+ ContentHandler contentHandler,
+ String name)
+ throws SAXException {
+ contentHandler.startElement(uri, name, prefix + ":" + name,
XMLUtils.EMPTY_ATTRIBUTES);
}
/**
@@ -107,18 +98,13 @@
* @param name The element name
* @param attr The element attributes
*/
- protected static void start(
- String uri,
- String prefix,
- ContentHandler contentHandler,
- String name,
- AttributesImpl attr)
- throws SAXException {
- contentHandler.startElement(
- uri,
- name,
- new StringBuffer(prefix).append(":").append(name).toString(),
- attr);
+ protected static void start(String uri,
+ String prefix,
+ ContentHandler contentHandler,
+ String name,
+ AttributesImpl attr)
+ throws SAXException {
+ contentHandler.startElement(uri, name, prefix + ":" + name, attr);
}
/**
@@ -127,16 +113,12 @@
* @param contentHandler The SAX content handler
* @param name The element name
*/
- protected static void end(
- String uri,
- String prefix,
- ContentHandler contentHandler,
- String name)
- throws SAXException {
- contentHandler.endElement(
- uri,
- name,
- new StringBuffer(prefix).append(":").append(name).toString());
+ protected static void end(String uri,
+ String prefix,
+ ContentHandler contentHandler,
+ String name)
+ throws SAXException {
+ contentHandler.endElement(uri, name, prefix + ":" + name);
}
/**
@@ -146,11 +128,10 @@
* @param name The attribute name
* @param value The attribute value
*/
- protected static void addAttribute(
- AttributesImpl attr,
- String name,
- String value)
- throws SAXException {
+ protected static void addAttribute(AttributesImpl attr,
+ String name,
+ String value)
+ throws SAXException {
attr.addAttribute("", name, name, "CDATA", value);
}
@@ -161,7 +142,7 @@
* @param data The string data
*/
protected static void data(ContentHandler contentHandler, String data)
- throws SAXException {
+ throws SAXException {
contentHandler.characters(data.toCharArray(), 0, data.length());
}
@@ -175,7 +156,7 @@
* @param v the value
*/
public static void xspExpr(ContentHandler contentHandler, char v)
- throws SAXException {
+ throws SAXException {
data(contentHandler, String.valueOf(v));
}
@@ -187,7 +168,7 @@
* @param v the value
*/
public static void xspExpr(ContentHandler contentHandler, byte v)
- throws SAXException {
+ throws SAXException {
data(contentHandler, String.valueOf(v));
}
@@ -199,7 +180,7 @@
* @param v the value
*/
public static void xspExpr(ContentHandler contentHandler, boolean v)
- throws SAXException {
+ throws SAXException {
data(contentHandler, String.valueOf(v));
}
@@ -211,7 +192,7 @@
* @param v the value
*/
public static void xspExpr(ContentHandler contentHandler, int v)
- throws SAXException {
+ throws SAXException {
data(contentHandler, String.valueOf(v));
}
@@ -223,7 +204,7 @@
* @param v the value
*/
public static void xspExpr(ContentHandler contentHandler, long v)
- throws SAXException {
+ throws SAXException {
data(contentHandler, String.valueOf(v));
}
@@ -235,7 +216,7 @@
* @param v the value
*/
public static void xspExpr(ContentHandler contentHandler, float v)
- throws SAXException {
+ throws SAXException {
data(contentHandler, String.valueOf(v));
}
@@ -247,7 +228,7 @@
* @param v the value
*/
public static void xspExpr(ContentHandler contentHandler, double v)
- throws SAXException {
+ throws SAXException {
data(contentHandler, String.valueOf(v));
}
@@ -259,7 +240,7 @@
* @param text the value
*/
public static void xspExpr(ContentHandler contentHandler, String text)
- throws SAXException {
+ throws SAXException {
if (text != null) {
data(contentHandler, text);
}
@@ -289,7 +270,7 @@
* @param v the XML fragment
*/
public static void xspExpr(ContentHandler contentHandler, XMLizable v)
- throws SAXException {
+ throws SAXException {
if (v != null) {
v.toSAX(contentHandler);
}
@@ -303,7 +284,7 @@
* @param v the value
*/
public static void xspExpr(ContentHandler contentHandler, Node v)
- throws SAXException {
+ throws SAXException {
if (v != null) {
DOMStreamer streamer = new DOMStreamer(contentHandler);
streamer.stream(v);
@@ -319,7 +300,7 @@
* @param v the XML fragment
*/
public static void xspExpr(ContentHandler contentHandler, Collection v)
- throws SAXException {
+ throws SAXException {
if (v != null) {
Iterator iterator = v.iterator();
while (iterator.hasNext()) {
@@ -340,7 +321,7 @@
* @param v the value
*/
public static void xspExpr(ContentHandler contentHandler, Object v)
- throws SAXException {
+ throws SAXException {
if (v == null) {
return;
}
