adding new dozer version to plugin
[taxeditor.git] / taxeditor-editor / plugin.xml
index 01f42dfcc6d6db665893b91b5e15001277382b67..f1a4bd843d18c68f8d455ea4e004401479109b38 100644 (file)
          </run>
       </application>
    </extension>
+      <extension
+            point="org.eclipse.core.runtime.adapters">
+         <factory
+               adaptableType="eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor"
+               class="eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditorAdapterFactory">
+            <adapter
+                  type="eu.etaxonomy.taxeditor.editor.DuplicateArbitrator">
+            </adapter>
+         </factory>
+      </extension>
    <extension
          point="org.eclipse.ui.editors">
       <editor
@@ -20,7 +30,7 @@
          </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor"
-            default="false"
+            default="true"
             id="eu.etaxonomy.taxeditor.taxonNameEditor"
             name="Taxon Name Editor">
       </editor>
             id="eu.etaxonomy.taxeditor.descriptiontreeeditor"
             name="Taxon Description Editor">
       </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.images.TaxonImageEditor"
-            default="false"
-            id="eu.etaxonomy.taxeditor.taxonImageEditor"
-            name="Taxon Image Editor">
-      </editor>
+   </extension>
+      <extension
+            point="org.eclipse.ui.views">
+         <view
+               allowMultiple="false"
+               class="eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewPart"
+               icon="icons/accessories-text-editor.png"
+               id="eu.etaxonomy.taxeditor.editor.forms.detailsView"
+               name="Details"
+               restorable="true">
+         </view>
+         <view
+               allowMultiple="false"
+               class="eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart"
+               icon="icons/address-book-new.png"
+               id="eu.etaxonomy.taxeditor.editor.view.description"
+               name="Descriptive"
+               restorable="true">
+         </view>
+         <view
+               allowMultiple="false"
+               class="eu.etaxonomy.taxeditor.editor.view.supplementaldata.SupplementalDataViewPart"
+               icon="icons/applications-office.png"
+               id="eu.etaxonomy.taxeditor.editor.view.supplementalData"
+               name="Supplemental Data"
+               restorable="true">
+         </view>
+         <view
+               allowMultiple="false"
+               class="eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart"
+               icon="icons/camera-photo.png"
+               id="eu.etaxonomy.taxeditor.editor.view.media"
+               name="Media"
+               restorable="true">
+         </view>
+      </extension>
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="eu.etaxonomy.taxeditor.application.perspective">
+         <view
+               id="eu.etaxonomy.taxeditor.editor.forms.detailsView"
+               ratio="0.7"
+               relationship="right"
+               relative="org.eclipse.ui.editorss">
+         </view>
+         <view
+               id="eu.etaxonomy.taxeditor.editor.view.description"
+               relationship="bottom"
+               relative="org.eclipse.ui.editorss">
+         </view>
+         <view
+               id="eu.etaxonomy.taxeditor.editor.view.media"
+               relationship="bottom"
+               relative="org.eclipse.ui.editorss">
+         </view>
+         <view
+               id="eu.etaxonomy.taxeditor.editor.view.supplementalData"
+               relationship="bottom"
+               relative="eu.etaxonomy.taxeditor.editor.forms.detailsView">
+         </view>
+      </perspectiveExtension>
+   </extension>
+   <extension
+         point="org.eclipse.ui.elementFactories">
+      <factory
+            class="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory"
+            id="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory">
+      </factory>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView">
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.commands.showDetailsView"
+               label="Details"
+               style="push">
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.commands.showTaxonDescriptions"
+               label="Descriptive"
+               style="push">
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.commands.showSupplementalDataView"
+               label="Supplemental"
+               style="push">
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.commands.showMedia"
+               label="Media"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.ShowDetailsViewHandler"
+            id="eu.etaxonomy.taxeditor.editor.commands.showDetailsView"
+            name="Show Details">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.ShowTaxonDescriptionsViewHandler"
+            id="eu.etaxonomy.taxeditor.editor.commands.showTaxonDescriptions"
+            name="Show Taxon Descriptions">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.ShowSupplementalDataViewHandler"
+            id="eu.etaxonomy.taxeditor.editor.commands.showSupplementalDataView"
+            name="Show Suplemental Data">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.ShowMediaViewHandler"
+            id="eu.etaxonomy.taxeditor.editor.commands.showMedia"
+            name="Show Media">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="menu:org.eclipse.ui.main.menu.navigate">
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.command.openParent"
+               label="Open Parent"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenParentHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.openParent"
+            name="Open Parent">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.menus">
             locationURI="popup:eu.etaxonomy.taxeditor.taxonNameEditor">
             <menu
                   label="New">
