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 --combined .gitattributes
index 27491be824972b6cf0ecb342105f03a1ca3860a8,b581c548c7bf0443c0b1f599fc7f8df48fc2cf12..686340b0de0ae41260cadbd365fa28c5daf7a2e6
@@@ -222,8 -222,8 +222,8 @@@ eu.etaxonomy.taxeditor.cdmlib/lib/jboss
  eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/jdbc4-2.0.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/jdom-1.1.3.jar -text
- eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.12.1-SNAPSHOT.jar -text
- eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.1-SNAPSHOT.jar -text
+ eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar -text
+ eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.4-jdk15.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0.jar -text
@@@ -1084,7 -1084,6 +1084,7 @@@ eu.etaxonomy.taxeditor.store/icons/bina
  eu.etaxonomy.taxeditor.store/icons/bookmark.gif -text
  eu.etaxonomy.taxeditor.store/icons/category.gif -text
  eu.etaxonomy.taxeditor.store/icons/change.gif -text
 +eu.etaxonomy.taxeditor.store/icons/character_data_derivate-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/clear.gif -text
  eu.etaxonomy.taxeditor.store/icons/close.gif -text
  eu.etaxonomy.taxeditor.store/icons/close_view.gif -text
@@@ -1303,7 -1302,7 +1303,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ICdmEditorHandle.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IContextListener.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDataChangeBehavior.java -text
- eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDirtyMarkableSelectionProvider.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDirtyMarkable.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IElementHasDetails.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IPartChangeListener.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IPartContentHasDetails.java -text
@@@ -1478,7 -1477,6 +1478,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java -text
 +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/OriginalLabelDataElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RootElement.java -text
@@@ -1496,7 -1494,8 +1496,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/AbstractCdmComposite.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/DerivedUnitGeneralDetailElementMVC.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/GeographicPointElement.java -text
 -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java -text
 -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataElement.java -text
 +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataField.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermCombo.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java -text
index cf4727c74ce8e18a7ad845b74fcd7ca44a2863ab,d4c616a67dcc0f4318f0bf772f4204e3eebe6d7d..c0a1e5305a51085dc4c3b011580435e32ee755ba
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Application
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
 -Bundle-Version: 3.3.8.qualifier
 +Bundle-Version: 3.4.0.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
  Bundle-Vendor: EDIT
  Bundle-Localization: OSGI-INF/l10n/plugin
@@@ -11,6 -11,7 +11,7 @@@ Bundle-ActivationPolicy: laz
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Import-Package: org.apache.log4j,
   org.eclipse.equinox.app,
+  org.eclipse.equinox.p2.repository.metadata,
   org.osgi.framework,
   org.osgi.service.packageadmin
  Require-Bundle: org.eclipse.ui,
@@@ -29,5 -30,7 +30,7 @@@
   org.eclipse.equinox.p2.updatechecker,
   org.eclipse.equinox.p2.operations,
   org.eclipse.help.ui,
-  org.eclipse.equinox.p2.metadata;bundle-version="2.1.0",
-  org.eclipse.equinox.p2.engine;bundle-version="2.1.1"
+  org.eclipse.equinox.p2.metadata,
+  org.eclipse.equinox.p2.engine,
+  org.eclipse.equinox.p2.metadata.repository,
+  org.eclipse.equinox.p2.repository
index 0b23449146f82b374d6268b40a698ce82105bc49,40552f0cad21a403b6800de403692eaaf5c918e3..739f5c0c43daed330952a1a7e4e386f929085e72
@@@ -1,21 -1,5 +1,21 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.0-SNAPSHOT.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.8-SNAPSHOT.jar" sourcepath="lib/cdmlib-commons-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.8-SNAPSHOT.jar" sourcepath="lib/cdmlib-ext-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.8-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.8-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.8-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.8-SNAPSHOT.jar" sourcepath="lib/cdmlib-print-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.8-SNAPSHOT.jar" sourcepath="lib/cdmlib-remote-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.8-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.8-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.3.8-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jena-core-2.12.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.1.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
        <classpathentry kind="output" path="target/classes"/>
  </classpath>
