BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: b6f56e1 5dba28d)
Merge branch 'develop' into derivateView
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 22 May 2017 14:25:51 +0000 (16:25 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 22 May 2017 14:25:51 +0000 (16:25 +0200)
# Conflicts:
# eu.etaxonomy.taxeditor.editor/plugin.xml

1  2 
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.editor/plugin.xml patch | diff1 | diff2 | blob | history

diff --combined eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 79f07deb35ec7c7fe8511e219997414d278b8c0f,a3f8e2ad7aa15aedbb441b5604a0696341d04975..f10e87bf421fb1fbfcae1ff14edf63450862a144
--- 1/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Editor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
- Bundle-Version: 4.7.0.qualifier
+ Bundle-Version: 4.8.0.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
  Bundle-Vendor: %Bundle-Vendor.0
  Bundle-Localization: OSGI-INF/l10n/plugin
@@@ -28,26 -28,14 +28,26 @@@ Require-Bundle: org.eclipse.ui
   org.eclipse.zest.core,
   org.eclipse.zest.layouts,
   eu.etaxonomy.taxeditor.cdmlib,
 - org.eclipse.ui.ide
 + org.eclipse.ui.ide,
 + org.eclipse.e4.ui.workbench,
 + org.eclipse.e4.core.di,
 + org.eclipse.e4.ui.model.workbench,
 + org.eclipse.e4.ui.di
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Bundle-ActivationPolicy: lazy
 -Import-Package: org.eclipse.core.databinding.beans,
 +Import-Package: javax.inject;version="1.0.0",
 + org.eclipse.core.databinding.beans,
   org.eclipse.core.databinding.observable.list,
   org.eclipse.core.databinding.observable.map,
   org.eclipse.core.resources,
   org.eclipse.core.runtime,
 + org.eclipse.e4.core.di.annotations,
 + org.eclipse.e4.ui.di,
 + org.eclipse.e4.ui.model.application,
 + org.eclipse.e4.ui.model.application.ui,
 + org.eclipse.e4.ui.model.application.ui.basic,
 + org.eclipse.e4.ui.model.application.ui.menu,
 + org.eclipse.e4.ui.services,
   org.eclipse.equinox.app,
   org.eclipse.jface.databinding.viewers,
   org.eclipse.jface.text,
diff --combined eu.etaxonomy.taxeditor.editor/plugin.xml
index dec73021e004a2ff2876b7536bc9ab26a13d11c8,e04dadc0c2e06f17d1b7930450dec646d948c561..4c12d83c90fddde31587e2bfdb1e61eda771fd8e
--- 1/eu.etaxonomy.taxeditor.editor/plugin.xml
--- 2/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -76,6 -76,13 +76,6 @@@
              id="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
              name="%editor.name.8">
        </editor>
 -         <editor
 -               class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
 -               default="false"
 -               icon="icons/derivate_view-16x16-32.png"
 -               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
 -               name="%editor.name.DERIVATIVE_EDITOR">
 -         </editor>
     </extension>
        <extension
              point="org.eclipse.ui.views">
@@@ -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
@@@ -1149,6 -1241,18 +1135,6 @@@
              </with>
           </activeWhen>
        </handler>
 -      <handler
 -            class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
 -            commandId="org.eclipse.ui.edit.delete">
 -         <activeWhen>
 -            <with
 -                  variable="activePartId">
 -               <equals
 -                     value="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
 -               </equals>
 -            </with>
 -         </activeWhen>
 -      </handler>
        <handler
              class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.ToggleShowOnlyIndividualAssociationsHandler"
              commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations">
@@@ -1612,6 -1716,11 +1598,6 @@@
                 typeId="eu.etaxonomy.taxeditor.uuidParameterType">
           </commandParameter>
        </command>
 -      <command
 -            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
 -            id="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
 -            name="%command.name.44">
 -      </command>
        <command
              categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
              defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionToOtherTaxonHandler"
@@@ -1641,6 -1750,31 +1627,6 @@@
              id="eu.etaxonomy.taxeditor.editor.openSpecimenEditorFromMenu"
              name="%command.name.OPEN_DERIVATIVE_EDITOR">
        </command>
 -      <command
 -            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.ListenToSelectionChangeHandler"
 -            id="eu.etaxonomy.taxeditor.editor.derivative.listenToSelectionChange"
 -            name="%command.name.LINK_WITH_TAXON_SELECTION">
 -      </command>
 -      <command
 -            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.SingleReadHandler"
 -            id="eu.etaxonomy.taxeditor.editor.derivative.copySingleReadToClipBoard"
 -            name="%command.name.COPY_SINGLE_READ_TO_CLIPBOARD">
 -      </command>
 -      <command
 -            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.SingleReadHandler"
 -            id="eu.etaxonomy.taxeditor.editor.derivative.reuseSingleRead"
 -            name="%command.name.REUSE_SINGLE_READ">
 -      </command>
 -      <command
 -            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.SingleReadHandler"
 -            id="eu.etaxonomy.taxeditor.editor.derivative.removeSingleReadFromSequence"
 -            name="%command.name.REMOVE_SINGLE_READ">
 -      </command>
 -      <command
 -            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.ToggleLinkWithTaxonSelectionHandler"
 -            id="eu.etaxonomy.taxeditor.editor.derivative.toggleLinkWithTaxonSelection"
 -            name="%command.name.TOGGLE_LINK_WITH_TAXON_SELECTION">
 -      </command>
        <command
              defaultHandler="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenSpecimenEditorForTypeSpecimenHandler"
              id="eu.etaxonomy.taxeditor.openSpecimenEditorForTypeSpecimen"
@@@ -1860,48 -1994,39 +1846,48 @@@
           </with>
        </definition>
        <definition
 -            id="isSingleReadReusableHere">
 +            id="isSpecimenOrObservationBase">
           <with
                 variable="selection">
              <test
 -                  property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSingleReadReusableHere">
 +                  property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSpecimenOrObservationBase">
 +            </test>
 +         </with>
 +      </definition>
 +      <definition
 +            id="isDerivativeEditorLinkedToTaxonSelection">
 +         <with
 +               variable="activeEditor">
 +            <test
 +                  property="eu.etaxonomy.taxeditor.editor.view.derivate.DerivativeEditorPropertyTester.isLinkedWithTaxonSelection">
              </test>
           </with>
        </definition>
        <definition
 -            id="isSingleReadReused">
 +            id="isOrphanedTaxon">
           <with
                 variable="selection">
              <test
 -                  property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSingleReadReused">
 +                  forcePluginActivation="true"
 +                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isOrphaned">
              </test>
           </with>
        </definition>
        <definition
 -            id="isDerivativeEditorLinkedToTaxonSelection">
 +            id="isAddDerivateAllowed">
           <with
 -               variable="activeEditor">
 +               variable="selection">
              <test
 -                  property="eu.etaxonomy.taxeditor.editor.view.derivate.DerivativeEditorPropertyTester.isLinkedWithTaxonSelection">
 +                  property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isAddDerivateAllowed">
              </test>
           </with>
        </definition>
        <definition
 -            id="isOrphanedTaxon">
 +            id="isAddMediaAllowed">
           <with
                 variable="selection">
              <test
 -                  forcePluginActivation="true"
 -                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isOrphaned">
 +                  property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isAddMediaAllowed">
              </test>
           </with>
        </definition>
@@@ -1926,7 -2051,7 +1912,7 @@@
              class="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
              id="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
              namespace="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
 -            properties="isSequence,isSingleRead,isSingleReadReusableHere,isSingleReadReused"
 +            properties="isSequence,isSingleRead,isSpecimenOrObservationBase,isAddDerivateAllowed,isAddMediaAllowed"
              type="org.eclipse.jface.viewers.IStructuredSelection">
        </propertyTester>
        <propertyTester
@@@ -2012,12 -2137,4 +1998,12 @@@
              viewerName="Specimen Editor">
        </viewCommandMapping>
      </extension>
 +   <extension
 +         id="id1"
 +         point="org.eclipse.e4.workbench.model">
 +      <fragment
 +            apply="initial"
 +            uri="fragment.e4xmi">
 +      </fragment>
 +   </extension>
  </plugin>