Projects >> mkgmap >>156febc15347cd9a0d3d6701d59172641233fa06

Chunk
Conflicting content 
 * @author Steve Ratcliffe
 */
public class Mdr7 extends MdrMapSection {
<<<<<<< HEAD
	public static final int MDR7_HAS_STRING = 0x01;
	public static final int MDR7_HAS_NAME_OFFSET = 0x20;
	//public static final int MDR7_PARTIAL_FIELD = 0x1c0;
	public static final int MDR7_PARTIAL_SHIFT = 6;
	public static final int MDR7_U1 = 0x2;
	public static final int MDR7_U2 = 0x4;
	private List allStreets = new ArrayList();
	private List streets = new ArrayList();
=======
	private List allStreets = new ArrayList<>();
	private List streets = new ArrayList<>();
>>>>>>> b92ced590e0b11389b0008aa7df95bef34e0aba1

	private final int u2size = 1;
Solution content 
	public static final int MDR7_U2 = 0x4;

 * @author Steve Ratcliffe
 */
public class Mdr7 extends MdrMapSection {
	public static final int MDR7_HAS_STRING = 0x01;
	public static final int MDR7_HAS_NAME_OFFSET = 0x20;
	//public static final int MDR7_PARTIAL_FIELD = 0x1c0;
	public static final int MDR7_PARTIAL_SHIFT = 6;
	public static final int MDR7_U1 = 0x2;
	private List allStreets = new ArrayList<>();
	private List streets = new ArrayList<>();

	private final int u2size = 1;
File
Mdr7.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
			}

			if (cache != null)
				fillCompleteKey(chars, key);
			} catch (ArrayIndexOutOfBoundsException e) {
				// Ok try again with the max possible key size allocated.
<<<<<<< HEAD
				key = new byte[bval.length * 3 * maxExpSize + 3];
				fillCompleteKey(bval, key);
=======
				key = new byte[(chars.length+1) * 4 * maxExpSize];
				fillCompleteKey(chars, key);
>>>>>>> b92ced590e0b11389b0008aa7df95bef34e0aba1
Solution content 
				fillCompleteKey(chars, key);
			} catch (ArrayIndexOutOfBoundsException e) {
				// Ok try again with the max possible key size allocated.
				key = new byte[(chars.length+1) * 4 * maxExpSize];
				fillCompleteKey(chars, key);
			}

			if (cache != null)
File
Sort.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable