set default values in aggregation conf wizard for the new attributes

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java
index 26b9d3f5f169c5e990ca6fae87468b20d9cf47c6..c26a0178f7f994402913c978beab7d4fcfce7591 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java
@@ -139,9 +139,7 @@ public class AggregationHandler {
                     DescriptiveDataSet dataSet = (DescriptiveDataSet) result.getCdmEntity();
                     dataSet = matrix.getCdmEntitySession().load(dataSet, true);
                     // update local dataset
-                    DescriptiveDataSetBaseDto dto = DescriptiveDataSetBaseDto.fromDescriptiveDataSet(dataSet);
-                    matrix.setDescriptiveDataSet(dto);
-                    matrix.loadDescriptions(true, true);
+                    matrix.loadDescriptions(false, true);
                 }
             } catch (InterruptedException e) {
                 return;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
index c0663e61fe46778f8ae7b9e7652a86f386090dc7..0cc49f57e99aca6c2e08fa6a88c2628481bb24e5 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
@@ -187,15 +187,16 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
         
         checkIncludeUnpublishedTaxa = new Button(scopeComposite, SWT.CHECK);
         checkIncludeUnpublishedTaxa.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_UNPUBLISHED_TAXA);
+        checkIncludeUnpublishedTaxa.setSelection(true);
         
         
         checkIncludeDefaultDescriptions = new Button(scopeComposite, SWT.CHECK);
         checkIncludeDefaultDescriptions.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_DEFAULT_DESCRIPTION);
-        
+        checkIncludeDefaultDescriptions.setSelection(true);
         
         checkIncludeLiteratureDescriptions = new Button(scopeComposite, SWT.CHECK);
         checkIncludeLiteratureDescriptions.setText(Messages.StructuredDescriptionAggregationWizardPage_SELECT_LITERATURE_DESCRIPTION);
-        
+        checkIncludeLiteratureDescriptions.setSelection(true);
         
         Label higherRankLabel = new Label(control, SWT.NULL);
         higherRankLabel.setText(Messages.DistributionAggregationWizardPage_HIGHEST_RANK);