ref #10410: create new default description of not exist

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / checklist / e4 / DistributionColumnAccessor.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionColumnAccessor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionColumnAccessor.java
index a7b94fb16dd6b82dfb8d24f5ff8436e4307d6bc5..e67d890b9c35a144a65fda337985bf097616a2d5 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionColumnAccessor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionColumnAccessor.java
@@ -134,25 +134,28 @@ public class DistributionColumnAccessor implements IColumnPropertyAccessor<Taxon
                     Set<TaxonDescription> descs = taxonWrapper.getDescriptionsWrapper().getDescriptions();
                     TaxonDescription desc = null;
                     if (descs.size() >= 1){
-                        if (PreferencesUtil.getDescriptionForChecklistEditor().equals(DistributionDescription.AlwaysDefault)){
-                            Iterator<TaxonDescription> itDesc = descs.iterator();
-                            while(itDesc.hasNext()) {
-                                TaxonDescription next = itDesc.next();
-                                if (next.isDefault()) {
-                                    desc = next;
-                                    break;
-                                }
+                        Iterator<TaxonDescription> itDesc = descs.iterator();
+                        while(itDesc.hasNext()) {
+                            TaxonDescription next = itDesc.next();
+                            if (next.isDefault()) {
+                                desc = next;
+                                break;
                             }
                         }
+
                         if (desc == null) {
-                            //TODO: handle other preferences
-                            desc = descs.iterator().next();
+                            if (PreferencesUtil.getDescriptionForChecklistEditor().equals(DistributionDescription.AlwaysDefault)){
+                                desc = TaxonDescription.NewInstance();
+                                desc.setDefault(true);
+                                taxonWrapper.getDescriptionsWrapper().getDescriptions().add(desc);
+                            }else {
+                                desc = descs.iterator().next();
+                            }
                         }
                     }else {
                         desc = TaxonDescription.NewInstance();
-                        if (PreferencesUtil.getDescriptionForChecklistEditor().equals(DistributionDescription.AlwaysDefault)){
-                            desc.setDefault(true);
-                        }
+                        desc.setDefault(true);
+
                         taxonWrapper.getDescriptionsWrapper().getDescriptions().add(desc);
                     }
                     if (editor.getDefaultSource() != null){