| Chunk |
|---|
| Conflicting content |
|---|
package ms.ui.server; <<<<<<< HEAD ======= >>>>>>> d920b1f68fe799f0177e9228f9b6858eb068aacc import java.awt.Color; import java.awt.Container; import java.awt.Dimension; |
| Solution content |
|---|
package ms.ui.server; import java.awt.Color; import java.awt.Container; import java.awt.Dimension; |
| File |
|---|
| MainView.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
loadLog(); ExecutorService exec = Executors.newSingleThreadExecutor(); <<<<<<< HEAD <<<<<<< HEAD:Code/test/ms/utils/networking/client/ServerConnectionTest.java exec.execute(new PortListener(Client.ClientController, ServerController.MAX_SERVER_THREADS)); ======= exec.execute(new PortListener(InitClient.PORT, InitServer.MAX_SERVER_THREADS)); >>>>>>> david:Code/test/ms/utils/networking/client/ServerConnectionTest.java ======= exec.execute(new PortListener(1337, 10)); >>>>>>> d920b1f68fe799f0177e9228f9b6858eb068aacc |
| Solution content |
|---|
loadLog();
ExecutorService exec = Executors.newSingleThreadExecutor();
exec.execute(new PortListener(3117, 10));
}
private void loadLog() {
Logger logger = ServerLog.getLogger();
logger.info("Starting network server...");
}
private void generateFiles() {
for(int i=0; i < 4; i++) {
File f = new File(tempDir + File.separator + "testfile" + (int)(Math.random()*10000));
try {
f.createNewFile();
generate_content(f);
} catch (IOException e) {
fail(e.getMessage());
}
}
}
private void generate_content(File f) {
FileOutputStream fous;
BufferedOutputStream bos;
try {
fous = new FileOutputStream(f);
bos = new BufferedOutputStream(fous);
int rand = (int) (Math.random()*10000);
for(int i = 0; i < rand; i++){
bos.write(i);
bos.flush();
}
bos.close();
} catch (FileNotFoundException e) {
fail(e.getMessage());
} catch (IOException e) {
fail(e.getMessage());
}
}
private void makeDirs() {
delDir();
tempDir.mkdirs();
}
private void delDir() {
if(tempDir.isDirectory()) {
File[] fileList = tempDir.listFiles();
for(File f: fileList) {
f.delete();
}
}
tempDir.delete();
}
} |
| File |
|---|
| ServerConnectionTest.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Other |
| Chunk |
|---|
| Conflicting content |
|---|
loadLog();
private void startServer() {
ExecutorService exec = Executors.newSingleThreadExecutor();
<<<<<<< HEAD
<<<<<<< HEAD:Code/test/ms/utils/networking/client/ServerConnectionTest.java
exec.execute(new PortListener(Client.ClientController, ServerController.MAX_SERVER_THREADS));
=======
exec.execute(new PortListener(InitClient.PORT, InitServer.MAX_SERVER_THREADS));
>>>>>>> david:Code/test/ms/utils/networking/client/ServerConnectionTest.java
=======
exec.execute(new PortListener(1337, 10));
>>>>>>> d920b1f68fe799f0177e9228f9b6858eb068aacc
}
private void loadLog() { |
| Solution content |
|---|
private void startServer() {
loadLog();
ExecutorService exec = Executors.newSingleThreadExecutor();
exec.execute(new PortListener(3117, 10));
}
private void loadLog() { |
| File |
|---|
| ServerConnectionTest.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |