Projects >> TDA367 >>0bb1a6abc21f41c57cce27259ad40daf3b50b7b9

Chunk
Conflicting content 
import java.util.Random;

public class Board{
<<<<<<< HEAD
//	private Piece pieceOne;
//	private Piece pieceTwo;
	private Piece[] pieces;
=======
	
	
	private Piece pieceOne;
	private Piece pieceTwo;
>>>>>>> 3ad3f1d38694e7bf4c976d1b5657aae70d07f3f0
	private Piece activePiece;
	private Mission mission;
Solution content 
import java.util.Random;

public class Board{
	private Piece[] pieces;
	private Piece activePiece;
	private Mission mission;
File
Board.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
	 */
	Tile [] boardArray = new Tile[48];	
	
<<<<<<< HEAD
	public Board(int numPiece){
		pieces = new Piece[8];
//		this.pieceOne = new Piece();
//		this.pieceOne.setPosition(0);
//		this.pieceOne.setPlayer(1);
//		this.pieceTwo = new Piece();
//		this.pieceTwo.setPlayer(2);
//		this.pieceTwo.setPosition(0);
//		this.activePiece = pieceOne;
=======
	private static Board instance;

	public static Board getInstance() {
		if (instance == null) {
			instance = new Board();
		}
		return instance;
	}
	
	public Board(){
		
		this.pieceOne = new Piece();
		this.pieceOne.setPosition(0);
		this.pieceOne.setPlayer(1);
		this.pieceTwo = new Piece();
		this.pieceTwo.setPlayer(2);
		this.pieceTwo.setPosition(0);
		this.activePiece = pieceOne;
>>>>>>> 3ad3f1d38694e7bf4c976d1b5657aae70d07f3f0
		Random randomTiles = new Random();
		
		for(int i=0; i<48; i++){
Solution content 
	public Board(){
	
	 */
	Tile [] boardArray = new Tile[48];	
	

	private static Board instance;

	public static Board getInstance() {
		if (instance == null) {
			instance = new Board();
		}
		return instance;
	}
	
	// Constructors
		Random randomTiles = new Random();
		for(int i=0; i<48; i++){
File
Board.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
Method declaration
Method invocation
Method signature
Chunk
Conflicting content 
	}
	
	public void startMission(){
<<<<<<< HEAD
		mission = new Mission(new Piece(new Team("Team", Color.red)));
		mission.startMission(Categories.Category.SAMECLASS);
=======
		mission = new Mission(new Team("Team 1"));
		mission.startMission(Categories.Category.BODYTOBODY);
>>>>>>> 3ad3f1d38694e7bf4c976d1b5657aae70d07f3f0
	}
	
}
Solution content 
	}
	
	public void startMission(){
		mission = new Mission(new Piece(new Team("Team", Color.red)));
		mission.startMission(Categories.Category.BODYTOBODY);
	}
	
}
File
Board.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
package cha.domain;

<<<<<<< HEAD
import java.awt.Color;
=======
import java.awt.event.ActionListener;
>>>>>>> 3ad3f1d38694e7bf4c976d1b5657aae70d07f3f0

public class Team {
Solution content 
package cha.domain;

import java.awt.Color;

public class Team {
File
Team.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	
	public Team(String name, Color color){
		this.name = name;
<<<<<<< HEAD
		this.color = color;
	}
=======
		getPlayer();
	}

	/*
	private int piece;
	private Object board;
>>>>>>> 3ad3f1d38694e7bf4c976d1b5657aae70d07f3f0
	
	@Override
	public String toString() {
Solution content 
		this.name = name;
		this.color = color;
	}

}
File
Team.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
import javax.swing.border.Border;
import javax.swing.border.LineBorder;
import java.awt.BorderLayout;
<<<<<<< HEAD
import java.awt.GridLayout;
import java.awt.FlowLayout;
=======
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;

import javax.swing.border.SoftBevelBorder;
import javax.swing.border.BevelBorder;

import cha.controller.ChallengeAccepted;
>>>>>>> 3ad3f1d38694e7bf4c976d1b5657aae70d07f3f0

@SuppressWarnings("serial")
public class TilePanel extends JPanel {
Solution content 
import javax.swing.JPanel;
import javax.swing.border.BevelBorder;
import javax.swing.border.LineBorder;


@SuppressWarnings("serial")
public class TilePanel extends JPanel {
File
TilePanel.java
Developer's decision
Manual
Kind of conflict
Import