From 19503a28063e0e06a9be308b297c1bf286ca40b6 Mon Sep 17 00:00:00 2001
From: tudtianus <tudtianus@gmail.com>
Date: Fri, 22 Jun 2018 10:07:30 +0200
Subject: [PATCH] fix: repairs after dev_master merge

---
 .../main/java/unipotsdam/gf/modules/journal/model/Journal.java | 3 ++-
 .../gf/modules/journal/model/ProjectDescription.java           | 1 -
 .../gf/modules/journal/service/DummyJournalService.java        | 2 +-
 .../gf/modules/journal/service/DummyProjectDescription.java    | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java
index 50d6dd3c..68edb27e 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java
@@ -1,6 +1,7 @@
 package unipotsdam.gf.modules.journal.model;
 
-import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
+
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
 
 /**
  * Model Class for the learnig journal of the e-portfolio
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/ProjectDescription.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/ProjectDescription.java
index b1d55afe..4fdd7d03 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/ProjectDescription.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/ProjectDescription.java
@@ -1,7 +1,6 @@
 package unipotsdam.gf.modules.journal.model;
 
 import unipotsdam.gf.core.management.project.Project;
-import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
 
 import java.util.ArrayList;
 import java.util.Map;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java
index 5386c2ab..60d00cf5 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyJournalService.java
@@ -3,7 +3,7 @@ package unipotsdam.gf.modules.journal.service;
 import org.commonmark.renderer.html.HtmlRenderer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
 import unipotsdam.gf.modules.journal.model.Journal;
 import unipotsdam.gf.modules.journal.model.JournalFilter;
 import unipotsdam.gf.modules.journal.model.Visibility;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyProjectDescription.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyProjectDescription.java
index 62f1f2f6..93463122 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyProjectDescription.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/DummyProjectDescription.java
@@ -1,8 +1,6 @@
 package unipotsdam.gf.modules.journal.service;
 
 import unipotsdam.gf.core.management.project.Project;
-import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
-import unipotsdam.gf.modules.journal.model.Journal;
 import unipotsdam.gf.modules.journal.model.ProjectDescription;
 
 import java.util.ArrayList;
-- 
GitLab