< prev index next >

## src/com/sun/javatest/cof/COFEnvironment.java

Print this page

    @@ -45,24 +45,24 @@

             static String[] propTags = { "machine", "os", "jdk", "system-locale",
                             "user-locale", "encoding", "timezone", "bits", "displaydepth",
                             "description", "sw" };

    -        static LinkedHashMap xmlAttributes;
    +        static LinkedHashMap<String, String> xmlAttributes;

    -        static LinkedHashMap xmlElements;
    +        static LinkedHashMap<String, String> xmlElements;

             static String xmlTagName;
             private static I18NResourceBundle i18n = I18NResourceBundle
             .getBundleForClass(Main.class);

             static {
    -                xmlElements = new LinkedHashMap();
    +                xmlElements = new LinkedHashMap<>();
                     for (int i = 0; i < propOrder.length; i++) {
                             xmlElements.put(propOrder[i], propTags[i]);
                     }
    -                xmlAttributes = new LinkedHashMap();
    +                xmlAttributes = new LinkedHashMap<>();
                     xmlAttributes.put("id", "id");
                     xmlTagName = "environment";
             }

             //    @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")

    @@ -92,11 +92,11 @@

             //    @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
             protected COFOS os;

             //    @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema", required = true)
    -        protected List/*<SWEntity>*/sw;
    +        protected List<COFSWEntity> sw;

             //    @XmlElement(name = "system-locale", namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")
             protected String systemLocale;

             //    @XmlElement(namespace = "http://qare.sfbay.sun.com/projects/COF/2003/2_0_2/Schema")

    @@ -255,15 +255,15 @@
              */
             public String getId() {
                     return id;
             }

    -        LinkedHashMap getItemAttributes() {
    +        LinkedHashMap<String, String> getItemAttributes() {
                     return xmlAttributes;
             }

    -        LinkedHashMap getItemElements() {
    +        LinkedHashMap<String, String> getItemElements() {
                     return xmlElements;
             }

             String getItemTagName() {
                     return xmlTagName;

    @@ -329,13 +329,13 @@
              * Objects of the following type(s) are allowed in the list
              * {@link SWEntity }
              *
              *
              */
    -        public List/*<SWEntity>*/getSw() {
    +        public List<COFSWEntity> getSw() {
                     if (sw == null) {
    -                        sw = new ArrayList/*<SWEntity>*/();
    +                        sw = new ArrayList<>();
                     }
                     return this.sw;
             }

             /**

< prev index next >