changes for merge
parent
21ea8aff1d
commit
4afbe9816a
|
@ -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;
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
package facade;
|
||||
|
||||
import java.io.FileNotFoundException;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import domain.*;
|
||||
import infrastructure.Persistenz;
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package ui;
|
||||
|
||||
import domain.C3PO;
|
||||
import domain.Nexus6;
|
||||
import domain.R2D2;
|
||||
import domain.Robot;
|
||||
import facade.FactorySystem;
|
||||
|
|
Loading…
Reference in New Issue