< prev index next >

src/com/sun/javatest/mrep/Merger.java

Print this page
rev 145 : 7902237: Fixing raw use of parameterized class
Reviewed-by: jjg

*** 48,73 **** * @param conflictResolver ConflictResolver to resolve conflicts during merge */ public boolean merge(File[] in, File out, ConflictResolver conflictResolver) throws SAXException, ParserConfigurationException, IOException{ // Maps with statistics ! Map[] inputs = new Map[in.length]; // read statistics for (int i = 0; i < in.length; i++) { XMLReportReader reader = new XMLReportReader(); ! Map<Object, Object> map = reader.readIDs(in[i]); inputs[i] = map; } // shift word workgroups id renaming int allCnt = 0; // rename id's and find conflicts Set<String> all = new HashSet<>(); List<String> conflicts = new ArrayList<>(); for (int i = 0; i < in.length; i++) { int workdirsInFile = 0; ! Iterator<Object> it = inputs[i].keySet().iterator(); Map<Object, Object> newMap = new HashMap<>(); while (it.hasNext()) { Object o = it.next(); // this is workdir ID if (o instanceof Integer) { --- 48,73 ---- * @param conflictResolver ConflictResolver to resolve conflicts during merge */ public boolean merge(File[] in, File out, ConflictResolver conflictResolver) throws SAXException, ParserConfigurationException, IOException{ // Maps with statistics ! Map<?, ?>[] inputs = new Map<?, ?>[in.length]; // read statistics for (int i = 0; i < in.length; i++) { XMLReportReader reader = new XMLReportReader(); ! Map<?, ?> map = reader.readIDs(in[i]); inputs[i] = map; } // shift word workgroups id renaming int allCnt = 0; // rename id's and find conflicts Set<String> all = new HashSet<>(); List<String> conflicts = new ArrayList<>(); for (int i = 0; i < in.length; i++) { int workdirsInFile = 0; ! Iterator<?> it = inputs[i].keySet().iterator(); Map<Object, Object> newMap = new HashMap<>(); while (it.hasNext()) { Object o = it.next(); // this is workdir ID if (o instanceof Integer) {
< prev index next >