Searched refs:conflict_resolution (Results 1 – 2 of 2) sorted by relevance
85 public void putAll(Map<String, String> tempMap, int conflict_resolution) { in putAll() argument88 … if (conflict_resolution == CLDRFile.MERGE_KEEP_MINE && getValueAtPath(path) != null) continue; in putAll()99 public void putAll(XMLSource otherSource, int conflict_resolution) { in putAll() argument103 if (conflict_resolution == CLDRFile.MERGE_KEEP_MINE && oldValue != null) { in putAll()
772 public CLDRFile putAll(CLDRFile other, int conflict_resolution) { in putAll() argument776 if (conflict_resolution == MERGE_KEEP_MINE) { in putAll()779 } else if (conflict_resolution == MERGE_REPLACE_MINE) { in putAll()781 } else if (conflict_resolution == MERGE_REPLACE_MY_DRAFT) { in putAll()821 } else if (conflict_resolution == MERGE_ADD_ALTERNATE) { in putAll()842 throw new IllegalArgumentException("Illegal operand: " + conflict_resolution); in putAll()