-               <command
-                     commandId="eu.etaxonomy.taxeditor.editor.name.createChildTaxon"
-                     label="Child Taxon"
-                     style="push">
-                  <visibleWhen>
-                     <reference
-                           definitionId="isAcceptedTaxon">
-                     </reference>
-                  </visibleWhen>
-               </command>
                <command
                      commandId="eu.etaxonomy.taxeditor.editor.name.createHeterotypicSynoym"
                      label="Heterotypic Synonym"
                <menu
                      label="Concept Relation">
                   <visibleWhen>
-                     <and>
-                        <not>
-                           <reference
-                                 definitionId="isSynonym">
-                           </reference>
-                        </not>
-                        <not>
-                           <reference
-                                 definitionId="isMisapplication">
-                           </reference></not>
-                     </and>
+                     <or>
+                        <reference
+                              definitionId="isAcceptedTaxon">
+                        </reference>
+                        <reference
+                              definitionId="isConceptRelation">
+                        </reference>
+                     </or>
                   </visibleWhen>
                   <dynamic
                         class="eu.etaxonomy.taxeditor.editor.name.handler.CreateConceptRelationMenu"
                      label="Misapplication"
                      style="push">
                   <visibleWhen>
-                     <and>
-                        <not>
-                           <reference
-                                 definitionId="isSynonym">
-                           </reference>
-                        </not>
-                        <not>
-                           <reference
-                                 definitionId="isConceptRelation">
-                           </reference>
-                        </not>
-                     </and>                     
+                     <or>
+                        <reference
+                              definitionId="isAcceptedTaxon">
+                        </reference>
+                        <reference
+                              definitionId="isMisapplication">
+                        </reference>
+                     </or>
                   </visibleWhen>
                </command>
             </menu>
                   visible="true">
             </separator>
             <command
-                  xcommandId="eu.etaxonomy.taxeditor.editor.name.deleteTaxonBase"
                   commandId="org.eclipse.ui.edit.delete"
                   label="Delete"
                   style="push">
                <visibleWhen>
-                  <not>
+                  <or>
                      <reference
-                           definitionId="isAcceptedTaxon">
+                           definitionId="isSynonym">
+                     </reference>
+                     <reference
+                           definitionId="isMisapplication">
+                     </reference>
+                     <reference
+                           definitionId="isConceptRelation">
                      </reference>
-                  </not>
+                  </or>
                </visibleWhen>
             </command>
             <separator
                   class="eu.etaxonomy.taxeditor.editor.name.handler.GroupBasionymContributionItem"
                   id="taxeditor-editor.dynamic.setBasionym">
                <visibleWhen>
-                  <reference
-                        definitionId="isSynonym">
-                  </reference>
+                  <or>
+                     <reference
+                           definitionId="isAcceptedTaxon">
+                     </reference>
+                     <reference
+                           definitionId="isSynonym">
+                     </reference>
+                  </or>
                </visibleWhen>
             </dynamic>
             <command
                   visible="true">
             </separator>
             <command
-                  commandId="org.eclipse.ui.file.save"
-                  label="Save"
-                  style="push">
-            </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView">
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.command.showPropertySheetView"
-               label="Property Sheet"
-               style="push">
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.commands.showTabbedPropertiesView"
-               label="Tabbed Properties"
-               style="push">
-         </command>
-         <!--command
-               commandId="eu.etaxonomy.taxeditor.editor.commands.showNameRelationsView"
-               label="Name Relations"
-               style="push">
-         </command-->
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.navigate">
-         <menu
-               id="menu:org.eclipse.ui.main.menu.navigate.goto"
-               label="Go To">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.command.previousMember"
-                  label="Previous Member"
+                  commandId="eu.etaxonomy.taxeditor.editor.commands.showDetailsView"
+                  label="Show Details"
                   style="push">
             </command>
+            <separator
+                  name="taxeditor-editor.separator4"
+                  visible="true">
+            </separator>
             <command
