You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/03/30 10:22:45 UTC
svn commit: r523986 - in
/incubator/servicemix/trunk/core/servicemix-core/src:
main/java/org/apache/servicemix/jbi/jaxp/
test/java/org/apache/servicemix/jbi/jaxp/
Author: gnodet
Date: Fri Mar 30 01:22:44 2007
New Revision: 523986
URL: http://svn.apache.org/viewvc?view=rev&rev=523986
Log:
SM-912: DOMStreamReader does not need to report namespaces as events
Modified:
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java
incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java?view=diff&rev=523986&r1=523985&r2=523986
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java Fri Mar 30 01:22:44 2007
@@ -41,7 +41,7 @@
public abstract class DOMStreamReader implements XMLStreamReader {
public Map properties = new HashMap();
- private FastStack frames = new FastStack();
+ private FastStack<ElementFrame> frames = new FastStack<ElementFrame>();
private ElementFrame frame;
@@ -66,18 +66,14 @@
int currentAttribute = -1;
- int currentNamespace = -1;
-
int currentElement = -1;
- List uris;
+ List<String> uris;
- List prefixes;
+ List<String> prefixes;
List attributes;
- List allAttributes;
-
final ElementFrame parent;
}
@@ -108,7 +104,7 @@
if (frame.ended) {
frames.pop();
if (!frames.empty()) {
- frame = (ElementFrame) frames.peek();
+ frame = frames.peek();
} else {
currentEvent = END_DOCUMENT;
return currentEvent;
@@ -121,9 +117,6 @@
} else if (frame.currentAttribute < getAttributeCount() - 1) {
frame.currentAttribute++;
currentEvent = ATTRIBUTE;
- } else if (frame.currentNamespace < getNamespaceCount() - 1) {
- frame.currentNamespace++;
- currentEvent = NAMESPACE;
} else if (frame.currentChild < getChildCount() - 1) {
frame.currentChild++;
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java?view=diff&rev=523986&r1=523985&r2=523986
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java Fri Mar 30 01:22:44 2007
@@ -67,9 +67,9 @@
*/
protected void newFrame(ElementFrame frame) {
Element element = getCurrentElement();
- frame.uris = new ArrayList();
- frame.prefixes = new ArrayList();
- frame.attributes = new ArrayList();
+ frame.uris = new ArrayList<String>();
+ frame.prefixes = new ArrayList<String>();
+ frame.attributes = new ArrayList<Attr>();
if (context == null)
context = new W3CNamespaceContext();
@@ -78,7 +78,6 @@
NamedNodeMap nodes = element.getAttributes();
- String nsURI = element.getNamespaceURI();
String ePrefix = element.getPrefix();
if (ePrefix == null) {
ePrefix = "";
@@ -90,7 +89,6 @@
String localName = node.getLocalName();
String value = node.getNodeValue();
String name = node.getNodeName();
- String uri = node.getNamespaceURI();
if (prefix == null)
prefix = "";
@@ -159,7 +157,7 @@
while (null != frame) {
int index = frame.prefixes.indexOf(prefix);
if (index != -1) {
- return (String) frame.uris.get(index);
+ return frame.uris.get(index);
}
frame = frame.parent;
@@ -242,11 +240,11 @@
}
public String getNamespacePrefix(int i) {
- return (String) getCurrentFrame().prefixes.get(i);
+ return getCurrentFrame().prefixes.get(i);
}
public String getNamespaceURI(int i) {
- return (String) getCurrentFrame().uris.get(i);
+ return getCurrentFrame().uris.get(i);
}
public NamespaceContext getNamespaceContext() {
Modified: incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java?view=diff&rev=523986&r1=523985&r2=523986
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java Fri Mar 30 01:22:44 2007
@@ -35,9 +35,6 @@
assertTrue(reader.hasNext());
assertEquals("root", reader.getLocalName());
assertEquals(1, reader.getNamespaceCount());
- assertEquals(XMLStreamReader.NAMESPACE, reader.next());
-
- assertEquals(1, reader.getNamespaceCount());
assertEquals("", reader.getNamespacePrefix(0));
assertEquals("urn:test", reader.getNamespaceURI(0));
@@ -49,8 +46,6 @@
{
assertTrue(reader.hasNext());
assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertTrue(reader.hasNext());
- assertEquals(XMLStreamReader.NAMESPACE, reader.next());
assertEquals(1, reader.getNamespaceCount());
assertEquals("", reader.getNamespacePrefix(0));
@@ -69,8 +64,6 @@
{
assertTrue(reader.hasNext());
assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertTrue(reader.hasNext());
- assertEquals(XMLStreamReader.NAMESPACE, reader.next());
assertEquals("root", reader.getLocalName());
assertEquals(1, reader.getNamespaceCount());
@@ -133,9 +126,6 @@
assertTrue(reader.hasNext());
assertEquals(XMLStreamReader.ATTRIBUTE, reader.next());
- assertTrue(reader.hasNext());
- assertEquals(XMLStreamReader.NAMESPACE, reader.next());
-
assertEquals(2, reader.getNamespaceCount());
assertEquals("", reader.getNamespacePrefix(0));
assertEquals("urn:test", reader.getNamespaceURI(0));
@@ -143,9 +133,6 @@
assertEquals("urn:test2", reader.getNamespaceURI(1));
assertTrue(reader.hasNext());
- assertEquals(XMLStreamReader.NAMESPACE, reader.next());
-
- assertTrue(reader.hasNext());
assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
}
@@ -159,17 +146,11 @@
assertEquals("", reader.getPrefix());
assertTrue(reader.hasNext());
- assertEquals(XMLStreamReader.NAMESPACE, reader.next());
-
- assertTrue(reader.hasNext());
assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
assertEquals("child", reader.getLocalName());
assertEquals("urn:test2", reader.getNamespaceURI());
assertEquals("a", reader.getPrefix());
-
- assertTrue(reader.hasNext());
- assertEquals(XMLStreamReader.NAMESPACE, reader.next());
assertTrue(reader.hasNext());
assertEquals(XMLStreamReader.END_ELEMENT, reader.next());