diff src/main/java/de/mpiwg/itgroup/ismi/entry/beans/SessionBean.java @ 85:fd7beb701724

working on "merge reference" feature.
author casties
date Fri, 30 Sep 2016 14:30:33 +0200
parents 4ec8d4cfad26
children 895bf7494d17
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/SessionBean.java	Wed Sep 28 10:47:39 2016 +0200
+++ b/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/SessionBean.java	Fri Sep 30 14:30:33 2016 +0200
@@ -27,6 +27,7 @@
 import de.mpiwg.itgroup.ismi.event.beans.StudyEvent;
 import de.mpiwg.itgroup.ismi.event.beans.TransferEvent;
 import de.mpiwg.itgroup.ismi.merge.GeneralMerge;
+import de.mpiwg.itgroup.ismi.merge.ReferenceMerge;
 import de.mpiwg.itgroup.ismi.publicView.DynamicPageEditor;
 import de.mpiwg.itgroup.ismi.publicView.PublicCodexBean;
 import de.mpiwg.itgroup.ismi.publicView.PublicCodexView;
@@ -107,6 +108,7 @@
 	//private Entity currentEntity;
 
 	private GeneralMerge generalMerge;
+	private ReferenceMerge referenceMerge;
 
 	//private String last_action;
 	//private Date time_of_lastAction;
@@ -239,6 +241,7 @@
 			logger.info("login " + username + " [remoteAddr=" + remoteAddr + "]");
 			this.setUser(user);
 			this.generalMerge = new GeneralMerge();
+            this.referenceMerge = new ReferenceMerge();
 			this.defForm = new DefinitionForm();
 			// refresh the editor of Dirk
 			addSessionBean("CurrentWitness", new CurrentWitnessBean());
@@ -264,6 +267,7 @@
 		this.password = "";
 		this.user = null;
 		this.generalMerge = null;
+        this.referenceMerge = null;
 		this.defForm = null;
 		return PAGE_PUBLIC_CODICES;
 	}
@@ -928,6 +932,14 @@
 		this.generalMerge = generalMerge;
 	}
 
+    public ReferenceMerge getReferenceMerge() {
+        return referenceMerge;
+    }
+
+    public void setReferenceMerge(ReferenceMerge referenceMerge) {
+        this.referenceMerge = referenceMerge;
+    }
+
 	public DefinitionForm getDefForm() {
 		return defForm;
 	}