-                  commandId="eu.etaxonomy.taxeditor.editor.command.nextMember"
-                  label="Next Member"
+                  commandId="org.eclipse.ui.file.save"
+                  label="Save"
                   style="push">
             </command>
-         </menu>
-         <separator
-               name="taxeditor-editor.separator1"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.command.openParent"
-               label="Open Parent"
-               style="push">
-         </command>
       </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.handlers">
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
-            commandId="org.eclipse.ui.edit.delete">
-         <activeWhen>
-            <reference
-                  definitionId="isSelectionNonAcceptedTaxonName">
-            </reference>
-         </activeWhen>
-      </handler>
       <handler
             class="org.eclipse.ui.internal.handlers.NewEditorHandler"
             commandId="org.eclipse.ui.window.newEditor">
             </count>
          </enabledWhen>
       </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
+            commandId="org.eclipse.ui.edit.delete">
+         <activeWhen>
+            <and>
+               <not>
+                  <reference
+                        definitionId="isAcceptedTaxon">
+                  </reference>
+               </not>
+               <reference
+                     definitionId="isTaxonBase">
+               </reference>
+            </and>
+         </activeWhen>
+      </handler>
       <!--handler
             class="eu.etaxonomy.taxeditor.editor.handler.SaveTaxonHandler"
             commandId="org.eclipse.ui.file.save">
             name="Save All">
       </command-->
    </extension>
-   <extension
-         point="org.eclipse.core.expressions.definitions">
-      <definition
-            id="nameEditorActive">
-         <with
-               variable="activeEditorId">
-            <equals
-                  value="eu.etaxonomy.taxeditor.editor.multipagetaxonview">
-            </equals>
-         </with>
-      </definition>
-      <definition
-            id="isAcceptedTaxon">
-         <with
-               variable="activeMenuSelection">
-            <iterate>
-               <instanceof
-                     value="eu.etaxonomy.taxeditor.propertysheet.name.AcceptedTaxonPropertySource">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
-      <definition
-            id="isSynonym">
-         <with
-               variable="activeMenuSelection">
-            <iterate>
-               <instanceof
-                     value="eu.etaxonomy.taxeditor.propertysheet.name.SynonymPropertySource">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
-      <definition
-            id="isMisapplication">
-         <with
-               variable="activeMenuSelection">
-            <iterate>
-               <instanceof
-                     value="eu.etaxonomy.taxeditor.propertysheet.name.MisapplicationPropertySource">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
-      <definition
-            id="isConceptRelation">
-         <with
-               variable="activeMenuSelection">
-            <iterate>
-               <instanceof
-                     value="eu.etaxonomy.taxeditor.propertysheet.name.ConceptPropertySource">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
-      <definition
-            id="isCdmObject">
-         <with
-               variable="activeMenuSelection">
-            <iterate>
-               <instanceof
-                     value="eu.etaxonomy.taxeditor.propertysheet.ICdmBasePropertySource">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
-      <definition
-            id="isSelectionNonAcceptedTaxonName">
-         <with
-               variable="selection">
-            <and>
-               <not>
-                  <iterate>
-                     <instanceof
-                           value="eu.etaxonomy.taxeditor.propertysheet.name.AcceptedTaxonPropertySource">
-                     </instanceof>
-                  </iterate>
-               </not>
-               <iterate>
-                  <instanceof
-                        value="eu.etaxonomy.taxeditor.propertysheet.name.TaxonBasePropertySource">
-                  </instanceof>
-               </iterate>
-            </and>
-         </with>
-      </definition>
-   </extension>
    <extension
          name="Name Commands"
          point="org.eclipse.ui.commands">
             id="eu.etaxonomy.taxeditor.editor.name.moveTaxon"
             name="Move Taxon">
       </command-->
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.CreateChildTaxonHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.createChildTaxon"
-            name="Create Child Taxon">
-      </command>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeToSynonymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.changeToSynonym"
       </command>
    </extension>
    <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.ShowPropertySheetHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.showPropertySheetView"
