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 e6513b9a60912384a7c5cc4ea2f03e1c3d9cf5aa..bd14d0b5707b5e0915ec3c48961a0f0eda57d00e 100644 (file)
--- 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\r
                                        if(currentLocation == ViewerDropAdapter.LOCATION_BEFORE) {\r
                                            otVoc.addTermBelow((OrderedTermBase)term, (OrderedTermBase)targetTermOrVocabulary);\r
+                                           ((DefinedTermBase) targetTermOrVocabulary).getPartOf().addIncludes(term);\r
                                        }\r
 \r
                                        if(currentLocation == ViewerDropAdapter.LOCATION_AFTER) {\r
                                            otVoc.addTermAbove((OrderedTermBase)term, (OrderedTermBase)targetTermOrVocabulary);\r
+                                           ((DefinedTermBase) targetTermOrVocabulary).getPartOf().addIncludes(term);\r
                                        }\r
+                                       if(currentLocation == ViewerDropAdapter.LOCATION_ON) {\r
+                                                   targetDefinedTerm.addIncludes(term);\r
+                                                   targetDefinedTerm.getVocabulary().addTerm(term);\r
+                                               }\r
                                    }\r
-                               }\r
-                               if(currentLocation == ViewerDropAdapter.LOCATION_ON) {\r
-                                   targetDefinedTerm.addIncludes(term);\r
+                               } else{\r
+                                       targetDefinedTerm.addIncludes(term);\r
                                    targetDefinedTerm.getVocabulary().addTerm(term);\r
                                }\r
+                               \r
                        }\r
 \r
                }\r

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
index 2710aece7625e9087d0fc6eff4bceefbd37e7485..aef7c438b4abef9b909ebcfeb33984c20f0d5f20 100644 (file)
--- 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"/>