diff src/main/java/de/mpiwg/itgroup/ismi/entry/beans/SessionBean.java @ 96:895bf7494d17

first version of new import-merge.
author casties
date Thu, 27 Oct 2016 20:19:57 +0200
parents fd7beb701724
children e5d4443a1bc5
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/SessionBean.java	Thu Oct 20 14:09:28 2016 +0200
+++ b/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/SessionBean.java	Thu Oct 27 20:19:57 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.ImportMerge;
 import de.mpiwg.itgroup.ismi.merge.ReferenceMerge;
 import de.mpiwg.itgroup.ismi.publicView.DynamicPageEditor;
 import de.mpiwg.itgroup.ismi.publicView.PublicCodexBean;
@@ -51,7 +52,6 @@
 	
 	private EntityDetailsBean entDetailsForm = new EntityDetailsBean();
 	
-	
 	private DisplayAuthorBean displayAuthor = new DisplayAuthorBean();
 	private DisplayTitleBean displayTitle = new DisplayTitleBean();
 	
@@ -109,6 +109,7 @@
 
 	private GeneralMerge generalMerge;
 	private ReferenceMerge referenceMerge;
+    private ImportMerge importMerge;
 
 	//private String last_action;
 	//private Date time_of_lastAction;
@@ -242,6 +243,7 @@
 			this.setUser(user);
 			this.generalMerge = new GeneralMerge();
             this.referenceMerge = new ReferenceMerge();
+            this.importMerge = new ImportMerge();
 			this.defForm = new DefinitionForm();
 			// refresh the editor of Dirk
 			addSessionBean("CurrentWitness", new CurrentWitnessBean());
@@ -940,7 +942,21 @@
         this.referenceMerge = referenceMerge;
     }
 
-	public DefinitionForm getDefForm() {
+	/**
+     * @return the importMerge
+     */
+    public ImportMerge getImportMerge() {
+        return importMerge;
+    }
+
+    /**
+     * @param importMerge the importMerge to set
+     */
+    public void setImportMerge(ImportMerge importMerge) {
+        this.importMerge = importMerge;
+    }
+
+    public DefinitionForm getDefForm() {
 		return defForm;
 	}