From: Katja Luther <k.luther@bgbm.org>
Date: Tue, 14 Nov 2017 10:15:50 +0000 (+0100)
Subject: merge hotfix4.11.1 into develop
X-Git-Tag: 4.12.0^2~55
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/4449b95ad331a40b1b7c9270f2d3b901c36985b3

merge hotfix4.11.1 into develop
---

4449b95ad331a40b1b7c9270f2d3b901c36985b3
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
index ed791e761,3340ed574..759cd4046
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
@@@ -129,10 -129,8 +129,10 @@@ public abstract class AbstractCdmEditor
              return;
          }
          if (viewer != null && viewer.getControl()!= null && viewer.getInput() != null){
- 
 -        	viewer.getControl().setEnabled(true);
 +            viewer.getControl().setEnabled(true);
          }
 +
++
          if(previousSelection==null ||
                  previousSelection!=selection){//skip redundant rendering of details view
              if(delaySelection==null){
diff --cc eu.etaxonomy.taxeditor/pom.xml
index b52f0048e,bdccde3d4..9255c25c1
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@@ -2,7 -2,7 +2,11 @@@
    <parent>
      <groupId>eu.etaxonomy</groupId>
      <artifactId>taxeditor-parent</artifactId>
++<<<<<<< HEAD
 +    <version>4.12.0-SNAPSHOT</version>
++=======
+     <version>4.11.1</version>
++>>>>>>> hotfix/4.11.1
    </parent>
  
    <modelVersion>4.0.0</modelVersion>