index edbdf5c9bdd09c9fb2b730b5fbf90b16b080ab3e,c46b5097a7c1bbba665f1e57fc0fbd0f72cd1d96..86c822eedfa5d158510fbe37bed66ee5da24fea5
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: CDM Library Dependencies Plugin
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
 -Bundle-Version: 3.3.8.qualifier
 +Bundle-Version: 3.4.0.qualifier
  Eclipse-BundleShape: dir
  Export-Package: com.google.api,
   com.google.api.detect,
@@@ -430,6 -430,22 +430,6 @@@ Bundle-ClassPath: .
   lib/batik-util-1.7.jar,
   lib/batik-xml-1.7.jar,
   lib/c3p0-0.9.2.jar,
 - lib/cdmlib-commons-3.3.8-SNAPSHOT-sources.jar,
 - lib/cdmlib-commons-3.3.8-SNAPSHOT.jar,
 - lib/cdmlib-ext-3.3.8-SNAPSHOT-sources.jar,
 - lib/cdmlib-ext-3.3.8-SNAPSHOT.jar,
 - lib/cdmlib-io-3.3.8-SNAPSHOT-sources.jar,
 - lib/cdmlib-io-3.3.8-SNAPSHOT.jar,
 - lib/cdmlib-model-3.3.8-SNAPSHOT-sources.jar,
 - lib/cdmlib-model-3.3.8-SNAPSHOT.jar,
 - lib/cdmlib-persistence-3.3.8-SNAPSHOT-sources.jar,
 - lib/cdmlib-persistence-3.3.8-SNAPSHOT.jar,
 - lib/cdmlib-print-3.3.8-SNAPSHOT-sources.jar,
 - lib/cdmlib-print-3.3.8-SNAPSHOT.jar,
 - lib/cdmlib-remote-3.3.8-SNAPSHOT-sources.jar,
 - lib/cdmlib-remote-3.3.8-SNAPSHOT.jar,
 - lib/cdmlib-services-3.3.8-SNAPSHOT-sources.jar,
 - lib/cdmlib-services-3.3.8-SNAPSHOT.jar,
   lib/cglib-nodep-2.2.2.jar,
   lib/com.springsource.org.aopalliance-1.0.0.jar,
   lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
   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
index 6f67454f4ffe3925f0eda4f2812ba26b4d2909a4,ad5c4f329930de15aadd744f362cdff36b6be940..a971784de2b3d74d020967abaf6011d9ce70a2de
@@@ -14,7 -14,6 +14,7 @@@ import org.eclipse.jface.viewers.ISelec
  import org.eclipse.jface.viewers.SelectionChangedEvent;
  import org.eclipse.jface.viewers.StructuredSelection;
  import org.eclipse.jface.viewers.TreeNode;
 +import org.eclipse.jface.viewers.TreeSelection;
  import org.eclipse.jface.viewers.TreeViewer;
  import org.eclipse.swt.SWT;
  import org.eclipse.swt.dnd.DND;
@@@ -26,6 -25,7 +26,6 @@@ import org.eclipse.swt.widgets.Tree
  import org.eclipse.ui.IEditorInput;
  import org.eclipse.ui.IEditorPart;
  import org.eclipse.ui.IEditorSite;
 -import org.eclipse.ui.IMemento;
  import org.eclipse.ui.PartInitException;
  import org.eclipse.ui.part.EditorPart;
  
