Projects >> CS162 >>42f2533032fa3f6dd598cd49f6fb15252ab4f90f

Chunk
Conflicting content 
import java.io.InputStream;
import java.io.OutputStream;

<<<<<<< HEAD
import edu.berkeley.cs.cs162.Server.Board;
=======
public class BoardInfo implements Writable {

    private StoneColorInfo[][] board;
>>>>>>> 8102b18b53d9f82187e03a2dfc23dd5b51e34cd5

public class BoardInfo implements Writable {
	WritableList> boardState;
Solution content 
import java.io.InputStream;
import java.io.OutputStream;

public class BoardInfo implements Writable {

    private StoneColorInfo[][] board; 
    
    protected BoardInfo()
    {
    	
    }
    
    protected StoneColorInfo[][] getStoneColorState()
    {
    	return board;
    }

    //@Override
    public void readFrom(InputStream in) throws IOException {
        int xlen = DataTypeIO.readInt(in);
        board = new StoneColorInfo[xlen][];
        for(int i = 0; i < xlen; i++){
            int ylen = DataTypeIO.readInt(in);
            board[i] = new StoneColorInfo[ylen];
            for(int j = 0; j < ylen; j++){
                board[i][j] = new StoneColorInfo();
                board[i][j].readFrom(in);
            }
        }
    }

    //@Override
    public void writeTo(OutputStream out) throws IOException {
        int xlen = board.length;
        DataTypeIO.writeInt(out, xlen);
        for(int i = 0; i < xlen; i++){
            int ylen = board[i].length;
            DataTypeIO.writeInt(out, ylen);
            for(int j = 0; j < ylen; j++){
                board[i][j].writeTo(out);
            }
        }
    }

}
File
BoardInfo.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature
Import
Chunk
Conflicting content 
import java.io.OutputStream;

public class GameInfo implements Writable {
<<<<<<< HEAD
	private String name;
	public GameInfo() {
		name = null;
    }
	public GameInfo(String name) {
		this.name = name;
=======

    private String name;

    protected GameInfo(String name){
        this.name = name;
    }

    public GameInfo() {
        this("");
>>>>>>> 8102b18b53d9f82187e03a2dfc23dd5b51e34cd5
    }
Solution content 
import java.io.OutputStream;

public class GameInfo implements Writable {
	private String name;
	public GameInfo() {
		name = null;
    }
	public GameInfo(String name) {
		this.name = name;
    }
File
GameInfo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Method invocation
Method signature
Chunk
Conflicting content 
    
    @Override
    public void readFrom(InputStream in) throws IOException {
<<<<<<< HEAD
    	name = DataTypeIO.readString(in);
=======
        name = DataTypeIO.readString(in);
>>>>>>> 8102b18b53d9f82187e03a2dfc23dd5b51e34cd5
    }

    @Override
Solution content 
    
    @Override
    public void readFrom(InputStream in) throws IOException {
    	name = DataTypeIO.readString(in);
    }

    @Override
File
GameInfo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    @Override
    public void writeTo(OutputStream out) throws IOException {
<<<<<<< HEAD
    	DataTypeIO.writeString(out, name);
    }
    
    public String getName()
    {
    	return name;
=======
        DataTypeIO.writeString(out, name);
>>>>>>> 8102b18b53d9f82187e03a2dfc23dd5b51e34cd5
    }

}
Solution content 
    @Override
    public void writeTo(OutputStream out) throws IOException {
    	DataTypeIO.writeString(out, name);
    }
    
    public String getName()
    {
    	return name;
    }
}
File
GameInfo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Method signature
Return statement