1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Tue Jul 15 09:50:36 2008 -0700
1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Tue Jul 15 19:22:51 2008 -0700
1.3 @@ -45,7 +45,7 @@
1.4 /**
1.5 * The map of XML elements that have been parsed.
1.6 */
1.7 - private Map xmlElementsMap;
1.8 + private Map<String,List<Object>> xmlElementsMap;
1.9
1.10 private Configuration configuration;
1.11 private static LayoutParser instance;
1.12 @@ -56,7 +56,7 @@
1.13 * This class is a singleton.
1.14 */
1.15 private LayoutParser(Configuration configuration) {
1.16 - xmlElementsMap = new HashMap();
1.17 + xmlElementsMap = new HashMap<String,List<Object>>();
1.18 this.configuration = configuration;
1.19 }
1.20
1.21 @@ -83,7 +83,7 @@
1.22 return (List) xmlElementsMap.get(root);
1.23 }
1.24 try {
1.25 - List xmlElements = new ArrayList();
1.26 + List<Object> xmlElements = new ArrayList<Object>();
1.27 xmlElementsMap.put(root, xmlElements);
1.28 currentRoot = root;
1.29 isParsing = false;
1.30 @@ -106,7 +106,7 @@
1.31 throws SAXException {
1.32 if (isParsing || qName.equals(currentRoot)) {
1.33 isParsing = true;
1.34 - List xmlElements = (List) xmlElementsMap.get(currentRoot);
1.35 + List<Object> xmlElements = xmlElementsMap.get(currentRoot);
1.36 xmlElements.add(qName);
1.37 }
1.38 }
1.39 @@ -120,11 +120,11 @@
1.40 isParsing = false;
1.41 return;
1.42 }
1.43 - List xmlElements = (List) xmlElementsMap.get(currentRoot);
1.44 + List<Object> xmlElements = xmlElementsMap.get(currentRoot);
1.45 if (xmlElements.get(xmlElements.size()-1).equals(qName)) {
1.46 return;
1.47 } else {
1.48 - List subElements = new ArrayList();
1.49 + List<Object> subElements = new ArrayList<Object>();
1.50 int targetIndex = xmlElements.indexOf(qName);
1.51 int size = xmlElements.size();
1.52 for (int i = targetIndex; i < size; i++) {
