diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/Category.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/Category.java new file mode 100644 index 0000000000000000000000000000000000000000..9e5b762d83f44acc821b6038301b9e203cf94d16 --- /dev/null +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/Category.java @@ -0,0 +1,10 @@ +package unipotsdam.gf.modules.peer2peerfeedback; + +/** + Categories for feedback and documents + created by Katharina + */ + +public enum Category { + RECHERCHE, FORSCHUNGSFRAGE, UNTERSUCHUNGSKONZEPT, METHODIK, DURCHFÃœHRUNG, AUSWERTUNG +} diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/ExampleFeedback.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/ExampleFeedback.java new file mode 100644 index 0000000000000000000000000000000000000000..a840ac5f34d7b751bfb6b533386aedbae343f6a9 --- /dev/null +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/ExampleFeedback.java @@ -0,0 +1,29 @@ +package unipotsdam.gf.modules.peer2peerfeedback; + +import unipotsdam.gf.core.management.user.User; +import java.io.File; + +/** + Peer2PeerFeedback example + created by Katharina + */ + +public class ExampleFeedback { + + User feebackrec = new User(); + User feedbacksend = new User(); + + + public Peer2PeerFeedback examplePeerFeedback (String feedbacktopic, String feedbacktype, Category feedbackcategory, File document, User feedbacksender, User feedbackreceiver){ + + Peer2PeerFeedback example = new Peer2PeerFeedback(feedbacktopic, feedbacktype, feedbackcategory, document, feedbacksender, feedbackreceiver); + example.setFeedbacktopic("Vorschlag zur Methodik"); + example.setDocument(new File("C:/exampleMethodik.txt")); + example.setFeedbackcategory(Category.METHODIK); + example.setFeedbacktype("Text"); + example.setFeedbacksender(feedbacksend); + example.setFeedbackreceiver(feebackrec); + + return example; + } +} diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/Peer2PeerFeedback.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/Peer2PeerFeedback.java index 4633872e460122c4f879d78f749bae820ed36587..5ab52e8b516ab10e3e2e6ee260f348dfc9a4c48c 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/Peer2PeerFeedback.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/peer2peerfeedback/Peer2PeerFeedback.java @@ -1,30 +1,28 @@ package unipotsdam.gf.modules.peer2peerfeedback; import unipotsdam.gf.core.management.user.User; - import java.io.File; /** Peer2PeerFeedback Object + created by Katharina */ public class Peer2PeerFeedback{ - String feedbacktopic; - String feedbacktype; - String feedbackreference; - File document; - String feedbacktemplate; - User feedbacksender; - User feedbackreceiver; + private String feedbacktopic; + private String feedbacktype; + private Category feedbackcategory; + private File document; + private User feedbacksender; + private User feedbackreceiver; - public Peer2PeerFeedback(String feedbacktopic, String feedbacktype, String feedbackreference, File document, String feedbacktemplate, User feedbacksender, User feedbackreceiver) { + public Peer2PeerFeedback(String feedbacktopic, String feedbacktype, Category feedbackcategory, File document, User feedbacksender, User feedbackreceiver) { this.feedbacktopic = feedbacktopic; this.feedbacktype = feedbacktype; - this.feedbackreference = feedbackreference; + this.feedbackcategory = feedbackcategory; this.document = document; - this.feedbacktemplate = feedbacktemplate; this.feedbacksender = feedbacksender; this.feedbackreceiver = feedbackreceiver; } @@ -51,14 +49,13 @@ public class Peer2PeerFeedback{ } - public String getFeedbackreference() { - return feedbackreference; + public Category getFeedbackcategory() { + return feedbackcategory; } - public void setFeedbackreference(String feedbackreference) { - - this.feedbackreference = feedbackreference; + public void setFeedbackcategory(Category feedbackcategory) { + this.feedbackcategory = feedbackcategory; } @@ -72,16 +69,6 @@ public class Peer2PeerFeedback{ this.document = document; } - public String getFeedbacktemplate() { - - return feedbacktemplate; - } - - public void setFeedbacktemplate(String feedbacktemplate) { - - this.feedbacktemplate = feedbacktemplate; - } - public User getFeedbacksender() { return feedbacksender; @@ -105,8 +92,7 @@ public class Peer2PeerFeedback{ return "Peer2PeerFeedback{" + "feedbacktopic=" + feedbacktopic + ", feedbacktype=" + feedbacktype + - ", feedbackreference=" + feedbackreference + - ", feedbacktemplate=" + feedbacktemplate + + ", feedbackreference=" + feedbackcategory + ", feedbacksender='" + feedbacksender + ", feedbackreceiver=" + feedbackreceiver + ", document=" + document.toString() +