Projects >> Mediastopf >>0b675ba5f08360fde437deeb88e192e771e2b01c

Chunk
Conflicting content 
import ch.nomoresecrets.mediastopf.client.networking.TestConnect;
import ch.nomoresecrets.mediastopf.client.ui.MediaStopf;
import ch.nomoresecrets.mediastopf.client.ui.SplashScreen;
<<<<<<< HEAD
import ch.nomoresecrets.mediastopf.server.log.Log;
=======
import ch.nomoresecrets.mediastopf.filesys.DirectoryObserver;
>>>>>>> a40a5d7cbdd26dbbaa2c3e6e83cabaf41a6af81a

public class StartClient {
Solution content 
import ch.nomoresecrets.mediastopf.client.networking.TestConnect;
import ch.nomoresecrets.mediastopf.client.ui.MediaStopf;
import ch.nomoresecrets.mediastopf.client.ui.SplashScreen;
import ch.nomoresecrets.mediastopf.server.log.Log;
import ch.nomoresecrets.mediastopf.filesys.DirectoryObserver;

public class StartClient {
File
StartClient.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.concurrent.Executors;

import ch.nomoresecrets.mediastopf.server.networking.NetworkServer;
<<<<<<< HEAD

=======
>>>>>>> a40a5d7cbdd26dbbaa2c3e6e83cabaf41a6af81a

import ch.nomoresecrets.mediastopf.database.*;
import ch.nomoresecrets.mediastopf.domain.*;
Solution content 
import java.util.concurrent.Executors;

import ch.nomoresecrets.mediastopf.server.networking.NetworkServer;

import ch.nomoresecrets.mediastopf.database.*;
import ch.nomoresecrets.mediastopf.domain.*;
File
Server.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
	private final int MAX_SERVER_THREADS = 10;

	public Server(int port) {
<<<<<<< HEAD
		NetworkServer testserver = new NetworkServer(port);
		testserver.run();
=======
		startServer(port);
		loadData();
	}

	private void startServer(int port) {
		System.out.println("Starting network server...");
		ExecutorService exec = Executors.newSingleThreadExecutor();
		exec.execute(new NetworkServer(port, MAX_SERVER_THREADS));
	}

	private void loadData() {
		// Get data from DB direct via domain object and activerecord
		String sql = "select * from Auftrag";
		List lp = ActiveRecordManager.getObjectList(sql, Auftrag.class);
		for (Auftrag name: lp) System.out.println(name.toString());

		// Get data from DB via adapter class
		lp = DbAdapter.getOrderList();
		for (Auftrag name: lp) System.out.println(name.toString());

>>>>>>> a40a5d7cbdd26dbbaa2c3e6e83cabaf41a6af81a
	}
}
Solution content 
	private final int MAX_SERVER_THREADS = 10;

	public Server(int port) {
		startServer(port);
		loadData();
	}

	private void startServer(int port) {
		System.out.println("Starting network server...");
		ExecutorService exec = Executors.newSingleThreadExecutor();
		exec.execute(new NetworkServer(port, MAX_SERVER_THREADS));
	}

	private void loadData() {
		// Get data from DB direct via domain object and activerecord
		String sql = "select * from Auftrag";
		List lp = ActiveRecordManager.getObjectList(sql, Auftrag.class);
		for (Auftrag name: lp) System.out.println(name.toString());

		// Get data from DB via adapter class
		lp = DbAdapter.getOrderList();
		for (Auftrag name: lp) System.out.println(name.toString());

	}
}
File
Server.java
Developer's decision
Version 2
Kind of conflict
Comment
For statement
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content 
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

<<<<<<< HEAD
import org.apache.log4j.Logger;

import ch.nomoresecrets.mediastopf.client.log.Log;

public class NetworkServer {

	private ServerSocket mediastop_ServerSocket;
	private Logger logger = Log.getLogger();
=======
public class NetworkServer implements Runnable {

	private ServerSocket mediastop_ServerSocket;
	private int THREADCOUNT;
>>>>>>> a40a5d7cbdd26dbbaa2c3e6e83cabaf41a6af81a
	
	public NetworkServer(int port, int thread_count) {
		try {
Solution content 
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

import org.apache.log4j.Logger;

import ch.nomoresecrets.mediastopf.client.log.Log;

public class NetworkServer implements Runnable {

	private ServerSocket mediastop_ServerSocket;
	private Logger logger = Log.getLogger();
	private int THREADCOUNT;
	
	public NetworkServer(int port, int thread_count) {
		try {
File
NetworkServer.java
Developer's decision
Combination
Kind of conflict
Attribute
Class signature
Import
Method invocation