-            name="Show Property Sheet">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.PreviousMemberHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.previousMember"
-            name="Previous Member">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.NextMemberHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.nextMember"
-            name="Next Member">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenParentHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.openParent"
-            name="Open Parent">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.ShowTabbedPropertiesViewHandler"
-            id="eu.etaxonomy.taxeditor.editor.commands.showTabbedPropertiesView"
-            name="Tabbed Properties">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.elementFactories">
-      <factory
-            class="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory"
-            id="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory">
-      </factory>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="eu.etaxonomy.taxeditor.application.perspective">
-         <view
-               closeable="true"
-               id="org.eclipse.ui.views.PropertySheet"
-               minimized="false"
-               moveable="true"
-               ratio="0.7"
-               relationship="right"
-               relative="org.eclipse.ui.editorss"
-               showTitle="false"
-               visible="true">
-         </view>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.ui.bindings">   
-      <key
-            commandId="eu.etaxonomy.taxeditor.editor.command.nextMember"
-            contextId="org.eclipse.ui.contexts.window"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M2+M3+ARROW_DOWN">
-      </key>
-      <key
-            commandId="eu.etaxonomy.taxeditor.editor.command.previousMember"
-            contextId="org.eclipse.ui.contexts.window"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M2+M3+ARROW_UP">
-      </key>
-      <scheme
-            description="The default key binding scheme for the Taxonomic Editor"
-            id="eu.etaxonomy.taxeditor.bindings.scheme.default"
-            name="Taxonomic Editor Default Key Bindings">
-      </scheme>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
-      <propertyContributor
-            contributorId="eu.etaxonomy.taxeditor.taxonNameEditor"
-            labelProvider="eu.etaxonomy.taxeditor.propertysheet.tabbed.TabbedPropertyPageLabelProvider"
-            typeMapper="eu.etaxonomy.taxeditor.propertysheet.tabbed.TaxonTypeMapper">
-         <propertyCategory
-               category="taxonBase"></propertyCategory>
-      </propertyContributor>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-      <propertyTabs
-            contributorId="eu.etaxonomy.taxeditor.taxonNameEditor">
-         <propertyTab
-               category="taxonBase"
-               id="taxonNameEditor.nameTab"
-               label="Name">
-         </propertyTab>
-         <propertyTab
-               afterTab="taxonNameEditor.nomRefTab"
-               category="taxonBase"
-               id="taxonNameEditor.nameRelationsTab"
-               label="Name Relations">
-         </propertyTab>
-         <propertyTab
-               afterTab="taxonNameEditor.nameRelationsfTab"
-               category="taxonBase"
-               id="taxonNameEditor.secundumTab"
-               label="Secundum">
-         </propertyTab>
-         <propertyTab
-               afterTab="taxonNameEditor.secundumTab"
-               category="taxonBase"
-               id="taxonNameEditor.annotationsTab"
-               label="Annotations">
-         </propertyTab>
-         <propertyTab
-               afterTab="taxonNameEditor.annotationsTab"
-               category="taxonBase"
-               id="taxonNameEditor.generalTab"
-               label="General">
-         </propertyTab>
-      </propertyTabs>
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="nameEditorActive">
+         <with
+               variable="activeEditorId">
+            <equals
+                  value="eu.etaxonomy.taxeditor.editor.multipagetaxonview">
+            </equals>
+         </with>
+      </definition>
+      <definition
+            id="isAcceptedTaxon">
+         <with
+               variable="activeMenuSelection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isAcceptedTaxon">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isSynonym">
+         <with
+               variable="activeMenuSelection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isSynonym">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isMisapplication">
+         <with
+               variable="activeMenuSelection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isMisapplication">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isConceptRelation">
+         <with
+               variable="activeMenuSelection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isConceptRelation">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isTaxonBase">
+         <with
+               variable="activeMenuSelection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isTaxonBase">
+            </test>
+         </with>
+      </definition>
    </extension>
    <extension
