Project

General

Profile

Revision fb4c53d2

IDfb4c53d299ba68eee5752838ae0d13eb123f5a69
Parent 6ead69e0
Child 6e4d44c5

Added by Patrick Plitzner over 2 years ago

ref #7095 Added more paths to property path loading

  • removed deproxying in some cases

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java
151 151

  
152 152
    private static final List<String> WS_PROPERTY_PATH = Arrays.asList(new String[] {
153 153
            "descriptions", //$NON-NLS-1$
154
            "descriptions.describedSpecimenOrObservation", //$NON-NLS-1$
155
            "descriptions.describedSpecimenOrObservation.gatheringEvent", //$NON-NLS-1$
156
            "descriptions.describedSpecimenOrObservation.gatheringEvent.actor", //$NON-NLS-1$
154 157
            "descriptions.descriptionElements", //$NON-NLS-1$
158
            "descriptions.descriptionElements.stateData", //$NON-NLS-1$
159
            "descriptions.descriptionElements.stateData.state", //$NON-NLS-1$
155 160
            "descriptions.descriptionElements.inDescription", //$NON-NLS-1$
156 161
            "descriptions.descriptionElements.inDescription.descriptionElements", //$NON-NLS-1$
157 162
            "descriptions.descriptionElements.feature", //$NON-NLS-1$
163
            "representations", //$NON-NLS-1$
164
            "descriptiveSystem", //$NON-NLS-1$
165
            "taxonSubtreeFilter", //$NON-NLS-1$
166
            "taxonSubtreeFilter.parent", //$NON-NLS-1$
167
            "taxonSubtreeFilter.classification", //$NON-NLS-1$
168
            "taxonSubtreeFilter.taxon", //$NON-NLS-1$
169
            "taxonSubtreeFilter.taxon.name", //$NON-NLS-1$
170
            "taxonSubtreeFilter.taxon.name.rank", //$NON-NLS-1$
171
            "geoFilter", //$NON-NLS-1$
172
            "minRank", //$NON-NLS-1$
173
            "maxRank", //$NON-NLS-1$
158 174
    });
159 175

  
160 176
    private static final String CHARACTER_MATRIX_STATE_PROPERTIES = "characterMatrixState.properties"; //$NON-NLS-1$
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/RowWrapper.java
55 55
        this.description = description;
56 56

  
57 57
        IOccurrenceService occurrenceService = CdmStore.getService(IOccurrenceService.class);
58
        SpecimenOrObservationBase<?> specimen = HibernateProxyHelper.deproxy(description.getDescribedSpecimenOrObservation(), SpecimenOrObservationBase.class);
58
        SpecimenOrObservationBase<?> specimen = description.getDescribedSpecimenOrObservation();
59 59
        //supplemental information
60 60
        if(specimen!=null){
61 61
            Collection<TaxonBase<?>> associatedTaxa = occurrenceService.listAssociatedTaxa(specimen, null, null, null, null);
......
126 126

  
127 127
    public void setDataValueForFeature(Feature feature, Object newValue){
128 128
        /* Only CategoricalData is handled here because for QuantitativeData the value
129
         * is set in the ModifyListener of the swt.Text in the CEllEditor
129
         * is set in the ModifyListener of the swt.Text in the CellEditor
130 130
         * for each StatisticalMeasure. So no need to set it again here.
131 131
         */
132 132
        DescriptionElementBase descriptionElementBase = featureToElementMap.get(feature);
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/supplementalInfo/SupplementalInfoDisplayConverter.java
41 41
    @Override
42 42
    public Object canonicalToDisplayValue(Object canonicalValue) {
43 43
        String displayValue = "";
44
        if(canonicalValue instanceof TaxonNode){
44
        if(HibernateProxyHelper.isInstanceOf(canonicalValue, TaxonNode.class)){
45 45
            TaxonNode node = (TaxonNode)canonicalValue;
46 46
            displayValue = node.getTaxon().getName().getTitleCache();
47 47
        }
48
        else if(canonicalValue instanceof Taxon){
48
        else if(HibernateProxyHelper.isInstanceOf(canonicalValue,  Taxon.class)){
49 49
            if(matrix.isTreeView()){
50 50
                return "---";
51 51
            }

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)