From 4afbe9816a1057421db9e5007c60c206ed0af762 Mon Sep 17 00:00:00 2001
From: Philipp3107 <minephil31@gmail.com>
Date: Mon, 9 Jan 2023 09:28:13 +0100
Subject: [PATCH] changes for merge

---
 domain/Robot.java         | 2 +-
 facade/FactorySystem.java | 2 --
 ui/UI.java                | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/domain/Robot.java b/domain/Robot.java
index 4442cc4..e429c5d 100644
--- a/domain/Robot.java
+++ b/domain/Robot.java
@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
 public abstract class Robot implements utility.interfaces.Robot, Serializable {
    protected ExceptionStorage exceptions;
    private int id;
-   private String name;
+   private final String name;
    private boolean power;
 
    private String type;
diff --git a/facade/FactorySystem.java b/facade/FactorySystem.java
index 594242b..9240c37 100644
--- a/facade/FactorySystem.java
+++ b/facade/FactorySystem.java
@@ -1,8 +1,6 @@
 package facade;
 
-import java.io.FileNotFoundException;
 import java.util.Collection;
-import java.util.HashMap;
 import domain.*;
 import infrastructure.Persistenz;
 
diff --git a/ui/UI.java b/ui/UI.java
index 4addbf7..e30fd55 100644
--- a/ui/UI.java
+++ b/ui/UI.java
@@ -1,6 +1,7 @@
 package ui;
 
 import domain.C3PO;
+import domain.Nexus6;
 import domain.R2D2;
 import domain.Robot;
 import facade.FactorySystem;