Software Development Cross Solution - Index of - Free

esolving conflicts
Make these changes to your own copy of
BeatBox.java, and commit them to
your code repository:
You can skip this
step if you didn’t
really get a conflict
from Subversion.
Now, commit the file
to your server, adding
a comment indicating
what you did.
196 Chapter 6
Conflict Resolution: Here’s the file version control kicked back to Bob with both changes in it.
What should the final section look like that Bob commits back in?
public class RemoteReader implements Runnable {
// variable declarations
public void run() {
try {
while ((obj = in.readObject()) != null) {
System.out.println("got an object from server");
System.out.println(obj.getClass());
String nameToShow = (String) obj;
checkboxState = (boolean[]) in.readObject();
if (nameToShow.equals(PICTURE_START_SEQUENCE)) {
receiveJPEG();
}
else {
if (nameToShow.equals(POKE_START_SEQUENCE)) {
playPoke();
nameToShow = "Hey! Pay attention.";
}
otherSeqsMap.put(nameToShow, checkboxState);
listVector.add(nameToShow);
incomingList.setListData(listVector);
// now reset the sequence to be this
}
} // close while
} catch (Exception ex) {
ex.printStackTrace();
}
} // close run
} // close inner class
File Edit Window Help Tranquility
hfsd> svn resolved src/headfirst/sd/chapter6/BeatBox.java
Resolved conflicted state of ‘BeatBox.java’
hfsd> svn commit -m “Merged picture support with Poke stuff.”
Sending src\headfirst\sd\chapter6\BeatBox.java
Transmitting file data .
Committed revision 3.
hfsd>
First, tell Subversion you resolved the conflict in the file
using the “resolved” command and the path to the file.
Download at WoweBook.Com
We need to
support both
the picture
sequence and
the poke
sequence so we
need to merge
the conditionals.
Make sure you
delete the conflict
characters ().