-         point="org.eclipse.ui.views.properties.tabbed.propertySections">
-      <propertySections
-            contributorId="eu.etaxonomy.taxeditor.taxonNameEditor">
-         <propertySection
-               class="eu.etaxonomy.taxeditor.propertysheet.tabbed.NameOverviewSection"
-               id="taxonNameEditor.overview.name"
-               tab="taxonNameEditor.nameTab">
-            <input
-                  type="eu.etaxonomy.taxeditor.editor.name.AcceptedNameComposite">
-            </input>
-            <input
-                  type="eu.etaxonomy.taxeditor.editor.name.SynonymComposite">
-            </input>
-         </propertySection>
-         <propertySection
-               afterSection="taxonNameEditor.overview.name"
-               class="eu.etaxonomy.taxeditor.propertysheet.tabbed.NamePropertySection"
-               id="taxonNameEditor.nameSection"
-               tab="taxonNameEditor.nameTab">
-            <input
-                  type="eu.etaxonomy.taxeditor.editor.name.AcceptedNameComposite">
-            </input>
-            <input
-                  type="eu.etaxonomy.taxeditor.editor.name.SynonymComposite">
-            </input>
-         </propertySection>
-         <!--propertySection
-               afterSection="taxonNameEditor.nameSection"
-               class="eu.etaxonomy.taxeditor.propertysheet.tabbed.AuthorSection"
-               id="taxonNameEditor.authorSection"
-               tab="taxonNameEditor.nameTab">
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Taxon">
-            </input>
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Synonym">
-            </input>
-         </propertySection>
-         <propertySection
-               afterSection="taxonNameEditor.authorSection"
-               class="eu.etaxonomy.taxeditor.propertysheet.tabbed.NomRefPropertySection"
-               id="taxonNameEditor.nomRefSection"
-               tab="taxonNameEditor.nameTab">
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Taxon">
-            </input>
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Synonym">
-            </input>
-         </propertySection-->
-         <propertySection
-               class="eu.etaxonomy.taxeditor.propertysheet.tabbed.CreatedSection"
-               id="taxonNameEditor.createdSection"
-               tab="taxonNameEditor.generalTab">
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Taxon">
-            </input>
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Synonym">
-            </input>
-         </propertySection>
-         <propertySection
-               class="eu.etaxonomy.taxeditor.propertysheet.tabbed.AnnotationSection"
-               id="taxonNameEditor.annotationSection"
-               tab="taxonNameEditor.annotationsTab">
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Taxon">
-            </input>
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Synonym">
-            </input>
-         </propertySection>
-         <propertySection
-               class="eu.etaxonomy.taxeditor.propertysheet.tabbed.NameRelationsSection"
-               id="taxonNameEditor.nameRelationSection"
-               tab="taxonNameEditor.nameRelationsTab">
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Taxon">
-            </input>
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Synonym">
-            </input>
-         </propertySection>
-         <propertySection
-               class="eu.etaxonomy.taxeditor.propertysheet.tabbed.SecundumSection"
-               id="taxonNameEditor.secundumSection"
-               tab="taxonNameEditor.secundumTab">
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Taxon">
-            </input>
-            <input
-                  type="eu.etaxonomy.cdm.model.taxon.Synonym">
-            </input>
-         </propertySection>
-      </propertySections>
+         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester"
+            id="eu.etaxonomy.taxeditor.editor.name.propertyTester"
+            namespace="eu.etaxonomy.taxeditor.editor.name.propertyTester"
+            properties="isAcceptedTaxon,isSynonym,isMisapplication,isTaxonBase,isConceptRelation"
+            type="org.eclipse.jface.viewers.IStructuredSelection">
+      </propertyTester>
    </extension>
-      <extension
-            point="org.eclipse.core.runtime.adapters">
-         <factory
-               adaptableType="eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor"
-               class="eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditorAdapterFactory">
-            <adapter
-                  type="eu.etaxonomy.taxeditor.editor.DuplicateArbitrator">
-            </adapter>
-         </factory>
-      </extension>
       <extension
             point="org.eclipse.ui.menus">
          <menuContribution
-               locationURI="popup:eu.etaxonomy.taxeditor.descriptiontreeeditor">
+               locationURI="popup:eu.etaxonomy.taxeditor.editor.view.description">
             <command
                   commandId="eu.etaxonomy.taxeditor.description.commands.adddescription"
-                  label="New Description"
-                  style="push">
-            </command>
-            <command
-                  commandId="taxeditor-editor.command.newimagegallery"
-                  label="New Image Gallery"
+                  label="New Descriptive Data"
                   style="push">
             </command>
             <separator
                   name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator3"
                   visible="true">
             </separator>
-            <command
-                  commandId="taxeditor-editor.neworderedimagelist"
-                  label="New Ordered Image List"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isInImageGallery">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="taxeditor-editor.newimage"
-                  label="New Image"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isInImageList">
-                  </reference>
-               </visibleWhen>
-            </command>
             <menu
                   label="New">
                <dynamic
