merge-update from trunk

diff --combined eu.etaxonomy.taxeditor.editor/plugin.xml
index a60cd7be3a91d33569e92f046c27394e401fd122,21fe756d109de4a24c9894073eedae466cbba132..a02e50e30d43e339e60e2871afa5cead2c00859b
--- 1/eu.etaxonomy.taxeditor.editor/plugin.xml
--- 2/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -58,36 -58,27 +58,36 @@@
              id="eu.etaxonomy.taxeditor.editor.group.authority"
              name="Cdm Authority Editor">
        </editor>
 +      <editor
 +            class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
 +            default="false"
 +            id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
 +            name="Derivate View">
 +      </editor>
     </extension>
        <extension
              point="org.eclipse.ui.views">
           <view
                 allowMultiple="false"
 +               category="eu.etaxonomy.taxeditor.editor.category"
                 class="eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart"
                 icon="icons/address-book-new.png"
                 id="eu.etaxonomy.taxeditor.editor.view.descriptive"
-                name="Descriptive"
+                name="Factual Data"
                 restorable="true">
           </view>
            <view
 -               allowMultiple="false"
 -               class="eu.etaxonomy.taxeditor.editor.view.uses.UsesViewPart"
 -               icon="icons/leaf.png"
 -               id="eu.etaxonomy.taxeditor.editor.view.uses"
 -               name="Uses"
 -               restorable="true">
 +                allowMultiple="false"
 +                category="eu.etaxonomy.taxeditor.editor.category"
 +                class="eu.etaxonomy.taxeditor.editor.view.uses.UsesViewPart"
 +                icon="icons/leaf.png"
 +                id="eu.etaxonomy.taxeditor.editor.view.uses"
 +                name="Uses"
 +                restorable="true">
           </view>
           <view
                 allowMultiple="false"
 +               category="eu.etaxonomy.taxeditor.editor.category"
                 class="eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart"
                 icon="icons/camera-photo.png"
                 id="eu.etaxonomy.taxeditor.editor.view.media"
@@@ -95,24 -86,18 +95,24 @@@
                 restorable="true">
           </view>
           <view
 +               category="eu.etaxonomy.taxeditor.editor.category"
                 class="eu.etaxonomy.taxeditor.editor.view.concept.ConceptViewPart"
                 id="eu.etaxonomy.taxeditor.editor.view.concept"
                 name="Concept Relations"
                 restorable="true">
           </view>
           <view
 +               category="eu.etaxonomy.taxeditor.editor.category"
                 class="eu.etaxonomy.taxeditor.editor.view.concept.graph.ConceptGraphView"
                 icon="icons/address-book-new.png"
                 id="eu.etaxonomy.taxeditor.editor.view.concept.graph"
                 name="Concept Graph"
                 restorable="true">
           </view>
 +         <category
 +               id="eu.etaxonomy.taxeditor.editor.category"
 +               name="Taxonomic Editor">
 +         </category>
        </extension>
     <extension
           point="org.eclipse.ui.elementFactories">
@@@ -159,7 -144,7 +159,7 @@@
           </separator>
           <command
                 commandId="org.eclipse.ui.views.showView"
-                label="Descriptive"
+                label="Factual Data"
                 style="push">
              <parameter
                    name="org.eclipse.ui.views.showView.viewId"
@@@ -477,7 -462,7 +477,7 @@@
              locationURI="popup:eu.etaxonomy.taxeditor.editor.view.descriptive">
           <command
                 commandId="eu.etaxonomy.taxeditor.description.commands.adddescription"
-                label="New Descriptive Data"
+                label="New Factual Data"
                 style="push">
           </command>
           <separator
@@@ -555,22 -540,6 +555,22 @@@
                 style="push">
           </command>
        </menuContribution>
 +      <menuContribution
 +            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
 +         <menu
 +               label="New Derivate">
 +            <dynamic
 +                  class="eu.etaxonomy.taxeditor.editor.view.derivate.CreateDerivateContextMenu"
 +                  id="eu.etaxonomy.taxeditor.editor.view.derivate.CreateDerivateContextMenu">
 +            </dynamic>
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isSpecimenOrObservation">
 +               </reference>
 +            </visibleWhen>
 +         </menu>
 +      </menuContribution>
        
        
        
@@@ -927,7 -896,7 +927,7 @@@
        </command>
        <category
              id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
-             name="-- Descriptive">
+             name="-- Factual">
        </category>
        <command
              categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
@@@ -1091,11 -1060,6 +1091,11 @@@
              id="eu.etaxonomy.taxeditor.group.cdmauthorities.edit"
              name="Edit CDM Authorities">
        </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
 +            id="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
 +            name="Open Derivate View">
 +      </command>
     </extension>
     <extension
           point="org.eclipse.core.expressions.definitions">
@@@ -1225,15 -1189,6 +1225,15 @@@
              </test>
           </with>
        </definition>
 +      <definition
 +            id="isSpecimenOrObservation">
 +         <with
 +               variable="selection">
 +            <test
 +                  property="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester.isSpecimenOrObservation">
 +            </test>
 +         </with>
 +      </definition>
     </extension>
     <extension
           point="org.eclipse.core.expressions.propertyTesters">
@@@ -1258,13 -1213,6 +1258,13 @@@
              properties="isGroup"
              type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
        </propertyTester>
 +      <propertyTester
 +            class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester"
 +            id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester"
 +            namespace="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester"
 +            properties="isSpecimenOrObservation"
 +            type="org.eclipse.jface.viewers.TreeSelection">
 +      </propertyTester>
     </extension>
     <extension
           point="org.eclipse.ui.bindings">   

diff --combined eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
index 663792a260fc2669dcdd70d40c91f6186e46d1f5,77400dbe35342db62043b3b1b441a7c97eed7504..f05cbe1c497ca468f04b11402df608d77165402e
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
@@@ -27,10 -27,10 +27,10 @@@ import eu.etaxonomy.taxeditor.preferenc
  import eu.etaxonomy.taxeditor.store.CdmStore;
  import eu.etaxonomy.taxeditor.store.StoreUtil;
  import eu.etaxonomy.taxeditor.store.TermManager;
 +import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
  import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
  import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
  import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
 -import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
  import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
  import eu.etaxonomy.taxeditor.ui.element.ISelectable;
  import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
@@@ -244,7 -244,7 +244,7 @@@ public class TermComboElement<T extend
                                if (term.getTitleCache() != null) {
                                        label = term.getTitleCache();
                                        StoreUtil.warn(getClass(),
-                                                       "Term does not have a representation: " + term
+                                                       "Term does not have a default language representation: " + label
                                                                        + ", " + term.getUuid());
                                } else {
                                        label = "Unknown";
@@@ -275,9 -275,7 +275,7 @@@
  
        /*
         * (non-Javadoc)
-        * 
-        * @see
-        * eu.etaxonomy.taxeditor.forms.IEnableableFormElement#setEnabled(boolean)
+        * @see eu.etaxonomy.taxeditor.forms.IEnableableFormElement#setEnabled(boolean)
         */
        /** {@inheritDoc} */
        public void setEnabled(boolean enabled) {
@@@ -307,7 -305,11 +305,11 @@@
         * @return a {@link java.lang.String} object.
         */
        protected String getLabel(T term) {
-               return term.getLabel(CdmStore.getDefaultLanguage());
+               if (term == null){
+                       return "";
+               }else{
+                       return term.getLabel(CdmStore.getDefaultLanguage());
+               }
        }
  
        /**