Merge branch 'release/5.19.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / uses / UsesContentProvider.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java
index b49e0496f4114b7383fb3b5509fc98f3c797ef10..ac47d9c717d2bc3f6f5793c142d852bbef9fec73 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java
@@ -14,26 +14,24 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.Set;\r
 \r
-import eu.etaxonomy.cdm.api.service.ITermService;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.description.IDescribable;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.editor.UsageTermCollection;\r
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveContentProvider;\r
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.store.UsageTermCollection;\r
 \r
 /**\r
  * The class provides the required content to the Uses View\r
  * @author a.theys\r
  * @created mar 13, 2012\r
- * @version 1.0\r
  */\r
 public class UsesContentProvider extends DescriptiveContentProvider {\r
 \r
-       Set<MarkerType> markerTypes = new HashSet<MarkerType>();\r
+       Set<MarkerType> markerTypes = new HashSet<>();\r
 \r
        /**\r
         * <p>Constructor for DescriptiveContentProvider.</p>\r
@@ -52,18 +50,17 @@ public class UsesContentProvider extends DescriptiveContentProvider {
         * @return\r
         */\r
        @Override\r
-       protected List<DescriptionBase> getDescriptions(IDescribable<?> parentElement) {\r
-           List<DescriptionBase> descriptions = new ArrayList<DescriptionBase>();\r
+       protected List<DescriptionBase<?>> getDescriptions(IDescribable<?> parentElement) {\r
+           List<DescriptionBase<?>> descriptions = new ArrayList<>();\r
            if(parentElement instanceof Taxon){\r
                Taxon taxon = (Taxon) parentElement;\r
                this.markerTypes.addAll(CdmStore.getTermManager().getPreferredTerms(MarkerType.class));\r
-               for(DescriptionBase description : taxon.getDescriptions()){\r
+               for(DescriptionBase<?> description : taxon.getDescriptions()){\r
                    if(! description.isImageGallery()){\r
-                       MarkerType useMarkertype = (MarkerType) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseMarkerType);\r
-                       Set<Marker> descriptionMarkers = description.getMarkers();\r
+                       Set<Marker> descriptionMarkers = description.getMarkers();\r
                        if(descriptionMarkers != null) {\r
                            for (Marker marker: descriptionMarkers) {\r
-                               if(marker.getMarkerType().equals(useMarkertype)) {\r
+                               if(marker.getMarkerType() != null && marker.getMarkerType().getUuid().equals(UsageTermCollection.uuidUseMarkerType)) {\r
                                    descriptions.add(description);\r
                                }\r
                            }\r
@@ -73,5 +70,4 @@ public class UsesContentProvider extends DescriptiveContentProvider {
            }\r
                return descriptions;\r
        }\r
-\r
-}\r
+}
\ No newline at end of file