Mercurial > hg > release > icedtea7-forest-2.0 > jdk
changeset 4517:ca29e4ee1af5
Revert diamond usage where needed to build with IcedTea6.
line wrap: on
line diff
--- a/make/com/sun/jndi/cosnaming/Makefile Mon Jul 25 16:20:39 2011 -0700 +++ b/make/com/sun/jndi/cosnaming/Makefile Thu Jul 28 14:50:31 2011 +0100 @@ -32,6 +32,9 @@ PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk +LANGUAGE_VERSION = -source 6 +CLASS_VERSION = -target 6 + # # Resources #
--- a/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java Thu Jul 28 14:50:31 2011 +0100 @@ -171,7 +171,7 @@ * A hashmap contains a mapping from the prefix string to * a hashset which contains a set of the second level of prefix string. */ - private HashMap<String, HashSet<String>> knownPrefixMap = new HashMap<>(); + private HashMap<String, HashSet<String>> knownPrefixMap = new HashMap<String, HashSet<String>>(); /* * We add maximum 5 second level entries to "sun", "java" and @@ -194,7 +194,7 @@ if (indexSet == null) { synchronized(this) { if (indexSet == null) { - indexSet = new HashSet<>(); + indexSet = new HashSet<String>(); Enumeration<JarEntry> entries = jar.entries(); boolean containsOnlyClass = true; boolean containsOnlyResource = true;
--- a/make/tools/src/build/tools/compileproperties/CompileProperties.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/compileproperties/CompileProperties.java Thu Jul 28 14:50:31 2011 +0100 @@ -222,7 +222,7 @@ if ( ok ) { String packageName = inferPackageName(propertiesPath, outputPath); System.out.println("inferred package name: " + packageName); - List<String> sortedKeys = new ArrayList<>(); + List<String> sortedKeys = new ArrayList<String>(); for ( Object key : p.keySet() ) { sortedKeys.add((String)key); }
--- a/make/tools/src/build/tools/dirdiff/DirDiff.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/dirdiff/DirDiff.java Thu Jul 28 14:50:31 2011 +0100 @@ -164,7 +164,7 @@ } File[] currentGoldenDirs = null; - TreeSet<String> goldDirSet = new TreeSet<>(); + TreeSet<String> goldDirSet = new TreeSet<String>(); if (goldenDir != null) { currentGoldenDirs = goldenDir.listFiles(); for (int i=0; i<currentGoldenDirs.length; i++) {
--- a/make/tools/src/build/tools/dtdbuilder/DTDBuilder.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/dtdbuilder/DTDBuilder.java Thu Jul 28 14:50:31 2011 +0100 @@ -63,9 +63,9 @@ static PublicMapping mapping = null; // Hash from name to Integer - private Hashtable<String, Integer> namesHash = new Hashtable<>(); + private Hashtable<String, Integer> namesHash = new Hashtable<String, Integer>(); // Vector of all names - private Vector<String> namesVector = new Vector<>(); + private Vector<String> namesVector = new Vector<String>(); /** * Create a new DTD.
--- a/make/tools/src/build/tools/dtdbuilder/DTDInputStream.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/dtdbuilder/DTDInputStream.java Thu Jul 28 14:50:31 2011 +0100 @@ -48,7 +48,7 @@ public final class DTDInputStream extends FilterReader implements DTDConstants { public DTD dtd; - public Stack<Object> stack = new Stack<>(); + public Stack<Object> stack = new Stack<Object>(); public char str[] = new char[64]; public int replace = 0; public int ln = 1;
--- a/make/tools/src/build/tools/dtdbuilder/DTDParser.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/dtdbuilder/DTDParser.java Thu Jul 28 14:50:31 2011 +0100 @@ -276,7 +276,7 @@ * Parse a list of identifiers. */ Vector<String> parseIdentifierList(boolean lower) throws IOException { - Vector<String> elems = new Vector<>(); + Vector<String> elems = new Vector<String>(); skipSpace(); switch (ch) { case '(':
--- a/make/tools/src/build/tools/dtdbuilder/PublicMapping.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/dtdbuilder/PublicMapping.java Thu Jul 28 14:50:31 2011 +0100 @@ -44,7 +44,7 @@ final class PublicMapping { String baseStr; - Hashtable<String, String> tab = new Hashtable<>(); + Hashtable<String, String> tab = new Hashtable<String, String>(); /** * Create a mapping.
--- a/make/tools/src/build/tools/generatebreakiteratordata/CharSet.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/generatebreakiteratordata/CharSet.java Thu Jul 28 14:50:31 2011 +0100 @@ -87,7 +87,7 @@ if (result == null) { result = doParseString(s); if (expressionCache == null) { - expressionCache = new Hashtable<>(); + expressionCache = new Hashtable<String, CharSet>(); } expressionCache.put(s, result); }
--- a/make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java Thu Jul 28 14:50:31 2011 +0100 @@ -240,8 +240,8 @@ // set up a vector to contain the broken-up description (each entry in the // vector is a separate rule) and a stack for keeping track of opening // punctuation - Vector<String> tempRuleList = new Vector<>(); - Stack<Character> parenStack = new Stack<>(); + Vector<String> tempRuleList = new Vector<String>(); + Stack<Character> parenStack = new Stack<Character>(); int p = 0; int ruleStart = 0; @@ -561,7 +561,7 @@ // build hash table of every literal character or [] expression in the rule list // and use CharSet.parseString() to derive a CharSet object representing the // characters each refers to - expressions = new Hashtable<>(); + expressions = new Hashtable<String,Object>(); while (lineNum < tempRuleList.size()) { String line = tempRuleList.elementAt(lineNum); p = 0; @@ -619,7 +619,7 @@ CharSet.releaseExpressionCache(); // create the temporary category table (which is a vector of CharSet objects) - categories = new Vector<>(); + categories = new Vector<CharSet>(); if (ignoreChars != null) { categories.addElement(ignoreChars); } @@ -797,7 +797,7 @@ // state 0 is a dummy state that allows state 1 to be the starting state // and 0 to represent "stop". State 1 is added here to seed things // before we start parsing - tempStateTable = new Vector<>(); + tempStateTable = new Vector<short[]>(); tempStateTable.addElement(new short[numCategories + 1]); tempStateTable.addElement(new short[numCategories + 1]); @@ -891,10 +891,10 @@ int lastState = currentState; String pendingChars = ""; - decisionPointStack = new Stack<>(); - decisionPointList = new Vector<>(); - loopingStates = new Vector<>(); - statesToBackfill = new Vector<>(); + decisionPointStack = new Stack<Vector<Integer>>(); + decisionPointList = new Vector<Integer>(); + loopingStates = new Vector<Integer>(); + statesToBackfill = new Vector<Integer>(); short[] state; boolean sawEarlyBreak = false; @@ -1057,7 +1057,7 @@ // on the character categories that caused us to enter this state if (c == '*') { for (int i = lastState + 1; i < tempStateTable.size(); i++) { - Vector<Integer> temp = new Vector<>(); + Vector<Integer> temp = new Vector<Integer>(); temp.addElement(new Integer(i)); updateStateTable(temp, pendingChars, (short)(lastState + 1)); } @@ -1385,7 +1385,7 @@ // add this pair of row numbers to the merge list (create it first // if we haven't created the merge list yet) if (mergeList == null) { - mergeList = new Vector<>(); + mergeList = new Vector<int[]>(); } mergeList.addElement(new int[] { oldRowNum, newRowNum, combinedRowNum }); @@ -1607,7 +1607,7 @@ backfillLoopingStates(); int[] rowNumMap = new int[tempStateTable.size()]; - Stack<Integer> rowsToFollow = new Stack<>(); + Stack<Integer> rowsToFollow = new Stack<Integer>(); rowsToFollow.push(new Integer(1)); rowNumMap[1] = 1; @@ -1787,7 +1787,7 @@ // create the temporary state table and seed it with two rows (row 0 // isn't used for anything, and we have to create row 1 (the initial // state) before we can do anything else - tempStateTable = new Vector<>(); + tempStateTable = new Vector<short[]>(); tempStateTable.addElement(new short[numCategories + 1]); tempStateTable.addElement(new short[numCategories + 1]);
--- a/make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java Thu Jul 28 14:50:31 2011 +0100 @@ -55,7 +55,7 @@ */ public static SpecialCaseMap[] readSpecFile(File file, int plane) throws FileNotFoundException { - ArrayList<SpecialCaseMap> caseMaps = new ArrayList<>(150); + ArrayList<SpecialCaseMap> caseMaps = new ArrayList<SpecialCaseMap>(150); int count = 0; BufferedReader f = new BufferedReader(new FileReader(file)); String line = null;
--- a/make/tools/src/build/tools/generatecharacter/UnicodeSpec.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/generatecharacter/UnicodeSpec.java Thu Jul 28 14:50:31 2011 +0100 @@ -391,7 +391,7 @@ */ public static UnicodeSpec[] readSpecFile(File file, int plane) throws FileNotFoundException { - ArrayList<UnicodeSpec> list = new ArrayList<>(3000); + ArrayList<UnicodeSpec> list = new ArrayList<UnicodeSpec>(3000); UnicodeSpec[] result = null; int count = 0; BufferedReader f = new BufferedReader(new FileReader(file));
--- a/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java Thu Jul 28 14:50:31 2011 +0100 @@ -250,7 +250,7 @@ return Integer.parseInt(numericCode); } - static HashMap<String, Integer> specialCaseMap = new HashMap<>(); + static HashMap<String, Integer> specialCaseMap = new HashMap<String, Integer>(); private static int makeSpecialCaseEntry(String currencyInfo) throws Exception { Integer oldEntry = specialCaseMap.get(currencyInfo);
--- a/make/tools/src/build/tools/hasher/Hasher.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/hasher/Hasher.java Thu Jul 28 14:50:31 2011 +0100 @@ -51,8 +51,8 @@ boolean verbose = false; - List<String> keys = new ArrayList<>(); // Key strings - List<String> values = new ArrayList<>(); // Value expressions + List<String> keys = new ArrayList<String>(); // Key strings + List<String> values = new ArrayList<String>(); // Value expressions String pkg = null; // Package prefix for generated class String cln = null; // Name of generated class String vtype = "String"; // Value type
--- a/make/tools/src/build/tools/javazic/Simple.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/javazic/Simple.java Thu Jul 28 14:50:31 2011 +0100 @@ -48,19 +48,19 @@ /** * Zone records which are applied for given year. */ - private static Map<String,ZoneRec> lastZoneRecs = new HashMap<>(); + private static Map<String,ZoneRec> lastZoneRecs = new HashMap<String,ZoneRec>(); /** * Rule records which are applied for given year. */ - private static Map<String,List<RuleRec>> lastRules = new TreeMap<>(); + private static Map<String,List<RuleRec>> lastRules = new TreeMap<String,List<RuleRec>>(); /** * zone IDs sorted by their GMT offsets. If zone's GMT * offset will change in the future, its last known offset is * used. */ - private SortedMap<Integer, Set<String>> zonesByOffset = new TreeMap<>(); + private SortedMap<Integer, Set<String>> zonesByOffset = new TreeMap<Integer, Set<String>>(); /** * Sets last Rule records and Zone records for given timezone to @@ -80,7 +80,7 @@ int lastKnownOffset = tz.getRawOffset(); Set<String> set = zonesByOffset.get(lastKnownOffset); if (set == null) { - set = new TreeSet<>(); + set = new TreeSet<String>(); zonesByOffset.put(lastKnownOffset, set); } set.add(zonename);
--- a/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java Thu Jul 28 14:50:31 2011 +0100 @@ -33,10 +33,10 @@ /** * The mapping between a constant and its value. */ - protected static final Map<String, String> constantMap = new HashMap<>(); + protected static final Map<String, String> constantMap = new HashMap<String, String>(); void prune() { - List<Node> addons = new ArrayList<>(); + List<Node> addons = new ArrayList<Node>(); if (!addons.isEmpty()) { components.addAll(addons);
--- a/make/tools/src/build/tools/jdwpgen/Node.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/jdwpgen/Node.java Thu Jul 28 14:50:31 2011 +0100 @@ -34,7 +34,7 @@ String kind; List<Node> components; int lineno; - List<String> commentList = new ArrayList<>(); + List<String> commentList = new ArrayList<String>(); Node parent = null; Context context = null;
--- a/make/tools/src/build/tools/makeclasslist/MakeClasslist.java Mon Jul 25 16:20:39 2011 -0700 +++ b/make/tools/src/build/tools/makeclasslist/MakeClasslist.java Thu Jul 28 14:50:31 2011 +0100 @@ -38,7 +38,7 @@ public class MakeClasslist { public static void main(String[] args) throws IOException { - List<String> classes = new ArrayList<>(); + List<String> classes = new ArrayList<String>(); String origJavaHome = System.getProperty("java.home"); String javaHome = origJavaHome.toLowerCase(); if (javaHome.endsWith("jre")) { @@ -84,7 +84,7 @@ } } - Set<String> seenClasses = new HashSet<>(); + Set<String> seenClasses = new HashSet<String>(); for (String str : seenClasses) { if (seenClasses.add(str)) {
--- a/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java Mon Jul 25 16:20:39 2011 -0700 +++ b/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java Thu Jul 28 14:50:31 2011 +0100 @@ -135,7 +135,7 @@ throw new ConfigurationException("DNS pseudo-URL required"); } - List<String> servers = new ArrayList<>(); + List<String> servers = new ArrayList<String>(); for (int i = 0; i < urls.length; i++) { String server = urls[i].getHost();