-                     class="eu.etaxonomy.taxeditor.editor.descriptiontree.DynamicFeatureMenu"
+                     class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DynamicFeatureMenu"
                      id="eu.etaxonomy.taxeditor.dynamicFeatureMenu">
                </dynamic>
-               <visibleWhen>
-                  <reference
-                        definitionId="isInDescription">
-                  </reference>
+               <visibleWhen
+                     checkEnabled="true">
+                  <or>
+                     <reference
+                           definitionId="isDescription">
+                     </reference>
+                     <reference
+                           definitionId="isDescriptionElement">
+                     </reference>
+                     <reference
+                           definitionId="isFeatureNodeContainer">
+                     </reference>
+                  </or>
                </visibleWhen>
             </menu>
             <separator
                   name="taxeditor-editor.separator1"
                   visible="true">
             </separator>
-            <command
-                  commandId="taxeditor-editor.command.moveimgup"
-                  label="Move Image Up In List"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isImage">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="taxeditor-editor.command.moveimgdown"
-                  label="Move Image Down In List"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isImage">
-                  </reference>
-               </visibleWhen>
-            </command>
             <separator
                   name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterNew"
                   visible="true">
             </separator>
             <command
-                  commandId="eu.etaxonomy.taxeditor.description.commands.deletedescription"
-                  label="Delete Description"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isInDescription">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="taxeditor-editor.command.deleteImageGallery"
-                  label="Delete Image Gallery"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isInImageGallery">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="taxeditor-editor.command.deleteImage"
-                  label="Delete Image"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isImage">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.deleteDescriptionElement"
+                  commandId="org.eclipse.ui.edit.delete"
                   label="Delete"
                   style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isNonImageElement">
-                  </reference>
-               </visibleWhen>
             </command>
             <separator
                   name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterDelete"
             </command>
          </menuContribution>
       </extension>
+   <extension
+         point="org.eclipse.ui.bindings">   
+      <scheme
+            description="The default key binding scheme for the Taxonomic Editor"
+            id="eu.etaxonomy.taxeditor.bindings.scheme.default"
+            name="Taxonomic Editor Default Key Bindings">
+      </scheme>
+   </extension>
+      <extension
+            point="org.eclipse.ui.handlers">
+         <handler
+               class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteDescriptionHandler"
+               commandId="org.eclipse.ui.edit.delete">
+            <activeWhen>
+               <reference
+                     definitionId="isDeletable">
+               </reference>
+            </activeWhen>
+         </handler>
+      </extension>
       <extension
             point="org.eclipse.ui.commands">
          <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.CreateDescriptionElementHandler"
+               defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionElementHandler"
                id="eu.etaxonomy.taxeditor.editor.description.createDescriptionElement"
                name="Create Description Element">
          </command>
          <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.DeleteDescriptionElementHandler"
-               id="eu.etaxonomy.taxeditor.editor.name.deleteDescriptionElement"
-               name="Delete Description Element">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.AddDescriptionHandler"
+               defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.AddDescriptionHandler"
                id="eu.etaxonomy.taxeditor.description.commands.adddescription"
                name="New Description">
          </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.DeleteDescriptionHandler"
-               id="eu.etaxonomy.taxeditor.description.commands.deletedescription"
-               name="Delete Description">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.AddImageGalleryHandler"
-               id="taxeditor-editor.command.newimagegallery"
-               name="New Image Gallery">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.DeleteDescriptionHandler"
-               id="taxeditor-editor.command.deleteImageGallery"
-               name="Delete Image Gallery">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.CreateImageListHandler"
-               id="taxeditor-editor.neworderedimagelist"
-               name="New Ordered Image List">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.CreateImageHandler"
-               id="taxeditor-editor.newimage"
-               name="New Image">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.MoveImageDownInListHandler"
-               id="taxeditor-editor.command.moveimgdown"
-               name="Move Image Down In List">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.MoveImageUpInListHandler"
-               id="taxeditor-editor.command.moveimgup"
-               name="Move Image Up In List">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.DeleteImageHandler"
-               id="taxeditor-editor.command.deleteImage"
-               name="Delete Image">
-         </command>
       </extension>
       <extension
             point="org.eclipse.core.expressions.definitions">
          <definition
