From 548867ec138a5db698ba50e3cdec9b0cef3edf55 Mon Sep 17 00:00:00 2001
From: Arndt Jonasson <arndt@sics.se>
Date: Wed, 31 May 2017 16:17:21 +0200
Subject: [PATCH] Restore the possibility to go without carMobile and carNav.

---
 ecm-core/src/main/java/ecm/Ecm.java | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ecm-core/src/main/java/ecm/Ecm.java b/ecm-core/src/main/java/ecm/Ecm.java
index a7c04c24..47078e7c 100644
--- a/ecm-core/src/main/java/ecm/Ecm.java
+++ b/ecm-core/src/main/java/ecm/Ecm.java
@@ -64,6 +64,11 @@ public Ecm() {
 		dbDao = new DataTableDao();
 	}
 
+	public void init(EcuManager ecuManager, CommunicationManager commuManager,
+			 IoTManager iotManager, CarDriver carDriver) {
+	    init(ecuManager, commuManager, iotManager, carDriver, null, null);
+	}
+
 	public void init(EcuManager ecuManager, CommunicationManager commuManager,
 			 IoTManager iotManager, CarDriver carDriver, CarMobile carMobile, CarNav carNav) {
 		this.ecuManager = ecuManager;
@@ -76,8 +81,12 @@ public void init(EcuManager ecuManager, CommunicationManager commuManager,
 		ecuManager.setEcm(this);
 		commuManager.setEcm(this);
 		carDriver.setEcm(this);
-		carMobile.setEcm(this);
-		carNav.setEcm(this);
+		if (carMobile != null) {
+		    carMobile.setEcm(this);
+		}
+		if (carNav != null) {
+		    carNav.setEcm(this);
+		}
 //		iotManager.setEcm(this);
 
 	    System.out.println("Ecm init");
@@ -87,8 +96,12 @@ public void init(EcuManager ecuManager, CommunicationManager commuManager,
 	public void start(String [] args) {
 		new Thread(ecuManager).start();
 		new Thread(carDriver).start();
-		new Thread(carMobile).start();
-		new Thread(carNav).start();
+		if (carMobile != null) {
+		    new Thread(carMobile).start();
+		}
+		if (carNav != null) {
+		    new Thread(carNav).start();
+		}
 		new Thread(iotManager).start();
 		new Thread(commuManager).start();