From: Patric Plitzner
Date: Wed, 26 Nov 2014 14:20:29 +0000 (+0000)
Subject: - activated filter in factual data view for displaying only IndividualsAssociations
X-Git-Tag: 3.6.0~343
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/3177a94904d04cfde544817ccd30060bbbf70368?ds=sidebyside
- activated filter in factual data view for displaying only IndividualsAssociations
---
diff --git a/.gitattributes b/.gitattributes
index 279de7dbe..03a3a3081 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -357,6 +357,7 @@ eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png -text
eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif -text
eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text
eu.etaxonomy.taxeditor.editor/icons/leaf_detail.png -text
+eu.etaxonomy.taxeditor.editor/icons/link_obj.gif -text
eu.etaxonomy.taxeditor.editor/icons/xper64.png -text
eu.etaxonomy.taxeditor.editor/p2.inf -text
eu.etaxonomy.taxeditor.editor/plugin.xml -text
diff --git a/eu.etaxonomy.taxeditor.editor/icons/link_obj.gif b/eu.etaxonomy.taxeditor.editor/icons/link_obj.gif
new file mode 100644
index 000000000..5fd9c9494
Binary files /dev/null and b/eu.etaxonomy.taxeditor.editor/icons/link_obj.gif differ
diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index c0c7fc3dd..e0dc27452 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -823,15 +823,16 @@
-
+
@@ -961,18 +962,10 @@
-
+
-
+
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
index b24ee1704..ddbb3525a 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
@@ -67,10 +67,15 @@ public class DescriptiveContentProvider implements ITreeContentProvider {
DescriptionBase> description = (DescriptionBase>) parentElement;
FeatureNodeContainerTree containerTree = getContainerTreeForDesription(description);
-
- if(getChildren(containerTree).length>=0){
- return containerTree.getRoot().getChildren().toArray();
- }
+ List children = containerTree.getRoot().getChildren();
+ //filter out containers with no children
+ List childrenWithChildren = new ArrayList();
+ for (FeatureNodeContainer featureNodeContainer : children) {
+ if(getChildren(featureNodeContainer).length>0){
+ childrenWithChildren.add(featureNodeContainer);
+ }
+ }
+ return childrenWithChildren.toArray();
}
}
else if (parentElement instanceof FeatureNodeContainer){