From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 22 May 2017 14:25:51 +0000 (+0200)
Subject: Merge branch 'develop' into derivateView
X-Git-Tag: 4.8.0^2~73
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/75aac13ee0657f4b443b954994318334ec6bb919

Merge branch 'develop' into derivateView

# Conflicts:
#	eu.etaxonomy.taxeditor.editor/plugin.xml
---

75aac13ee0657f4b443b954994318334ec6bb919
diff --cc eu.etaxonomy.taxeditor.editor/plugin.xml
index dec73021e,e04dadc0c..4c12d83c9
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -794,17 -801,102 +794,6 @@@
                 name="eu.etaxonomy.taxeditor.editor.separator1">
           </separator>
        </menuContribution>
--      <menuContribution
-             locationURI="popup:eu.etaxonomy.taxeditor.editor.XXXpopupmenu.specimeneditor">
 -            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
 -         <command
 -               commandId="eu.etaxonomy.taxeditor.editor.derivative.toggleLinkWithTaxonSelection"
 -               label="%command.label.LINK_WITH_TAXON_SELECTION"
 -               style="push">
 -            <visibleWhen
 -                  checkEnabled="true">
 -               <not>
 -                  <reference
 -                        definitionId="isDerivativeEditorLinkedToTaxonSelection">
 -                  </reference>
 -               </not>
 -            </visibleWhen>
 -         </command>
 -         <command
 -               commandId="eu.etaxonomy.taxeditor.editor.derivative.toggleLinkWithTaxonSelection"
 -               label="%command.label.UNLINK_FROM_TAXON_SELECTION"
 -               style="push">
 -            <visibleWhen
 -                  checkEnabled="true">
 -               <reference
 -                     definitionId="isDerivativeEditorLinkedToTaxonSelection">
 -               </reference>
 -            </visibleWhen>
 -         </command>
 -         <separator
 -               name="eu.etaxonomy.taxeditor.editor.separator3"
 -               visible="true">
 -         </separator>
 -         <command
 -               commandId="eu.etaxonomy.taxeditor.editor.derivative.reuseSingleRead"
 -               id="eu.etaxonomy.taxeditor.editor.derivative.reuseSingleReadMenuItem"
 -               label="%command.label.REUSE_SINGLE_READ_HERE"
 -               style="push">
 -            <visibleWhen
 -                  checkEnabled="true">
 -               <reference
 -                     definitionId="isSingleReadReusableHere">
 -               </reference>
 -            </visibleWhen>
 -         </command>
 -         <command
 -               commandId="eu.etaxonomy.taxeditor.editor.derivative.copySingleReadToClipBoard"
 -               label="%command.label.REUSE_SINGLE_READ_FOR_OTHER_SEQUENCE"
 -               style="push">
 -            <visibleWhen
 -                  checkEnabled="true">
 -               <reference
 -                     definitionId="isSingleRead">
 -               </reference>
 -            </visibleWhen>
 -         </command>
 -         <command
 -               commandId="eu.etaxonomy.taxeditor.editor.derivative.removeSingleReadFromSequence"
 -               label="%command.label.REMOVE_SINGLE_READ_FROM_THIS_SEQUENCE"
 -               style="push">
 -            <visibleWhen
 -                  checkEnabled="true">
 -               <reference
 -                     definitionId="isSingleReadReused">
 -               </reference>
 -            </visibleWhen>
 -         </command>
 -         <separator
 -               name="eu.etaxonomy.taxeditor.editor.separator7"
 -               visible="true">
 -         </separator>
 -         <command
 -               commandId="org.eclipse.ui.edit.delete"
 -               label="%command.label.52"
 -               style="push">
 -         </command>
 -         <command
 -               commandId="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
 -               icon="icons/deep-delete-16x16-32.png"
 -               label="%command.label.54"
 -               style="push">
 -         </command>
 -         <separator
 -               name="eu.etaxonomy.taxeditor.editor.separator1"
 -               visible="true">
 -         </separator>
--         <dynamic
-                class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
-                id="eu.etaxonomy.taxeditor.editor.derivativeEditor.CdmViewerContextMenu">
 -               class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
 -               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
--         </dynamic>
--         <separator
-                name="eu.etaxonomy.taxeditor.editor.separator7"
 -               name="eu.etaxonomy.taxeditor.editor.separator1"
--               visible="true">
--         </separator>
 -         <dynamic
 -               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
 -               id="eu.etaxonomy.taxeditor.editor.derivativeEditor.CdmViewerContextMenu">
 -         </dynamic>
--      </menuContribution>
        <menuContribution
              locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">
           <dynamic
@@@ -820,9 -912,9 +809,6 @@@
           </dynamic>
        </menuContribution>
        
--      
--      
--      
        <menuContribution
              locationURI="popup:eu.etaxonomy.taxeditor.editor.view.uses">
           <command