revert changes because cdmlib still missing

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/OpenDefinedTermEditorHandlerE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/OpenDefinedTermEditorHandlerE4.java
index e52052896cf3a8bb6735d73af55ec95d51b5f325..85baded07541f2b9c570a4e2392ef57ca9846c68 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/OpenDefinedTermEditorHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/OpenDefinedTermEditorHandlerE4.java
@@ -28,10 +28,14 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.description.Feature;
+import eu.etaxonomy.cdm.model.description.MeasurementUnit;
+import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dto.FeatureDto;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
+import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.editor.definedterm.e4.DefinedTermEditorE4;
 import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;
@@ -121,37 +125,37 @@ public class OpenDefinedTermEditorHandlerE4 {
                        FeatureDto featureDto = null;
                        if (term instanceof Feature){
                            Feature feature = (Feature)term;
-//                         Set<TermVocabularyDto> supportedCategoricalEnumerations = new HashSet<>();
-//                         if (feature.getSupportedCategoricalEnumerations()!= null && !feature.getSupportedCategoricalEnumerations().isEmpty()){
-//                             for (TermVocabulary voc: feature.getSupportedCategoricalEnumerations()){
-//                                 supportedCategoricalEnumerations.add(TermVocabularyDto.fromVocabulary(voc));
-//                             }
-//                         }
-//                         Set<TermVocabularyDto> recommendedModifierEnumerations = new HashSet<>();
-//                         if (feature.getRecommendedModifierEnumeration()!= null && !feature.getRecommendedModifierEnumeration().isEmpty()){
-//                            for (TermVocabulary voc: feature.getRecommendedModifierEnumeration()){
-//                                recommendedModifierEnumerations.add(TermVocabularyDto.fromVocabulary(voc));
-//                            }
-//                        }
-//                         Set<TermDto> recommendedMeasurementUnits = new HashSet<>();
-//                        if (feature.getRecommendedMeasurementUnits()!= null && !feature.getRecommendedMeasurementUnits().isEmpty()){
-//                            for (MeasurementUnit unit: feature.getRecommendedMeasurementUnits()){
-//                                recommendedMeasurementUnits.add(TermDto.fromTerm(unit));
-//                            }
-//                        }
-//                        Set<TermDto> recommendedStatisticalMeasures = new HashSet<>();
-//                        if (feature.getRecommendedStatisticalMeasures()!= null && !feature.getRecommendedStatisticalMeasures().isEmpty()){
-//                            for (StatisticalMeasure measures: feature.getRecommendedStatisticalMeasures()){
-//                                recommendedStatisticalMeasures.add(TermDto.fromTerm(measures));
-//                            }
-//                        }
-
-
-//                         featureDto = new FeatureDto(term.getUuid(), term.getRepresentations(), term.getPartOf() != null? term.getPartOf().getUuid(): null, term.getKindOf() != null? term.getKindOf().getUuid(): null,
-//                                 term.getVocabulary()!= null? term.getVocabulary().getUuid(): null, null, term.getIdInVocabulary(), term.getVocabulary()!= null?term.getVocabulary().getRepresentations(): null, feature.isAvailableForTaxon(),
-//                                 feature.isAvailableForTaxonName(),feature.isAvailableForOccurrence(), feature.getTitleCache(), feature.isSupportsCategoricalData(), feature.isSupportsQuantitativeData(),
-//                                 supportedCategoricalEnumerations, recommendedModifierEnumerations, recommendedMeasurementUnits, recommendedStatisticalMeasures);
-                        featureDto = FeatureDto.fromFeature(feature);
+                           Set<TermVocabularyDto> supportedCategoricalEnumerations = new HashSet<>();
+                           if (feature.getSupportedCategoricalEnumerations()!= null && !feature.getSupportedCategoricalEnumerations().isEmpty()){
+                               for (TermVocabulary voc: feature.getSupportedCategoricalEnumerations()){
+                                   supportedCategoricalEnumerations.add(TermVocabularyDto.fromVocabulary(voc));
+                               }
+                           }
+                           Set<TermVocabularyDto> recommendedModifierEnumerations = new HashSet<>();
+                           if (feature.getRecommendedModifierEnumeration()!= null && !feature.getRecommendedModifierEnumeration().isEmpty()){
+                            for (TermVocabulary voc: feature.getRecommendedModifierEnumeration()){
+                                recommendedModifierEnumerations.add(TermVocabularyDto.fromVocabulary(voc));
+                            }
+                        }
+                           Set<TermDto> recommendedMeasurementUnits = new HashSet<>();
+                        if (feature.getRecommendedMeasurementUnits()!= null && !feature.getRecommendedMeasurementUnits().isEmpty()){
+                            for (MeasurementUnit unit: feature.getRecommendedMeasurementUnits()){
+                                recommendedMeasurementUnits.add(TermDto.fromTerm(unit));
+                            }
+                        }
+                        Set<TermDto> recommendedStatisticalMeasures = new HashSet<>();
+                        if (feature.getRecommendedStatisticalMeasures()!= null && !feature.getRecommendedStatisticalMeasures().isEmpty()){
+                            for (StatisticalMeasure measures: feature.getRecommendedStatisticalMeasures()){
+                                recommendedStatisticalMeasures.add(TermDto.fromTerm(measures));
+                            }
+                        }
+
+
+                           featureDto = new FeatureDto(term.getUuid(), term.getRepresentations(), term.getPartOf() != null? term.getPartOf().getUuid(): null, term.getKindOf() != null? term.getKindOf().getUuid(): null,
+                                   term.getVocabulary()!= null? term.getVocabulary().getUuid(): null, null, term.getIdInVocabulary(), term.getVocabulary()!= null?term.getVocabulary().getRepresentations(): null, feature.isAvailableForTaxon(),
+                                   feature.isAvailableForTaxonName(),feature.isAvailableForOccurrence(), feature.getTitleCache(), feature.isSupportsCategoricalData(), feature.isSupportsQuantitativeData(),
+                                   supportedCategoricalEnumerations, recommendedModifierEnumerations, recommendedMeasurementUnits, recommendedStatisticalMeasures);
+//                        featureDto = FeatureDto.fromFeature(feature);
 
                        }else{
                            dto = TermDto.fromTerm(term);