merge-update from trunk

diff --cc .gitattributes
Simple merge

diff --cc eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
Simple merge

diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
Simple merge

diff --cc eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index edbdf5c9bdd09c9fb2b730b5fbf90b16b080ab3e,c46b5097a7c1bbba665f1e57fc0fbd0f72cd1d96..86c822eedfa5d158510fbe37bed66ee5da24fea5
--- 1/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@@ -594,22 -610,6 +594,22 @@@ Bundle-ClassPath: .
   lib/odfdom-0.8.jar,
   lib/h2mig_pagestore_addon.jar,
   lib/spring-security-remoting-3.1.3.RELEASE.jar,
-  lib/jena-core-2.12.1-SNAPSHOT.jar,
-  lib/jena-iri-1.1.1-SNAPSHOT.jar,
+  lib/jena-core-2.11.2.jar,
 - lib/jena-iri-1.0.2.jar
++ lib/jena-iri-1.0.2.jar,
 + lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-commons-3.4.0-SNAPSHOT.jar,
 + lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-ext-3.4.0-SNAPSHOT.jar,
 + lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-io-3.4.0-SNAPSHOT.jar,
 + lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-model-3.4.0-SNAPSHOT.jar,
 + lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar,
 + lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-print-3.4.0-SNAPSHOT.jar,
 + lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-remote-3.4.0-SNAPSHOT.jar,
 + lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-services-3.4.0-SNAPSHOT.jar
  Import-Package: eu.etaxonomy.cdm.api.application

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index 6f67454f4ffe3925f0eda4f2812ba26b4d2909a4,ad5c4f329930de15aadd744f362cdff36b6be940..a971784de2b3d74d020967abaf6011d9ce70a2de
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@@ -36,7 -36,8 +36,7 @@@ import eu.etaxonomy.cdm.model.molecular
  import eu.etaxonomy.cdm.model.molecular.SingleRead;
  import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
  import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
- import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider;
 -import eu.etaxonomy.taxeditor.model.IContextListener;
+ import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
  import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
  import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData;
  import eu.etaxonomy.taxeditor.model.IPartContentHasMedia;
@@@ -48,9 -49,9 +48,9 @@@ import eu.etaxonomy.taxeditor.view.deri
   * Displays the derivate hierarchy of the specimen specified in the editor input.
   *
   */
- public class DerivateView extends EditorPart implements IPartContentHasFactualData, IDirtyMarkableSelectionProvider,
+ public class DerivateView extends EditorPart implements IPartContentHasFactualData, IDirtyMarkable,
          IConversationEnabled, IPartContentHasDetails, IPartContentHasMedia, IPartContentHasSupplementalData,
 -        IContextListener, ISelectionChangedListener {
 +        ISelectionChangedListener {
  
        /**
       * Key used for storing a single DerivateView in a memento
@@@ -241,19 -243,14 +241,27 @@@
          viewer.refresh();
      }
  
+     /* (non-Javadoc)
+      * @see eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider#forceDirty()
+      */
+     @Override
+     public void forceDirty() {
+         changed(null);
+     }
+ 
 +    /**
 +     * Refreshes the derivate hierarchy tree and expands the tree
 +     * to show and select the given object.
 +     *
 +     * @param expandTo the object to which the tree should be expanded
 +     */
 +    public void refreshTree(Object expandTo){
 +        refreshTree();
 +        TreeSelection selection = (TreeSelection) viewer.getSelection();
 +        viewer.expandToLevel(selection.getFirstElement(), 1);
 +        viewer.setSelection(new StructuredSelection(new TreeNode(expandTo)));
 +    }
 +
      /**
       * Refreshes the derivate hierarchy tree
       */

diff --cc eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
Simple merge

diff --cc eu.etaxonomy.taxeditor/pom.xml
Simple merge