From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 7 Dec 2015 13:31:47 +0000 (+0100)
Subject: Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
X-Git-Tag: 3.12.0^2~32
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9e56f862eb2e623f68c2194c9ccd74862634f4dd?hp=78839371991e76c3c7129b1826084e4192fd2344

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
index e6513b9a6..bd14d0b57 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
@@ -104,17 +104,23 @@ public class MoveDefinedTermOperation extends AbstractPostTaxonOperation {
 				        // DefinedTermEditor's ViewerSorter (DefinedTermSorter) class
 				        if(currentLocation == ViewerDropAdapter.LOCATION_BEFORE) {
 				            otVoc.addTermBelow((OrderedTermBase)term, (OrderedTermBase)targetTermOrVocabulary);
+				            ((DefinedTermBase) targetTermOrVocabulary).getPartOf().addIncludes(term);
 				        }
 
 				        if(currentLocation == ViewerDropAdapter.LOCATION_AFTER) {
 				            otVoc.addTermAbove((OrderedTermBase)term, (OrderedTermBase)targetTermOrVocabulary);
+				            ((DefinedTermBase) targetTermOrVocabulary).getPartOf().addIncludes(term);
 				        }
+				        if(currentLocation == ViewerDropAdapter.LOCATION_ON) {
+						    targetDefinedTerm.addIncludes(term);
+						    targetDefinedTerm.getVocabulary().addTerm(term);
+						}
 				    }
-				}
-				if(currentLocation == ViewerDropAdapter.LOCATION_ON) {
-				    targetDefinedTerm.addIncludes(term);
+				} else{
+					targetDefinedTerm.addIncludes(term);
 				    targetDefinedTerm.getVocabulary().addTerm(term);
 				}
+				
 			}
 
 		}
diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
index 2710aece7..aef7c438b 100644
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.9.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.12.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>