ref #8679 Adapt to cdmlib changes

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
index dccb300f836dc97f9282082229e67033c9ea4c9d..2c0819c8c6f36982fad2b84ae1be61f8f6d5c3d5 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
@@ -34,7 +34,7 @@ import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
 import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.api.service.UpdateResult;
-import eu.etaxonomy.cdm.api.service.description.DescriptionAggregationConfigurationBase.AggregationMode;
+import eu.etaxonomy.cdm.api.service.description.AggregationMode;
 import eu.etaxonomy.cdm.api.service.description.StructuredDescriptionAggregationConfiguration;
 import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
 import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/AggregateDistributionForSubTreeHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/AggregateDistributionForSubTreeHandler.java
index aa6f4c0941315bd2b0eedd62503e9c435980d57f..c74934ee9471b66f0b61d8c5c5ddc687526faa1e 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/AggregateDistributionForSubTreeHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/AggregateDistributionForSubTreeHandler.java
@@ -28,7 +28,7 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
 
-import eu.etaxonomy.cdm.api.service.description.DescriptionAggregationConfigurationBase.AggregationMode;
+import eu.etaxonomy.cdm.api.service.description.AggregationMode;
 import eu.etaxonomy.cdm.api.service.description.DistributionAggregationConfiguration;
 import eu.etaxonomy.cdm.filter.TaxonNodeFilter;
 import eu.etaxonomy.cdm.model.taxon.Classification;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/DistributionAggregationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/DistributionAggregationWizardPage.java
index e558ca64a1ae4c9a5d4615bd79d7995d678896ea..d594486ea42455bae90146c8cc4bc3e54598b636 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/DistributionAggregationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/DistributionAggregationWizardPage.java
@@ -42,8 +42,8 @@ import org.eclipse.swt.widgets.Listener;
 import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.api.service.ITermTreeService;
-import eu.etaxonomy.cdm.api.service.description.DescriptionAggregationConfigurationBase.AggregationMode;
-import eu.etaxonomy.cdm.api.service.description.DescriptionAggregationConfigurationBase.SourceMode;
+import eu.etaxonomy.cdm.api.service.description.AggregationMode;
+import eu.etaxonomy.cdm.api.service.description.AggregationSourceMode;
 import eu.etaxonomy.cdm.api.service.description.DistributionAggregationConfiguration;
 import eu.etaxonomy.cdm.filter.LogicFilter;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
@@ -325,7 +325,7 @@ public class DistributionAggregationWizardPage extends WizardPage implements Lis
         sourceModeLabel.setText("Source mode");
         comboSourceMode = new Combo(control,  SWT.BORDER| SWT.READ_ONLY);
         comboSourceMode.setText(Messages.DistributionAggregationConfiguration_AggregationMode);
-        for (SourceMode mode :SourceMode.values()){
+        for (AggregationSourceMode mode :AggregationSourceMode.values()){
             comboSourceMode.add(mode.toString());
             comboSourceMode.setData(mode.toString(), mode);
         }
@@ -391,8 +391,8 @@ public class DistributionAggregationWizardPage extends WizardPage implements Lis
     @Override
     public void widgetSelected(SelectionEvent e) {
         if (e.getSource().equals(comboSourceMode)){
-            configurator.setToParentSourceMode((SourceMode)comboSourceMode.getData(comboSourceMode.getText()));
-            configurator.setWithinTaxonSourceMode((SourceMode)comboSourceMode.getData(comboSourceMode.getText()));
+            configurator.setToParentSourceMode((AggregationSourceMode)comboSourceMode.getData(comboSourceMode.getText()));
+            configurator.setWithinTaxonSourceMode((AggregationSourceMode)comboSourceMode.getData(comboSourceMode.getText()));
         }
 
         if (e.getSource().equals(comboAreaLevel)){
@@ -504,9 +504,9 @@ public class DistributionAggregationWizardPage extends WizardPage implements Lis
        return null;
    }
 
-   public SourceMode getSourceMode(){
+   public AggregationSourceMode getSourceMode(){
        if (StringUtils.isNotBlank(comboSourceMode.getText())){
-           return (SourceMode)comboSourceMode.getData(comboSourceMode.getText());
+           return (AggregationSourceMode)comboSourceMode.getData(comboSourceMode.getText());
        }
        return null;
    }