-               id="isEmptySelection">
-            <with
-                  variable="activeMenuSelection">
-               <count
-                     value="0">
-               </count>
-            </with>
-         </definition>
-         <definition
-               id="isInImageGallery">
+               id="isDeletable">
             <with
                   variable="activeMenuSelection">
                <test
-                     property="taxeditor-editor.descriptions.propertyTester.isInImageGallery">
+                     property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isDeletable">
                </test>
             </with>
          </definition>
          <definition
-               id="isInImageList">
+               id="isMedia">
             <with
                   variable="activeMenuSelection">
                <test
-                     property="taxeditor-editor.descriptions.propertyTester.isInImageList">
+                     property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isMedia">
                </test>
             </with>
          </definition>
          <definition
-               id="isImage">
+               id="isDescription">
             <with
                   variable="activeMenuSelection">
                <test
-                     property="taxeditor-editor.descriptions.propertyTester.isImage">
+                     property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isDescription">
                </test>
             </with>
          </definition>
          <definition
-               id="isInDescription">
+               id="isDescriptionElement">
             <with
                   variable="activeMenuSelection">
                <test
-                     property="taxeditor-editor.descriptions.propertyTester.isInDescription">
+                     property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isDescriptionElement">
                </test>
             </with>
          </definition>
          <definition
-               id="isNonImageElement">
+               id="isFeatureNodeContainer">
             <with
                   variable="activeMenuSelection">
                <test
-                     property="taxeditor-editor.descriptions.propertyTester.isNonImageElement">
+                     property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isFeatureNodeContainer">
                </test>
             </with>
          </definition>
       <extension
             point="org.eclipse.core.expressions.propertyTesters">
          <propertyTester
-               class="eu.etaxonomy.taxeditor.editor.descriptiontree.handler.DescriptionsMenuPropertyTester"
-               id="taxeditor-editor.descriptions.PropertyTester"
-               namespace="taxeditor-editor.descriptions.propertyTester"
-               properties="isInImageGallery,isInImageList,isImage,isInDescription,isNonImageElement"
+               class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DescriptionsMenuPropertyTester"
+               id="eu.etaxonomy.taxeditor.descriptions.PropertyTester"
+               namespace="eu.etaxonomy.taxeditor.descriptions.propertyTester"
+               properties="isMedia,isDescription,isDescriptionElement,isDeletable,isFeatureNodeContainer"
                type="org.eclipse.jface.viewers.TreeSelection">
          </propertyTester>
       </extension>
-      <extension
-            point="org.eclipse.ui.views">
-         <view
-               allowMultiple="false"
-               class="eu.etaxonomy.taxeditor.namerelationsview.NameRelationsView"
-               id="taxeditor-editor.namerelationsview"
-               name="Name Relations"
-               restorable="true">
-         </view>
-         <view
-               allowMultiple="false"
-               class="eu.etaxonomy.taxeditor.propertysheet.tabbed.TabbedPropertyView"
-               id="eu.etaxonomy.taxeditor.views.tabbedPropertiesView"
-               name="Tabbed Properties"
-               restorable="true">
-         </view>
-      </extension>
       <extension
             point="org.eclipse.ui.commands">
          <command
                name="New Editor">
          </command>
       </extension>
