Project

General

Profile

« Previous | Next » 

Revision 137d0ad0

Added by Andreas Müller over 3 years ago

ref #9280 adapt TaxEditor to new Term.getLabel()

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
210 210
            @Override
211 211
            public String getText(Object element){
212 212
                if (element instanceof AggregationMode){
213
                   return ((AggregationMode)element).getMessage();
213
                   return ((AggregationMode)element).getLabel();
214 214
                }
215 215
                return null;
216 216
            }
......
257 257
        comboSourceModeWithinTaxon.setText(Messages.DistributionAggregationWizardPage_AGGREGATION_MODE);
258 258

  
259 259
        for (AggregationSourceMode mode :AggregationSourceMode.list(AggregationMode.WithinTaxon, AggregationType.StructuredDescription) ){
260
            comboSourceModeWithinTaxon.add(mode.getMessage());
261
            comboSourceModeWithinTaxon.setData(mode.getMessage(), mode);
260
            comboSourceModeWithinTaxon.add(mode.getLabel());
261
            comboSourceModeWithinTaxon.setData(mode.getLabel(), mode);
262 262

  
263 263
        }
264 264

  
......
274 274
        comboSourceModeChildParent.setText(Messages.DistributionAggregationWizardPage_AGGREGATION_MODE);
275 275

  
276 276
        for (AggregationSourceMode mode :AggregationSourceMode.list(AggregationMode.ToParent, AggregationType.StructuredDescription) ){
277
            comboSourceModeChildParent.add(mode.getMessage());
278
            comboSourceModeChildParent.setData(mode.getMessage(), mode);
277
            comboSourceModeChildParent.add(mode.getLabel());
278
            comboSourceModeChildParent.setData(mode.getLabel(), mode);
279 279

  
280 280
        }
281 281

  
......
302 302
        List<String> typeStrings = new ArrayList<>();
303 303
        OriginalSourceType[] typeArray = OriginalSourceType.values();
304 304
        Arrays.sort(typeArray, new OriginalSourceTypeComparator(null));
305
        Arrays.stream(typeArray).forEach(p ->typeMap.put(p.getMessage(), p));
306
        Arrays.stream(typeArray).forEach(p ->typeStrings.add(p.getMessage()));
307
        typeStrings.remove(OriginalSourceType.NomenclaturalReference.getMessage());
305
        Arrays.stream(typeArray).forEach(p ->typeMap.put(p.getLabel(), p));
306
        Arrays.stream(typeArray).forEach(p ->typeStrings.add(p.getLabel()));
307
        typeStrings.remove(OriginalSourceType.NomenclaturalReference.getLabel());
308 308
        sourceTypeViewer.setInput(typeStrings);
309
        sourceTypeViewer.setChecked(OriginalSourceType.PrimaryMediaSource.getMessage(), true);
310
        sourceTypeViewer.setChecked(OriginalSourceType.PrimaryTaxonomicSource.getMessage(), true);
309
        sourceTypeViewer.setChecked(OriginalSourceType.PrimaryMediaSource.getLabel(), true);
310
        sourceTypeViewer.setChecked(OriginalSourceType.PrimaryTaxonomicSource.getLabel(), true);
311 311
        sourceTypeViewer.getTable().setEnabled(false);
312 312
        setControl(control);
313 313
    }

Also available in: Unified diff