From ce33189b03dee6a104311e93e93e31912b9e42ad Mon Sep 17 00:00:00 2001
From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Tue, 31 Mar 2015 07:05:37 +0000
Subject: [PATCH]  - added check for open derivate editor command  - set title
 of factual data view corresponding to the current selection

---
 eu.etaxonomy.taxeditor.editor/plugin.xml      | 28 ++++++++++++++-----
 .../view/descriptive/DescriptiveViewPart.java |  3 ++
 .../DescriptionsMenuPropertyTester.java       | 16 ++++++++++-
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 20254cc3e..7b5080db3 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -641,12 +641,17 @@
                style="push">
             <visibleWhen
                   checkEnabled="true">
-               <with
-                     variable="selection">
-                  <count
-                        value="+">
-                  </count>
-               </with>
+               <and>
+                  <with
+                        variable="selection">
+                     <count
+                           value="+">
+                     </count>
+                  </with>
+                  <reference
+                        definitionId="isIndividualsAssociation">
+                  </reference>
+               </and>
             </visibleWhen>
          </command>
          <command
@@ -1577,6 +1582,15 @@
             </test>
          </with>
       </definition>
+      <definition
+            id="isIndividualsAssociation">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isIndividualsAssociation">
+            </test>
+         </with>
+      </definition>
    </extension>
    <extension
          point="org.eclipse.core.expressions.propertyTesters">
@@ -1591,7 +1605,7 @@
             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,isImageGallery,isTaxonEditor,isBulkEditor,isDerivateEditor"
+            properties="isMedia,isDescription,isDescriptionElement,isDeletable,isFeatureNodeContainer,isImageGallery,isTaxonEditor,isBulkEditor,isDerivateEditor, isIndividualsAssociation"
             type="org.eclipse.jface.viewers.TreeSelection">
       </propertyTester>
       <propertyTester
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
index 6e2a29d37..c51d85658 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
@@ -215,6 +215,7 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP
 	@Override
     protected void selectionChanged_internal(IWorkbenchPart part, ISelection selection) {
 		if(AbstractUtility.getActiveEditor() == null){
+		    setPartName("Factual Data");
 			showEmptyPage();
 			return;
 		}
@@ -243,10 +244,12 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP
 		        && ((IStructuredSelection) selection).getFirstElement() instanceof IDescribable<?>
 		        && part instanceof IPartContentHasFactualData  && !(((IStructuredSelection) selection).getFirstElement() instanceof SpecimenOrObservationBase && part instanceof BulkEditor)){
 		    featureNodeContainerCache.clear();
+	        setPartName("Factual Data: " + ((IStructuredSelection) selection).getFirstElement());
 		    showViewer(part, (IStructuredSelection) selection);
 		    return;
 		}
 		else{
+            setPartName("Factual Data");
 		    showEmptyPage();
 		}
 	}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DescriptionsMenuPropertyTester.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DescriptionsMenuPropertyTester.java
index 1e0ad222c..3030ef4a3 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DescriptionsMenuPropertyTester.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DescriptionsMenuPropertyTester.java
@@ -8,6 +8,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
+import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
@@ -27,6 +28,7 @@ public class DescriptionsMenuPropertyTester extends PropertyTester {
 	private static final String MEDIA = "isMedia";
 	private static final String FEATURE_NODE_CONTAINER = "isFeatureNodeContainer";
 	private static final String DESCRIPTION = "isDescription";
+	private static final String INDIVIDUALS_ASSOCIATION = "isIndividualsAssociation";
 	private static final String DESCRIPTION_ELEMENT = "isDescriptionElement";
 	private static final String DELETABLE = "isDeletable";
 	private static final String IMAGE_GALLERY = "isImageGallery";
@@ -68,6 +70,9 @@ public class DescriptionsMenuPropertyTester extends PropertyTester {
 		else if(DESCRIPTION.equals(property)){
 			return isDescription(selectedElements);
 		}
+		else if(INDIVIDUALS_ASSOCIATION.equals(property)){
+		    return isIndividualsAssociation(selectedElements);
+		}
 		else if(DESCRIPTION_ELEMENT.equals(property)){
 			return isDescriptionElement(selectedElements);
 		}
@@ -84,7 +89,7 @@ public class DescriptionsMenuPropertyTester extends PropertyTester {
 
 	private boolean isImageGallery(Object[] selectedElements) {
 		for (Object object : selectedElements){
-			if(!(object instanceof DescriptionBase) || !((DescriptionBase) object).isImageGallery()){
+			if(!(object instanceof DescriptionBase) || !((DescriptionBase<?>) object).isImageGallery()){
 				return false;
 			}
 		}
@@ -136,6 +141,15 @@ public class DescriptionsMenuPropertyTester extends PropertyTester {
 		return true;
 	}
 
+	private boolean isIndividualsAssociation(Object[] selectedElements) {
+	    for (Object object : selectedElements){
+	        if(!(object instanceof IndividualsAssociation)){
+	            return false;
+	        }
+	    }
+	    return true;
+	}
+
 	private boolean isMedia(Object[] selectedElements) {
 		for (Object object : selectedElements){
 			if(!(object instanceof Media)){
-- 
2.34.1