Projects >> jcpi >>663bf464971fb2d6a2efc6a66d4dfc815bbfeab2

Chunk
Conflicting content 
  public final GenericBoard board;
  public final List moves;

<<<<<<< HEAD
  public EngineAnalyzeCommand(GenericBoard board, List moves) {
    if (board == null) throw new IllegalArgumentException();
    if (moves == null) throw new IllegalArgumentException();
=======
  public EngineAnalyzeCommand(GenericBoard board, List moveList) {
    if (board == null) throw new IllegalArgumentException();
    if (moveList == null) throw new IllegalArgumentException();
>>>>>>> cdee09dec0b2b2b126965116c32bf2e146b9f67d

    this.board = board;
    this.moves = moves;
Solution content 
  public final GenericBoard board;
  public final List moves;

  public EngineAnalyzeCommand(GenericBoard board, List moves) {
    if (board == null) throw new IllegalArgumentException();
    if (moves == null) throw new IllegalArgumentException();

    this.board = board;
    this.moves = moves;
File
EngineAnalyzeCommand.java
Developer's decision
Version 1
Kind of conflict
If statement
Method signature
Chunk
Conflicting content 
  public final String name;
  public final String author;
<<<<<<< HEAD
  private final List options = new ArrayList();
=======
  private final List
Solution content 
  public final String name;
  public final String author;
  private final List options = new ArrayList();

  public ProtocolInitializeAnswerCommand(String name, String author) {
    if (name == null) throw new IllegalArgumentException();
File
ProtocolInitializeAnswerCommand.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    return this.options.iterator();
  }

<<<<<<< HEAD
  public void addOption(AbstractOption option) {
=======
  public void addOption(Option option) {
>>>>>>> cdee09dec0b2b2b126965116c32bf2e146b9f67d
    if (option == null) throw new IllegalArgumentException();

    this.options.add(option);
Solution content 
    return this.options.iterator();
  }

  public void addOption(AbstractOption option) {
    if (option == null) throw new IllegalArgumentException();

    this.options.add(option);
File
ProtocolInitializeAnswerCommand.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
    return null;
  }

<<<<<<< HEAD
  public static GenericCastling valueOf(char token) {
    GenericCastling castling = _valueOf(token);
    if (castling != null) {
      return castling;
    } else {
      throw new IllegalArgumentException();
    }
  }

  public static boolean isValid(char token) {
    return _valueOf(token) != null;
  }

  private static GenericCastling _valueOfLongToken(String longToken) {
    if (longToken == null) throw new IllegalArgumentException();
=======
  public static GenericCastling valueOfLongToken(String input) {
    if (input == null) throw new IllegalArgumentException();
>>>>>>> cdee09dec0b2b2b126965116c32bf2e146b9f67d

    for (GenericCastling castling : values()) {
      if (castling.longToken.equalsIgnoreCase(longToken)) {
Solution content 
    return null;
  }

  public static GenericCastling valueOf(char token) {
    GenericCastling castling = _valueOf(token);
    if (castling != null) {
      return castling;
    } else {
      throw new IllegalArgumentException();
    }
  }

  public static boolean isValid(char token) {
    return _valueOf(token) != null;
  }

  private static GenericCastling _valueOfLongToken(String longToken) {
    if (longToken == null) throw new IllegalArgumentException();

    for (GenericCastling castling : values()) {
      if (castling.longToken.equalsIgnoreCase(longToken)) {
File
GenericCastling.java
Developer's decision
Version 1
Kind of conflict
If statement
Method declaration
Method signature
Chunk
Conflicting content 
 */
package com.fluxchess.jcpi.models;

<<<<<<< HEAD
import java.util.EnumSet;

=======
>>>>>>> cdee09dec0b2b2b126965116c32bf2e146b9f67d
public enum GenericChessman {

  PAWN('P'),
Solution content 
 */
package com.fluxchess.jcpi.models;

import java.util.EnumSet;

public enum GenericChessman {

  PAWN('P'),
File
GenericChessman.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
 */
package com.fluxchess.jcpi.models;

<<<<<<< HEAD
public final class GenericMove {
=======
public class GenericMove {
>>>>>>> cdee09dec0b2b2b126965116c32bf2e146b9f67d

  public final GenericPosition from;
  public final GenericPosition to;
Solution content 
 */
package com.fluxchess.jcpi.models;

public final class GenericMove {

  public final GenericPosition from;
  public final GenericPosition to;
File
GenericMove.java
Developer's decision
Version 1
Kind of conflict
Class signature
Chunk
Conflicting content 
    this.from = from;
    this.to = to;
  public GenericMove(GenericPosition from, GenericPosition to, GenericChessman promotion) {
    if (from == null) throw new IllegalArgumentException();
    if (to == null) throw new IllegalArgumentException();
<<<<<<< HEAD
    if (promotion != null && !promotion.isLegalPromotion()) throw new IllegalArgumentException();
=======
    if (promotion != null && !promotion.isValidPromotion()) throw new IllegalArgumentException();
>>>>>>> cdee09dec0b2b2b126965116c32bf2e146b9f67d
Solution content 
  public GenericMove(GenericPosition from, GenericPosition to, GenericChessman promotion) {
    if (from == null) throw new IllegalArgumentException();
    if (to == null) throw new IllegalArgumentException();
    if (promotion != null && !promotion.isLegalPromotion()) throw new IllegalArgumentException();

    this.from = from;
    this.to = to;
File
GenericMove.java
Developer's decision
Version 1
Kind of conflict
If statement