@@@ -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
@@@ -82,6 -83,7 +82,6 @@@
       * Default constructor
       */
      public DerivateView() {
 -        CdmStore.getContextManager().addContextListener(this);
      }
  
      /* (non-Javadoc)
          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
       */
          viewer.refresh();
      }
  
 +
      private void generateMultiLinkSingleReads() {
          Set<SingleRead> multiLinkSingleReads = new HashSet<SingleRead>();
          for(Entry<SingleRead, Collection<Sequence>> entry:CdmStore.getService(ISequenceService.class).getSingleReadSequencesMap().entrySet()){
          return this.multiLinkSingleReads;
      }
  
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.taxeditor.model.IContextListener#contextAboutToStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
 -     */
 -    @Override
 -    public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
 -    }
 -
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
 -     */
 -    @Override
 -    public void contextStop(IMemento memento, IProgressMonitor monitor) {
 -    }
 -
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStart(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
 -     */
 -    @Override
 -    public void contextStart(IMemento memento, IProgressMonitor monitor) {
 -//        if(memento == null){
 -//            return;
 -//        }
 -//        IMemento editorMementos = memento.getChild(DERIVATE_VIEW_MEMENTO_KEY);
 -//            DerivateViewEditorInput input = new DerivateViewEditorInput(UUID.fromString(editorInput.getString(DerivateViewEditorInput.UUID_MEMENTO_KEY)));
 -//                try {
 -//                    EditorUtil.open(input);
 -//                } catch (PartInitException e) {
 -//                    AbstractUtility.error(getClass(), "Error opening an editor window", e);
 -//                }
 -    }
 -
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.taxeditor.model.IContextListener#contextRefresh(org.eclipse.core.runtime.IProgressMonitor)
 -     */
 -    @Override
 -    public void contextRefresh(IProgressMonitor monitor) {
 -    }
 -
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.taxeditor.model.IContextListener#workbenchShutdown(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
 -     */
 -    @Override
 -    public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
 -//        if (!conversation.isBound()) {
 -//            conversation.bind();
 -//        }
 -//        conversation.close();
 -//        if(memento == null){
 -//            return;
 -//        }
 -//
 -//        IEditorInput input = getEditorInput();
 -//        if(input instanceof IPersistable){
 -//            memento.createChild(DERIVATE_VIEW_MEMENTO_KEY);
 -//            ((IPersistable) input).saveState(memento);
 -//        }
 -    }
 -
      /* (non-Javadoc)
       * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
       */
index 6a8924c8a01f35bbfa0ff1fc16062e4bc3238f93,ca6afae0565ab77a6774286598660ec1e0f14a40..1b00e9df37b028566922eaecfdf9cd80d6d9ca7d
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: DataStore Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
 -Bundle-Version: 3.3.8.qualifier
 +Bundle-Version: 3.4.0.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
  Bundle-Vendor: EDIT
  Export-Package: eu.etaxonomy.cdm,
@@@ -58,18 -58,14 +58,19 @@@ Require-Bundle: org.eclipse.osgi
   org.eclipse.jface.text,
   org.eclipse.ui.forms,
   eu.etaxonomy.taxeditor.cdmlib,
 - org.eclipse.nebula.widgets.compositetable;bundle-version="1.0.0"
 + org.eclipse.nebula.widgets.compositetable;bundle-version="1.0.0",
 + org.eclipse.core.databinding,
 + org.eclipse.core.databinding.beans,
 + org.eclipse.core.databinding.observable,
 + org.eclipse.core.databinding.property,
 + org.eclipse.jface.databinding
  Import-Package: org.eclipse.core.commands,
   org.eclipse.core.commands.operations,
   org.eclipse.core.expressions,
   org.eclipse.core.runtime,
   org.eclipse.core.runtime.jobs,
-  org.eclipse.core.runtime.preferences;
+  org.eclipse.core.runtime.preferences,
+  org.eclipse.equinox.internal.p2.ui.model,
   org.eclipse.jface.action,
   org.eclipse.jface.dialogs,
   org.eclipse.jface.preference,
index 6dcd0b14c1f8b0472d35eb6576110b3877f91dd8,22a6e9d99780b7e63c50271314b595314bf7eeef..9ab80b1d52a950ed76981c18b6adc45cee49944f
@@@ -3,7 -3,7 +3,7 @@@
    <parent>
      <groupId>eu.etaxonomy</groupId>
      <artifactId>taxeditor-parent</artifactId>
 -    <version>3.3.8-SNAPSHOT</version>
 +    <version>3.4.0-SNAPSHOT</version>
    </parent>
  
    <modelVersion>4.0.0</modelVersion>
@@@ -95,6 -95,8 +95,8 @@@
      </profile>
      <profile>
        <!-- Upload the repo to the server -->
+       <!-- ATTENTION : This does not work well currently since the file permissions
+            are set with read permission set to off after upload -->
        <id>uploadRepo</id>
        <build>
          <plugins>