Project

General

Profile

« Previous | Next » 

Revision 19252634

Added by Andreas Müller almost 2 years ago

cleanup

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FeatureDto_.java
32 32
    private static final long serialVersionUID = -5138575401281727741L;
33 33

  
34 34

  
35
    private EnumSet<CdmClass> supportedDataTypes = EnumSet.of(CdmClass.TEXT_DATA);
36

  
37
    private Set<TermVocabularyDto> recommendedModifierEnumeration = new HashSet<>();
38

  
39
    private Set<TermDto> recommendedStatisticalMeasures = new HashSet<>();
40

  
41
    private Set<TermVocabularyDto> supportedCategoricalEnumerations = new HashSet<>();
42

  
43
    private Set<TermDto> recommendedMeasurementUnits = new HashSet<>();
44

  
35 45
    public FeatureDto_(UUID uuid, Set<Representation> representations, TermType termType, UUID partOfUuid, UUID kindOfUuid,
36 46
            UUID vocabularyUuid, String idInVocabulary, String titleCache, EnumSet<CdmClass> supportedDataTypes,
37 47
            Set<TermVocabularyDto> recommendedModifierEnumeration, Set<TermDto> recommendedStatisticalMeasures,
......
71 81
            dto.supportedDataTypes.remove(CdmClass.TEXT_DATA);
72 82
        }
73 83
        TermVocabularyDto vocDto;
74
        for (TermVocabulary voc: feature.getRecommendedModifierEnumeration()){
84
        for (TermVocabulary<?> voc: feature.getRecommendedModifierEnumeration()){
75 85
            vocDto = TermVocabularyDto.fromVocabulary(voc);
76 86
            dto.recommendedModifierEnumeration.add(vocDto);
77 87
        }
......
80 90
            termDto = TermDto.fromTerm(term);
81 91
            dto.recommendedStatisticalMeasures.add(termDto);
82 92
        }
83
        for (TermVocabulary voc: feature.getSupportedCategoricalEnumerations()){
93
        for (TermVocabulary<?> voc: feature.getSupportedCategoricalEnumerations()){
84 94
            vocDto = TermVocabularyDto.fromVocabulary(voc);
85 95
            dto.supportedCategoricalEnumerations.add(vocDto);
86 96
        }
......
94 104

  
95 105
    }
96 106

  
97
    private EnumSet<CdmClass> supportedDataTypes = EnumSet.of(CdmClass.TEXT_DATA);
98

  
99
    private Set<TermVocabularyDto> recommendedModifierEnumeration = new HashSet<>();
100

  
101
    private Set<TermDto> recommendedStatisticalMeasures = new HashSet<>();
102

  
103
    private Set<TermVocabularyDto> supportedCategoricalEnumerations = new HashSet<>();
104

  
105
    private Set<TermDto> recommendedMeasurementUnits = new HashSet<>();
106

  
107 107

  
108 108
    public EnumSet<CdmClass> getSupportedDataTypes() {
109 109
        return supportedDataTypes;
110 110
    }
111

  
112

  
113 111
    public void setSupportedDataTypes(EnumSet<CdmClass> supportedDataTypes) {
114 112
        this.supportedDataTypes = supportedDataTypes;
115 113
    }
116 114

  
117

  
118 115
    public Set<TermVocabularyDto> getRecommendedModifierEnumeration() {
119 116
        return recommendedModifierEnumeration;
120 117
    }
121

  
122

  
123 118
    public void setRecommendedModifierEnumeration(Set<TermVocabularyDto> recommendedModifierEnumeration) {
124 119
        this.recommendedModifierEnumeration = recommendedModifierEnumeration;
125 120
    }
126 121

  
127

  
128 122
    public Set<TermDto> getRecommendedStatisticalMeasures() {
129 123
        return recommendedStatisticalMeasures;
130 124
    }
131

  
132

  
133 125
    public void setRecommendedStatisticalMeasures(Set<TermDto> recommendedStatisticalMeasures) {
134 126
        this.recommendedStatisticalMeasures = recommendedStatisticalMeasures;
135 127
    }
136 128

  
137

  
138 129
    public Set<TermVocabularyDto> getSupportedCategoricalEnumerations() {
139 130
        return supportedCategoricalEnumerations;
140 131
    }
141

  
142

  
143 132
    public void setSupportedCategoricalEnumerations(Set<TermVocabularyDto> supportedCategoricalEnumerations) {
144 133
        this.supportedCategoricalEnumerations = supportedCategoricalEnumerations;
145 134
    }
146 135

  
147

  
148 136
    public Set<TermDto> getRecommendedMeasurementUnits() {
149 137
        return recommendedMeasurementUnits;
150 138
    }
151

  
152

  
153 139
    public void setRecommendedMeasurementUnits(Set<TermDto> recommendedMeasurementUnits) {
154 140
        this.recommendedMeasurementUnits = recommendedMeasurementUnits;
155 141
    }
156

  
157

  
158

  
159
}
142
}

Also available in: Unified diff