From 5e3d4a7f7555d31692bcfd04a16caeebfbfe561c Mon Sep 17 00:00:00 2001
From: Martin Staehr <software@mstaehr.net>
Date: Sat, 22 Sep 2018 14:32:13 +0200
Subject: [PATCH] #40 fix dependency injection bugs
---
.../gf/core/management/pageAppearance/HeadLine.java | 6 ++----
.../gf/core/management/pageAppearance/Menu.java | 12 +++++-------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/HeadLine.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/HeadLine.java
index 10ed1a7a..57c99d95 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/HeadLine.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/HeadLine.java
@@ -1,9 +1,9 @@
package unipotsdam.gf.core.management.pageAppearance;
+import unipotsdam.gf.core.database.mysql.MysqlConnect;
import unipotsdam.gf.core.management.user.User;
import unipotsdam.gf.core.management.user.UserDAO;
-import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
@@ -12,15 +12,13 @@ import java.io.IOException;
public class HeadLine extends SimpleTagSupport {
- @Inject
- private UserDAO userDAO;
-
public void doTag() throws IOException {
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
String projectId = request.getParameter("projectId");
String token = request.getParameter("token");
JspWriter out = getJspContext().getOut();
+ UserDAO userDAO = new UserDAO(new MysqlConnect());
User user = userDAO.getUserByToken(token);
Boolean isStudent = user.getStudent();
out.println("<div class=\"container-fluid\">\n" +
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
index bc718e50..24979038 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
@@ -1,25 +1,21 @@
package unipotsdam.gf.core.management.pageAppearance;
+import unipotsdam.gf.core.database.mysql.MysqlConnect;
import unipotsdam.gf.core.management.project.ProjectDAO;
import unipotsdam.gf.core.management.user.User;
import unipotsdam.gf.core.management.user.UserDAO;
import unipotsdam.gf.core.states.model.ProjectPhase;
-import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import java.io.IOException;
-public class Menu extends SimpleTagSupport {
- private Integer hierarchyLevel = 0;
- @Inject
- private ProjectDAO projectDAO;
+public class Menu extends SimpleTagSupport {
- @Inject
- private UserDAO userDAO;
+ private Integer hierarchyLevel = 0;
public void doTag() throws IOException {
hierarchyLevel = getHierarchy();
@@ -29,11 +25,13 @@ public class Menu extends SimpleTagSupport {
String projectId = request.getParameter("projectId");
ProjectPhase projectPhase;
try {
+ ProjectDAO projectDAO = new ProjectDAO(new MysqlConnect());
projectPhase = projectDAO.getProjectById(projectId).getPhase();
} catch (Exception e) {
projectPhase = null;
}
JspWriter out = getJspContext().getOut();
+ UserDAO userDAO = new UserDAO(new MysqlConnect());
if (token != null) {
User user = userDAO.getUserByToken(token);
Boolean isStudent = user.getStudent();
--
GitLab