Author: remy.maucherat(a)jboss.com Date: 2010-04-23 12:02:40 -0400 (Fri, 23 Apr 2010) New Revision: 1448 Modified: trunk/java/org/apache/catalina/connector/Request.java trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java trunk/java/org/apache/catalina/core/StandardContext.java Log: - Port beautified methods. Modified: trunk/java/org/apache/catalina/connector/Request.java =================================================================== --- trunk/java/org/apache/catalina/connector/Request.java 2010-04-23 15:43:42 UTC (rev 1447) +++ trunk/java/org/apache/catalina/connector/Request.java 2010-04-23 16:02:40 UTC (rev 1448) @@ -2963,7 +2963,7 @@ // a local collection, sorted by the quality value (so we can // add Locales in descending order). The values will be ArrayLists // containing the corresponding Locales to be added - TreeMap locales = new TreeMap(); + TreeMap<Double, ArrayList<Locale>> locales = new TreeMap<Double, ArrayList<Locale>>(); // Preprocess the value to remove all whitespace int white = value.indexOf(' '); @@ -3039,9 +3039,9 @@ // Add a new Locale to the list of Locales for this quality level Locale locale = new Locale(language, country, variant); Double key = new Double(-quality); // Reverse the order - ArrayList values = (ArrayList) locales.get(key); + ArrayList<Locale> values = locales.get(key); if (values == null) { - values = new ArrayList(); + values = new ArrayList<Locale>(); locales.put(key, values); } values.add(locale); @@ -3050,13 +3050,8 @@ // Process the quality values in highest->lowest order (due to // negating the Double value when creating the key) - Iterator keys = locales.keySet().iterator(); - while (keys.hasNext()) { - Double key = (Double) keys.next(); - ArrayList list = (ArrayList) locales.get(key); - Iterator values = list.iterator(); - while (values.hasNext()) { - Locale locale = (Locale) values.next(); + for (ArrayList<Locale> list : locales.values()) { + for (Locale locale : list) { addLocale(locale); } } Modified: trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java =================================================================== --- trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 2010-04-23 15:43:42 UTC (rev 1447) +++ trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 2010-04-23 16:02:40 UTC (rev 1448) @@ -638,16 +638,16 @@ * * @param orig Origin Map to be copied */ - Map copyMap(Map orig) { + Map<String, String[]> copyMap(Map<String, String[]> orig) { if (orig == null) - return (new HashMap()); - HashMap dest = new HashMap(); - Iterator keys = orig.keySet().iterator(); - while (keys.hasNext()) { - String key = (String) keys.next(); - dest.put(key, orig.get(key)); + return (new HashMap<String, String[]>()); + HashMap<String, String[]> dest = new HashMap<String, String[]>(); + + for (Map.Entry<String, String[]> entry : orig.entrySet()) { + dest.put(entry.getKey(), entry.getValue()); } + return (dest); } Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2010-04-23 15:43:42 UTC (rev 1447) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2010-04-23 16:02:40 UTC (rev 1448) @@ -3618,29 +3618,25 @@ public void loadOnStartup(Container children[]) { // Collect "load on startup" servlets that need to be initialized - TreeMap map = new TreeMap(); + TreeMap<Integer, ArrayList<Wrapper>> map = + new TreeMap<Integer, ArrayList<Wrapper>>(); for (int i = 0; i < children.length; i++) { Wrapper wrapper = (Wrapper) children[i]; int loadOnStartup = wrapper.getLoadOnStartup(); if (loadOnStartup < 0) continue; Integer key = Integer.valueOf(loadOnStartup); - ArrayList list = (ArrayList) map.get(key); + ArrayList<Wrapper> list = map.get(key); if (list == null) { - list = new ArrayList(); + list = new ArrayList<Wrapper>(); map.put(key, list); } list.add(wrapper); } // Load the collected "load on startup" servlets - Iterator keys = map.keySet().iterator(); - while (keys.hasNext()) { - Integer key = (Integer) keys.next(); - ArrayList list = (ArrayList) map.get(key); - Iterator wrappers = list.iterator(); - while (wrappers.hasNext()) { - Wrapper wrapper = (Wrapper) wrappers.next(); + for (ArrayList<Wrapper> list : map.values()) { + for (Wrapper wrapper : list) { try { wrapper.load(); } catch (ServletException e) {