| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
/*
* Send a message to a specific destination.
*/
public void sendMessage(int port, String text){
Socket s = getSocketByPort(port);
if(s != null){
Message m = new Message("No one.", text, (System.currentTimeMillis() / 1000L));
s.send(Message.serialize(m));
}
}
/*
* Send a message to everyone.
*/
public void broadcastMessage(String text){
for(Socket s : mSockets){
Message m = new Message("No one.", text, (System.currentTimeMillis() / 1000L));
s.send(Message.serialize(m));
}
}
public void addMessageListener(MessageListener l){
messageListeners.add(l);
}
public boolean removeMessageListener(MessageListener l){
return messageListeners.remove(l);
}
=======
>>>>>>> a4848e76a891262b2159bf0e618679ba85c44754
} |
| Solution content |
|---|
}
}
/*
* Send a message to a specific destination.
*/
public void sendMessage(int port, String text){
Socket s = getSocketByPort(port);
if(s != null){
Message m = new Message("No one.", text, (System.currentTimeMillis() / 1000L));
s.send(Message.serialize(m));
}
}
/*
* Send a message to everyone.
*/
public void broadcastMessage(String text){
for(Socket s : mSockets){
Message m = new Message("No one.", text, (System.currentTimeMillis() / 1000L));
s.send(Message.serialize(m));
}
}
public void addMessageListener(MessageListener l){
messageListeners.add(l);
}
public boolean removeMessageListener(MessageListener l){
return messageListeners.remove(l);
}
} |
| File |
|---|
| SocketManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method declaration |