Projects >> BlueNet >>2394f841ed2f632642e81a77576105b59f1c8acb

Chunk
Conflicting content 
			port = intent.getIntExtra(EXTRA_PORT, DEFAULT_BLUENET_PORT);
		}
		else{
<<<<<<< HEAD
			Log.d(TAG, "Service Intent is null.");
=======
			Log.d(TAG, "Serivce Intent is null.");
>>>>>>> c7eb31cbda60698558953ad3c38029f65a95bd3e
		}
		
		if(socket==null){
Solution content 
			port = intent.getIntExtra(EXTRA_PORT, DEFAULT_BLUENET_PORT);
		}
		else{
			Log.d(TAG, "Service Intent is null.");
		}
		
		if(socket==null){
File
BluetoothNodeService.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
			socket.bind(port);
			Log.d(TAG, "Bound on port " + port);
		}
<<<<<<< HEAD
=======
		else{
			Log.d(TAG, "Tried to rebind to our own socket again...");
		}
>>>>>>> c7eb31cbda60698558953ad3c38029f65a95bd3e

		Log.d(TAG, "Thread state when calling startService: " + mCommThread.getState().name());
		if(mCommThread.getState() == Thread.State.NEW) {
Solution content 
			socket.bind(port);
			Log.d(TAG, "Bound on port " + port);
		}

		Log.d(TAG, "Thread state when calling startService: " + mCommThread.getState().name());
		if(mCommThread.getState() == Thread.State.NEW) {
File
BluetoothNodeService.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
	public String getUsername() {
		return username;
	}
<<<<<<< HEAD
=======

	public void setUsername(String username) {
		this.username = username;
	}
>>>>>>> c7eb31cbda60698558953ad3c38029f65a95bd3e

    /*
     * Returns the Node for the current device
Solution content 
	public String getUsername() {
		return username;
	}

    /*
     * Returns the Node for the current device
File
BluetoothNodeService.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
	}
	
	public void broadcastMessage(String text, Object o){
<<<<<<< HEAD
=======
		resetTimeout();
>>>>>>> c7eb31cbda60698558953ad3c38029f65a95bd3e
		for (Node n : mCommThread.getAvailableNodes()) {
			sendMessage(n, text, o);
		}
Solution content 
	}
	
	public void broadcastMessage(String text, Object o){
		for (Node n : mCommThread.getAvailableNodes()) {
			sendMessage(n, text, o);
		}
File
BluetoothNodeService.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
public class BuildNetworkActivity extends Activity implements NodeListener {

	private static final String TAG = "BuildNetworkActivity";
<<<<<<< HEAD
	
	// Extras to be passed to the Service
	public static final String EXTRA_MINIMUM_NETWORK_SIZE = "network_size";
	public static final String EXTRA_DEVICE_ADDRESS = "device_address";
	public static final String EXTRA_USERNAME = "username";
	public static final String EXTRA_PORT = "port";
=======
	public static String EXTRA_DEVICE_ADDRESS = "device_address";
	public static String EXTRA_MINIMUM_NETWORK_SIZE = "network_size";
	
	// Extras to be passed to the Service
	public static String EXTRA_USERNAME = "username";
	public static String EXTRA_PORT = "port";
>>>>>>> c7eb31cbda60698558953ad3c38029f65a95bd3e
	
	private static final int REQUEST_ENABLE_BT = 2039234;
Solution content 
public class BuildNetworkActivity extends Activity implements NodeListener {

	private static final String TAG = "BuildNetworkActivity";
	
	// Extras to be passed to the Service
	public static final String EXTRA_MINIMUM_NETWORK_SIZE = "network_size";
	public static final String EXTRA_DEVICE_ADDRESS = "device_address";
	public static final String EXTRA_USERNAME = "username";
	public static final String EXTRA_PORT = "port";
	
	private static final int REQUEST_ENABLE_BT = 2039234;
File
BuildNetworkActivity.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment