From: Patric Plitzner
Date: Tue, 31 Mar 2015 07:05:37 +0000 (+0000)
Subject: - added check for open derivate editor command
X-Git-Tag: 3.6.0~132
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/ce33189b03dee6a104311e93e93e31912b9e42ad?hp=5f05d1e168f1934debfc42616bf9845f7b6fbc14
- added check for open derivate editor command
- set title of factual data view corresponding to the current selection
---
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">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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">
&& 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)){