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

equal deleted inserted replaced

-:6e9ebed2e783
+:cf59e2badd14
 * @author Christian Geuer-Pollmann <geuerp@apache.org>
 * @version $Revision: 1.5 $
 */
 public abstract class Canonicalizer20010315 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 class XmlAttrStack {
 int currentLevel=0;
 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) {
 int size=levels.size()-1;
 if (cur==null) {
 cur=new XmlsStackElement();
 cur.level=currentLevel;
 lastlevel=currentLevel;
 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>();
 for (;size>=0;size--) {
-e=(XmlsStackElement)levels.get(size);
+e=levels.get(size);
-Iterator it=e.nodes.iterator();
+Iterator<Attr> it=e.nodes.iterator();
 while (it.hasNext()) {
-Attr n=(Attr)it.next();
+Attr n=it.next();
 if (!loa.containsKey(n.getName()))
 loa.put(n.getName(),n);
 }
 //if (e.rendered)
 //break;
 * @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);
 }
 }
 if (firstCall) {
 //It is the first node of the subtree
 //Obtain all the namespaces defined in the parents, and added to the output.
-ns.getUnrenderedNodes(result);
+ns.getUnrenderedNodes(getSortedSetAsCollection(result));
 //output the attributes in the xml namespace.
 xmlattrStack.getXmlnsAttr(result);
 firstCall=false;
 }
 * @param E
 * @param ns
 * @return the Attr[]s to be outputted
 * @throws CanonicalizationException
 */
-Iterator handleAttributes(Element E,  NameSpaceSymbTable ns ) throws CanonicalizationException {
+Iterator<Attr> handleAttributes(Element E,  NameSpaceSymbTable ns ) throws CanonicalizationException {
 // result will contain the attrs which have to be outputted
 xmlattrStack.push(ns.getLevel());
 boolean isRealVisible=isVisibleDO(E,ns.getLevel())==1;
 NamedNodeMap attrs = null;
 int attrsLength = 0;
 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);
 String NUri =N.getNamespaceURI();
 }
 //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);
+ns.getUnrenderedNodes(getSortedSetAsCollection(result));
 }
 return result.iterator();
 }
 * @param xpathNodeSet
 * @param inclusiveNamespaces
 * @return none it always fails
 * @throws CanonicalizationException always
 */
-public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet, String inclusiveNamespaces)
+public byte[] engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet, String inclusiveNamespaces)
 throws CanonicalizationException {
 /** $todo$ well, should we throw UnsupportedOperationException ? */
 throw new CanonicalizationException(
 "c14n.Canonicalizer.UnsupportedOperation");

changeset 10694	cf59e2badd14
parent 1337	e8d6cef36199
child 18780	f47b920867e7