From 4e335a9e21e6bb7f436f5f12b1f40d6bbdb6f3bf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Wed, 17 Jan 2024 23:18:50 +0100
Subject: [PATCH] ref #10334 adapt vaadin to DescriptionBase.publish

---
 .../cdm/vaadin/util/DistributionStatusQuery.java  |  4 +++-
 .../DistributionTablePresenter.java               | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionStatusQuery.java b/src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionStatusQuery.java
index e45ea26e..ef452df0 100644
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionStatusQuery.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionStatusQuery.java
@@ -211,9 +211,11 @@ public class DistributionStatusQuery implements Query{
      * @return The distribution information of the given {@code taxon}.
      */
     private List<Distribution> getDistributions(Taxon taxon) {
+
+        boolean includeUnpublished = true;
         Set<Feature> setFeature = new HashSet<>(Arrays.asList(Feature.DISTRIBUTION()));
         List<Distribution> listTaxonDescription = CdmSpringContextHelper.getDescriptionService()
-                .listDescriptionElementsForTaxon(taxon, setFeature, null, null, null, DESCRIPTION_INIT_STRATEGY);
+                .listDescriptionElementsForTaxon(taxon, setFeature, null, includeUnpublished, null, null, DESCRIPTION_INIT_STRATEGY);
         return listTaxonDescription;
     }
 
diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTablePresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTablePresenter.java
index 04f0802c..f5ee0386 100644
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTablePresenter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTablePresenter.java
@@ -177,7 +177,10 @@ public class DistributionTablePresenter
      * @return List of {@link DescriptionElementBase}s for the specified {@link Taxon} and {@link Feature} set.
      */
     public List<DescriptionElementBase> listDescriptionElementsForTaxon(Taxon taxon, Set<Feature> setFeature){
-        List<DescriptionElementBase> listDescriptionElementsForTaxon = CdmSpringContextHelper.getDescriptionService().listDescriptionElementsForTaxon(taxon, setFeature, null, null, null, DESCRIPTION_INIT_STRATEGY);
+
+        boolean includeUnpublished = true;
+        List<DescriptionElementBase> listDescriptionElementsForTaxon = CdmSpringContextHelper.getDescriptionService().listDescriptionElementsForTaxon(
+                taxon, setFeature, null, includeUnpublished, null, null, DESCRIPTION_INIT_STRATEGY);
         sort(listDescriptionElementsForTaxon);
         return listDescriptionElementsForTaxon;
     }
@@ -231,9 +234,12 @@ public class DistributionTablePresenter
      * @return {@link Distribution} of the given {@link Taxon}.
      */
     private List<Distribution> getDistributions(Taxon taxon) {
+
+        boolean includeUnpublished = true;
         Set<Feature> setFeature = new HashSet<>(Arrays.asList(Feature.DISTRIBUTION()));
         List<Distribution> listTaxonDescription = CdmSpringContextHelper.getDescriptionService()
-                .listDescriptionElementsForTaxon(taxon, setFeature, null, null, null, DESCRIPTION_INIT_STRATEGY);
+                .listDescriptionElementsForTaxon(taxon, setFeature, null, includeUnpublished,
+                        null, null, DESCRIPTION_INIT_STRATEGY);
         return listTaxonDescription;
     }
 
@@ -407,8 +413,11 @@ private List<String> getAbbreviatedNamedAreas() {
 
 // TODO: Currently unused. Remove?
 private HashMap<DescriptionElementBase, Distribution> getDistribution(DefinedTermBase dt, Taxon taxon) {
+
+    boolean includeUnpublished = true;
     Set<Feature> setFeature = new HashSet<>(Arrays.asList(Feature.DISTRIBUTION()));
-    List<DescriptionElementBase> listTaxonDescription = CdmSpringContextHelper.getDescriptionService().listDescriptionElementsForTaxon(taxon, setFeature, null, null, null, DESCRIPTION_INIT_STRATEGY);
+    List<DescriptionElementBase> listTaxonDescription = CdmSpringContextHelper.getDescriptionService()
+            .listDescriptionElementsForTaxon(taxon, setFeature, null, includeUnpublished, null, null, DESCRIPTION_INIT_STRATEGY);
     HashMap<DescriptionElementBase, Distribution> map = null;
     for(DescriptionElementBase deb : listTaxonDescription){
         if(deb instanceof Distribution){
-- 
2.34.1