From 5786ce4f400fc656a2c2f4f08483502b5604a6c7 Mon Sep 17 00:00:00 2001
From: Emil Siverhall <emil-siv@dsv.su.se>
Date: Tue, 31 Jul 2012 17:18:05 +0200
Subject: [PATCH] some panel refactoring when sending ideas to service classes
---
.../dsv/scipro/project/panels/AcceptIdeaDialogPanel.java | 7 +++----
.../dsv/scipro/project/panels/CompleteIdeaDialogPanel.java | 4 ++--
.../scipro/supervisor/panels/SupervisorEditIdeaPanel.java | 2 +-
.../panels/SupervisorProjectIdeaOverviewPanel.java | 6 +++---
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/project/panels/AcceptIdeaDialogPanel.java b/src/main/java/se/su/dsv/scipro/project/panels/AcceptIdeaDialogPanel.java
index 6a437374b5..919c468440 100644
--- a/src/main/java/se/su/dsv/scipro/project/panels/AcceptIdeaDialogPanel.java
+++ b/src/main/java/se/su/dsv/scipro/project/panels/AcceptIdeaDialogPanel.java
@@ -9,7 +9,6 @@ import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.time.Duration;
@@ -66,7 +65,7 @@ public class AcceptIdeaDialogPanel extends Panel {
@Override
public void onSubmit(){
- ideaService.partnerAcceptIdea(model, loggedInUser);
+ ideaService.partnerAcceptIdea(model.getObject(), loggedInUser);
getSession().info("You have accepted to be a part of the project: "+ model.getObject().getTitle());
}
};
@@ -78,7 +77,7 @@ public class AcceptIdeaDialogPanel extends Panel {
@Override
public void onSubmit(){
- ideaService.declineIdea(model);
+ ideaService.declineIdea(model.getObject());
getSession().info("You have declined to be a part of the project: "+ model.getObject().getTitle());
}
};
@@ -112,7 +111,7 @@ public class AcceptIdeaDialogPanel extends Panel {
@Override
public void onSubmit() {
- if(ideaService.acceptIdea(model, loggedInUser, partnerPanel.getStudentSet())){
+ if(ideaService.acceptIdea(model.getObject(), loggedInUser, partnerPanel.getStudentSet())){
getSession().info("You have successfully accepted this project idea");
} else {
getSession().error("Something went wrong while trying to accept the project idea");
diff --git a/src/main/java/se/su/dsv/scipro/project/panels/CompleteIdeaDialogPanel.java b/src/main/java/se/su/dsv/scipro/project/panels/CompleteIdeaDialogPanel.java
index eaaaa7b97e..908cb3e4fd 100644
--- a/src/main/java/se/su/dsv/scipro/project/panels/CompleteIdeaDialogPanel.java
+++ b/src/main/java/se/su/dsv/scipro/project/panels/CompleteIdeaDialogPanel.java
@@ -41,7 +41,7 @@ public class CompleteIdeaDialogPanel extends Panel {
@Override
public void onSubmit() {
- ideaService.updateIdea(model);
+ ideaService.updateIdea(model.getObject());
getSession().info("Project idea updated");
}
};
@@ -56,7 +56,7 @@ public class CompleteIdeaDialogPanel extends Panel {
@Override
public void onSubmit() {
- ideaService.declineIdea(model);
+ ideaService.declineIdea(model.getObject());
getSession().info("Project idea participation cancelled");
}
};
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java
index 385c9eb55c..0f1924f815 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java
+++ b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java
@@ -155,7 +155,7 @@ public class SupervisorEditIdeaPanel extends Panel {
target.addComponent(feedbackPanel);
try {
- ideaService.saveSupervisorCreatedIdea(model, ideaCreator, studentsPanel.getStudentSet());
+ ideaService.saveSupervisorCreatedIdea(model.getObject(), ideaCreator, studentsPanel.getStudentSet());
setResponsePage(SupervisorProjectIdeaStartPage.class);
getSession().info("Idea successfully submitted");
} catch (Exception e) {
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaOverviewPanel.java b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaOverviewPanel.java
index ab0e088667..9626edc6b2 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaOverviewPanel.java
+++ b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaOverviewPanel.java
@@ -111,7 +111,7 @@ public class SupervisorProjectIdeaOverviewPanel extends Panel {
@Override
public boolean shouldBeVisible(IModel<SupervisorIdea> ideaModel) {
- return ideaService.isIdeaEditable(ideaModel, supervisor);
+ return ideaService.isIdeaEditable(ideaModel.getObject(), supervisor);
}
};
columns[6] = new ClickableIconColumn<SupervisorIdea>(Model.of("Delete"), null, ImageIcon.ICON_DELETE) {
@@ -119,12 +119,12 @@ public class SupervisorProjectIdeaOverviewPanel extends Panel {
@Override
protected void onClick(IModel<SupervisorIdea> ideaModel,
AjaxRequestTarget target) {
- ideaService.deleteWaitingIdea(ideaModel);
+ ideaService.deleteWaitingIdea(ideaModel.getObject());
target.addComponent(getWMC());
}
@Override
public boolean shouldBeVisible(IModel<SupervisorIdea> ideaModel) {
- return ideaService.isIdeaEditable(ideaModel, supervisor);
+ return ideaService.isIdeaEditable(ideaModel.getObject(), supervisor);
}
};