jdk-sandbox: comparison jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java

equal deleted inserted replaced

-:6e9ebed2e783
+:cf59e2badd14
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 * @author Raul Benito
 * @version $Revision: 1.2 $
 */
 public abstract class Canonicalizer11 extends CanonicalizerBase {
 boolean firstCall = true;
-final SortedSet result = new TreeSet(COMPARE);
+final SortedSet<Attr> result = new TreeSet<Attr>(COMPARE);
 static final String XMLNS_URI = Constants.NamespaceSpecNS;
 static final String XML_LANG_URI = Constants.XML_LANG_SPACE_SpecNS;
 static Logger log = Logger.getLogger(Canonicalizer11.class.getName());
 int lastlevel = 0;
 XmlsStackElement cur;
 static class XmlsStackElement {
 int level;
 boolean rendered = false;
-List nodes = new ArrayList();
+List<Attr> nodes = new ArrayList<Attr>();
 };
-List levels = new ArrayList();
+List<XmlsStackElement> levels = new ArrayList<XmlsStackElement>();
 void push(int level) {
 currentLevel = level;
 if (currentLevel == -1)
 return;
 cur = null;
 levels.remove(levels.size() - 1);
 if (levels.size() == 0) {
 lastlevel = 0;
 return;
 }
-lastlevel=((XmlsStackElement)levels.get(levels.size()-1)).level;
+lastlevel=(levels.get(levels.size()-1)).level;
 }
 }
 void addXmlnsAttr(Attr n) {
 if (cur == null) {
 cur = new XmlsStackElement();
 levels.add(cur);
 lastlevel = currentLevel;
 }
 cur.nodes.add(n);
 }
