You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/12/07 00:58:02 UTC
svn commit: r1211238 - in /cxf/branches/2.4.x-fixes: ./
common/common/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
Author: dkulp
Date: Tue Dec 6 23:58:02 2011
New Revision: 1211238
URL: http://svn.apache.org/viewvc?rev=1211238&view=rev
Log:
Merged revisions 1211228 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1211228 | dkulp | 2011-12-06 18:41:51 -0500 (Tue, 06 Dec 2011) | 1 line
Fix compile failure on Java5
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
Propchange: cxf/branches/2.4.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java?rev=1211238&r1=1211237&r2=1211238&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java (original)
+++ cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java Tue Dec 6 23:58:02 2011
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.staxutils.transform;
-import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
@@ -39,7 +38,7 @@ public class OutTransformWriter extends
private QNamesMap elementsMap;
private Map<QName, QName> appendMap = new HashMap<QName, QName>(5);
private Map<String, String> nsMap = new HashMap<String, String>(5);
- private Deque<Set<String>> writtenUris = new LinkedList<Set<String>>();
+ private List<Set<String>> writtenUris = new LinkedList<Set<String>>();
private Set<QName> dropElements;
private List<Integer> droppingIndexes = new LinkedList<Integer>();
@@ -78,7 +77,7 @@ public class OutTransformWriter extends
uri = value != null ? value : uri;
- if (writtenUris.getFirst().contains(uri)) {
+ if (writtenUris.get(0).contains(uri)) {
return;
}
@@ -90,7 +89,7 @@ public class OutTransformWriter extends
}
super.writeNamespace(prefix, uri);
}
- writtenUris.getFirst().add(uri);
+ writtenUris.get(0).add(uri);
}
@Override
@@ -100,9 +99,9 @@ public class OutTransformWriter extends
if (writtenUris.isEmpty()) {
s = new HashSet<String>();
} else {
- s = new HashSet<String>(writtenUris.getFirst());
+ s = new HashSet<String>(writtenUris.get(0));
}
- writtenUris.addFirst(s);
+ writtenUris.add(0, s);
QName currentQName = new QName(uri, local);
QName appendQName = appendMap.get(currentQName);
@@ -127,7 +126,7 @@ public class OutTransformWriter extends
@Override
public void writeEndElement() throws XMLStreamException {
if (!writtenUris.isEmpty()) {
- writtenUris.removeFirst();
+ writtenUris.remove(0);
}
--currentDepth;
if (indexRemoved(droppingIndexes)) {