+      <extension
+            point="org.eclipse.ui.menus">
+         <menuContribution
+               locationURI="popup:eu.etaxonomy.taxeditor.editor.view.media">
+            <command
+                  commandId="taxeditor-editor.command.newimagegallery"
+                  label="New Image Gallery"
+                  style="push">
+            </command>
+            <separator
+                  name="taxeditor-editor.separator1"
+                  visible="true">
+            </separator>
+            <command
+                  commandId="taxeditor-editor.newimage"
+                  label="New Image"
+                  style="push">
+            </command>
+            <command
+                  commandId="taxeditor-editor.command.moveimgdown"
+                  label="Move Image Up In List"
+                  style="push">
+               <visibleWhen>
+                  <reference
+                        definitionId="isMedia">
+                  </reference>
+               </visibleWhen>
+            </command>
+            <command
+                  commandId="taxeditor-editor.command.moveimgup"
+                  label="Move Image Down In List"
+                  style="push">
+               <visibleWhen>
+                  <reference
+                        definitionId="isMedia">
+                  </reference>
+               </visibleWhen>
+            </command>
+            <separator
+                  name="taxeditor-editor.separator2"
+                  visible="true">
+            </separator>
+            <command
+                  commandId="org.eclipse.ui.edit.delete"
+                  label="Delete"
+                  style="push">
+            </command>
+            <command
+                  commandId="org.eclipse.ui.file.save"
+                  label="Save"
+                  style="push">
+            </command>
+         </menuContribution>
+      </extension>
+      <extension
+            point="org.eclipse.ui.commands">
+         <command
+               defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageDownInListHandler"
+               id="taxeditor-editor.command.moveimgdown"
+               name="Move Image Down In List">
+         </command>
+         <command
+               defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.AddImageGalleryHandler"
+               id="taxeditor-editor.command.newimagegallery"
+               name="New Image Gallery">
+         </command>
+         <command
+               defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.CreateMediaHandler"
+               id="taxeditor-editor.newimage"
+               name="New Image">
+         </command>
+         <command
+               defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageUpInListHandler"
+               id="taxeditor-editor.command.moveimgup"
+               name="Move Image Up In List">
+         </command>
+      </extension>
+      <extension
+            point="org.eclipse.ui.newWizards">
+         <wizard
+               category="eu.etaxonomy.taxeditor.new.category.cdm"
+               class="eu.etaxonomy.taxeditor.editor.newWizard.NewReferenceWizard"
+               hasPages="true"
+               id="eu.etaxonomy.taxeditor.new.reference"
+               name="Reference">
+         </wizard>
+         <wizard
+               category="eu.etaxonomy.taxeditor.new.category.cdm"
+               class="eu.etaxonomy.taxeditor.editor.newWizard.NewNonViralNameWizard"
+               hasPages="true"
+               id="eu.etaxonomy.taxeditor.new.nonViralName"
+               name="Name">
+         </wizard>
+         <wizard
+               category="eu.etaxonomy.taxeditor.new.category.cdm"
+               class="eu.etaxonomy.taxeditor.editor.newWizard.NewTeamWizard"
+               hasPages="true"
+               id="eu.etaxonomy.taxeditor.new.team"
+               name="Team">
+         </wizard>
+         <wizard
+               category="eu.etaxonomy.taxeditor.new.category.cdm"
+               class="eu.etaxonomy.taxeditor.editor.newWizard.NewPersonWizard"
+               hasPages="true"
+               id="eu.etaxonomy.taxeditor.new.person"
+               name="Person">
+         </wizard>
+         <wizard
+               category="eu.etaxonomy.taxeditor.new.category.cdm"
+               class="eu.etaxonomy.taxeditor.editor.newWizard.NewDerivedUnitBaseWizard"
+               hasPages="true"
+               id="eu.etaxonomy.taxeditor.new.specimen"
+               name="Specimen">
+         </wizard>
+      </extension>
+      <extension
+            point="org.eclipse.ui.menus">
+         <menuContribution
+               locationURI="menu:eu.etaxonomy.navigation.menu.new?after=eu.etaxonomy.navigation.menu.new.separator1">
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.command.new.reference"
+                  label="Reference"
+                  style="push">
+            </command>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.command.new.name"
+                  label="Name"
+                  style="push">
+            </command>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.command.new.team"
+                  label="Team"
+                  style="push">
+            </command>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.command.new.person"
+                  label="Person"
+                  style="push">
+            </command>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.command.new.specimen"
+                  label="Specimen"
+                  style="push">
+            </command>
+         </menuContribution>
+      </extension>
+      <extension
+            point="org.eclipse.ui.commands">
+         <command
+               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewReferenceHandler"
+               id="eu.etaxonomy.taxeditor.editor.command.new.reference"
+               name="New Reference">
+         </command>
+         <command
+               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewNameHandler"
+               id="eu.etaxonomy.taxeditor.editor.command.new.name"
+               name="New Name">
+         </command>
+         <command
+               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewTeamHandler"
+               id="eu.etaxonomy.taxeditor.editor.command.new.team"
+               name="New Team">
+         </command>
+         <command
+               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewPersonHandler"
+               id="eu.etaxonomy.taxeditor.editor.command.new.person"
+               name="New Person">
+         </command>
+         <command
+               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewSpecimenHandler"
+               id="eu.etaxonomy.taxeditor.editor.command.new.specimen"
+               name="New Specimen">
+         </command>
+      </extension>
 </plugin>