-void getXmlnsAttr(Collection col) {
+void getXmlnsAttr(Collection<Attr> col) {
 if (cur == null) {
 cur = new XmlsStackElement();
 cur.level = currentLevel;
 lastlevel = currentLevel;
 levels.add(cur);
 boolean parentRendered = false;
 XmlsStackElement e = null;
 if (size == -1) {
 parentRendered = true;
 } else {
-e = (XmlsStackElement) levels.get(size);
+e = levels.get(size);
 if (e.rendered && e.level+1 == currentLevel)
 parentRendered = true;
 }
 if (parentRendered) {
 col.addAll(cur.nodes);
 cur.rendered = true;
 return;
 }
-Map loa = new HashMap();
+Map<String, Attr> loa = new HashMap<String, Attr>();
-List baseAttrs = new ArrayList();
+List<Attr> baseAttrs = new ArrayList<Attr>();
 boolean successiveOmitted = true;
 for (;size>=0;size--) {
-e = (XmlsStackElement) levels.get(size);
+e = levels.get(size);
 if (e.rendered) {
 successiveOmitted = false;
 }
-Iterator it = e.nodes.iterator();
+Iterator<Attr> it = e.nodes.iterator();
 while (it.hasNext() && successiveOmitted) {
-Attr n = (Attr) it.next();
+Attr n = it.next();
 if (n.getLocalName().equals("base")) {
 if (!e.rendered) {
 baseAttrs.add(n);
 }
 } else if (!loa.containsKey(n.getName()))
 loa.put(n.getName(), n);
 }
 }
 if (!baseAttrs.isEmpty()) {
-Iterator it = cur.nodes.iterator();
+Iterator<Attr> it = cur.nodes.iterator();
 String base = null;
 Attr baseAttr = null;
 while (it.hasNext()) {
-Attr n = (Attr) it.next();
+Attr n = it.next();
 if (n.getLocalName().equals("base")) {
 base = n.getValue();
 baseAttr = n;
 break;
 }
 }
 it = baseAttrs.iterator();
 while (it.hasNext()) {
-Attr n = (Attr) it.next();
+Attr n = it.next();
 if (base == null) {
 base = n.getValue();
 baseAttr = n;
 } else {
 try {
 * @param E
 * @param ns
 * @return the Attr[]s to be outputted
 * @throws CanonicalizationException
 */
-Iterator handleAttributesSubtree(Element E, NameSpaceSymbTable ns)
+Iterator<Attr> handleAttributesSubtree(Element E, NameSpaceSymbTable ns)
 throws CanonicalizationException {
 if (!E.hasAttributes() && !firstCall) {
 return null;
 }
 // result will contain the attrs which have to be outputted
-final SortedSet result = this.result;
+final SortedSet<Attr> result = this.result;
 result.clear();
 NamedNodeMap attrs = E.getAttributes();
 int attrsLength = attrs.getLength();
 for (int i = 0; i < attrsLength; i++) {
 Node n = ns.addMappingAndRender(NName, NValue, N);
 if (n != null) {
 // Render the ns definition
-result.add(n);
+result.add((Attr)n);
 if (C14nHelper.namespaceIsRelative(N)) {
 Object exArgs[] = {E.getTagName(), NName, N.getNodeValue()};
 throw new CanonicalizationException(
 "c14n.Canonicalizer.RelativeNamespace", exArgs);
 }
 // It is the first node of the subtree
 // Obtain all the namespaces defined in the parents, and added
 // to the output.
 ns.getUnrenderedNodes(result);
 // output the attributes in the xml namespace.
-xmlattrStack.getXmlnsAttr(result);
+xmlattrStack.getXmlnsAttr(getSortedSetAsCollection(result));
 firstCall = false;
 }
 return result.iterator();
 }
 /**
 * Returns the Attr[]s to be outputted for the given element.
 * <br>
 * IMPORTANT: This method expects to work on a modified DOM tree, i.e. a
 * @param E
 * @param ns
 * @return the Attr[]s to be outputted
 * @throws CanonicalizationException
 */
-Iterator handleAttributes(Element E, NameSpaceSymbTable ns)
+Iterator<Attr> handleAttributes(Element E, NameSpaceSymbTable ns)
 throws CanonicalizationException {
 // result will contain the attrs which have to be output
 xmlattrStack.push(ns.getLevel());
 boolean isRealVisible = isVisibleDO(E, ns.getLevel()) == 1;
 NamedNodeMap attrs = null;
 if (E.hasAttributes()) {
 attrs = E.getAttributes();
 attrsLength = attrs.getLength();
 }
-SortedSet result = this.result;
+SortedSet<Attr> result = this.result;
 result.clear();
 for (int i = 0; i < attrsLength; i++) {
-Attr N = (Attr) attrs.item(i);
+Attr N = (Attr)attrs.item(i);
 String NUri = N.getNamespaceURI();
 if (XMLNS_URI != NUri) {
 // A non namespace definition node.
 if (XML_LANG_URI == NUri) {
 // The xpath select this node output it if needed.
 // Node n = ns.addMappingAndRenderXNodeSet
 //      (NName, NValue, N, isRealVisible);
 Node n = ns.addMappingAndRender(NName, NValue, N);
 if (n != null) {
-result.add(n);
+result.add((Attr)n);
 if (C14nHelper.namespaceIsRelative(N)) {
 Object exArgs[] =
 { E.getTagName(), NName, N.getNodeValue() };
 throw new CanonicalizationException(
 "c14n.Canonicalizer.RelativeNamespace", exArgs);
 // then xmlns=""
 n = ns.addMappingAndRender(XMLNS, "", nullNode);
 }
 // output the xmlns def if needed.
 if (n != null) {
-result.add(n);
+result.add((Attr)n);
 }
 // Float all xml:* attributes of the unselected parent elements to
 // this one. addXmlAttributes(E,result);
 xmlattrStack.getXmlnsAttr(result);
 ns.getUnrenderedNodes(result);
 * @param xpathNodeSet
 * @param inclusiveNamespaces
 * @return none it always fails
 * @throws CanonicalizationException always
 */
-public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet,
+public byte[] engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet,
 String inclusiveNamespaces) throws CanonicalizationException {
 throw new CanonicalizationException(
 "c14n.Canonicalizer.UnsupportedOperation");
 }

changeset 10694	cf59e2badd14
parent 1337	e8d6cef36199
child 18780	f47b920867e7