Project

General

Profile

« Previous | Next » 

Revision 47ce5432

Added by Patrick Plitzner about 5 years ago

ref #8146 Fix potential class cast exceptions

  • replace deprecated FeatureNode.getFeature() with getTerm()

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DynamicFeatureMenuE4.java
25 25

  
26 26
import eu.etaxonomy.cdm.api.service.IVocabularyService;
27 27
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
28
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
28 29
import eu.etaxonomy.cdm.model.common.Language;
29 30
import eu.etaxonomy.cdm.model.common.VocabularyEnum;
30 31
import eu.etaxonomy.cdm.model.description.DescriptionBase;
......
62 63
            FeatureTree featureTree = getFeatureTree((DescriptionBase<?>) selectedElement);
63 64

  
64 65
            for (FeatureNode childNode : featureTree.getRootChildren()) {
65
                createMenuItem(menu, childNode.getFeature(), globalLanguage);
66
                createMenuItem(menu, childNode.getTerm(), globalLanguage);
66 67
            }
67 68
        } else if (selectedElement instanceof FeatureNodeContainer) {
68 69
            FeatureNode featureNode = ((FeatureNodeContainer) selectedElement)
69 70
                    .getFeatureNode();
70 71

  
71 72
            // add the feature to the menu
72
            createMenuItem(menu, featureNode.getFeature(), globalLanguage);
73
            createMenuItem(menu, featureNode.getTerm(), globalLanguage);
73 74

  
74 75
            // add possible children to the menu
75 76
            for (FeatureNode childNode : featureNode.getChildNodes()) {
76
                createMenuItem(menu, childNode.getFeature(), globalLanguage);
77
                createMenuItem(menu, childNode.getTerm(), globalLanguage);
77 78
            }
78 79
        } else if (selectedElement instanceof DescriptionElementBase) {
79 80
            Feature feature = ((DescriptionElementBase) selectedElement)
......
82 83
        }
83 84
    }
84 85

  
85
    private void createMenuItem(MMenu menu, final Feature feature, Language globalLanguage) {
86
        final Feature deproxiedFeature = HibernateProxyHelper.deproxy(feature, Feature.class);
86
    private void createMenuItem(MMenu menu, final DefinedTermBase feature, Language globalLanguage) {
87
        final DefinedTermBase deproxiedFeature = HibernateProxyHelper.deproxy(feature, DefinedTermBase.class);
87 88

  
88 89
        String label = deproxiedFeature.getLabel(globalLanguage);
89 90
        if (label == null){

Also available in: Unified diff