| Chunk |
|---|
| Conflicting content |
|---|
public BotStub(final RSLoader applet) {
this.applet = applet;
<<<<<<< HEAD
Crawler c = new Crawler("http://www." + applet.getTargetName() + ".com/");
parameters = c.getParameters();
final String world_prefix = c.getWorldPrefix();
try {
codeBase = new URL("http://world" + world_prefix + "." + applet.getTargetName() + ".com");
documentBase = new URL("http://world" + world_prefix + "." + applet.getTargetName() + ".com/m0");
=======
Crawler c = new Crawler("http://www." + applet.getTargetName()
+ ".com/");
parameters = c.getParameters();
final String world_prefix = c.getWorldPrefix();
try {
codeBase = new URL("http://world" + world_prefix + "."
+ applet.getTargetName() + ".com");
documentBase = new URL("http://world" + world_prefix + "."
+ applet.getTargetName() + ".com/m0");
>>>>>>> 12fa90ff2a744b9257590585edf67a150ebff313
} catch (final MalformedURLException e) {
throw new RuntimeException(e);
} |
| Solution content |
|---|
public BotStub(final RSLoader applet) {
this.applet = applet;
Crawler c = new Crawler("http://www." + applet.getTargetName() + ".com/");
parameters = c.getParameters();
final String world_prefix = c.getWorldPrefix();
try {
codeBase = new URL("http://world" + world_prefix + "." + applet.getTargetName() + ".com");
documentBase = new URL("http://world" + world_prefix + "." + applet.getTargetName() + ".com/m0");
} catch (final MalformedURLException e) {
throw new RuntimeException(e);
} |
| File |
|---|
| BotStub.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Try statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
if (url.toString().contains("outofdate")) {
final String message = GlobalConfiguration.NAME + " is currently outdated, please wait patiently for a new version.";
log.severe(message);
<<<<<<< HEAD
JOptionPane.showMessageDialog(null, message, "Outdated", JOptionPane.WARNING_MESSAGE);
File versionFile = new File(GlobalConfiguration.Paths.getVersionCache());
=======
JOptionPane.showMessageDialog(null, message, "Outdated",
JOptionPane.WARNING_MESSAGE);
File versionFile = new File(
GlobalConfiguration.Paths.getVersionCache());
>>>>>>> 12fa90ff2a744b9257590585edf67a150ebff313
if (versionFile.exists() && !versionFile.delete()) {
log.warning("Unable to clear cache.");
} |
| Solution content |
|---|
if (url.toString().contains("outofdate")) {
final String message = GlobalConfiguration.NAME + " is currently outdated, please wait patiently for a new version.";
log.severe(message);
JOptionPane.showMessageDialog(null, message, "Outdated", JOptionPane.WARNING_MESSAGE);
File versionFile = new File(GlobalConfiguration.Paths.getVersionCache());
if (versionFile.exists() && !versionFile.delete()) {
log.warning("Unable to clear cache.");
} |
| File |
|---|
| BotStub.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
log.warning("Unable to clear cache.");
}
} else if (!target.equals("tbi")) {
<<<<<<< HEAD
log.info("Attempting to show: " + url.toString() + " [" + target + "]");
=======
log.info("Attempting to show: " + url.toString() + " [" + target
+ "]");
>>>>>>> 12fa90ff2a744b9257590585edf67a150ebff313
}
}
|
| Solution content |
|---|
log.warning("Unable to clear cache.");
}
} else if (!target.equals("tbi")) {
log.info("Attempting to show: " + url.toString() + " [" + target + "]");
}
}
|
| File |
|---|
| BotStub.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |