merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 11:42:23 +0000 (11:42 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 11:42:23 +0000 (11:42 +0000)
1  2 
.gitattributes
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor/pom.xml

diff --cc .gitattributes
Simple merge
@@@ -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
@@@ -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
          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
       */
      public void refreshTree(){
Simple merge