Project

General

Profile

« Previous | Next » 

Revision 8dcaccaf

Added by Patrick Plitzner about 6 years ago

ref #7095 Fix summary for CategoricalData

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/AggregationConfiguration.java
8 8
 */
9 9
package eu.etaxonomy.taxeditor.editor.workingSet.matrix;
10 10

  
11
import java.util.Collection;
12 11
import java.util.HashSet;
13 12
import java.util.Set;
14 13

  
......
23 22
import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
24 23

  
25 24
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
25
import eu.etaxonomy.cdm.model.description.CategoricalData;
26 26
import eu.etaxonomy.cdm.model.description.Feature;
27 27
import eu.etaxonomy.cdm.model.description.QuantitativeData;
28 28

  
......
99 99
            for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
100 100
                Object dataValue = AggregationConfiguration.this.dataProvider.getDataValue(columnIndex,
101 101
                        rowIndex);
102
                if(dataValue instanceof Collection){
103
                    states.addAll((Collection) dataValue);
102
                if(dataValue instanceof CategoricalData){
103
                    states.addAll(((CategoricalData) dataValue).getStatesOnly());
104 104
                }
105 105
            }
106 106
            return StringUtils.join(states, ", "); //$NON-NLS-1$

Also available in: Unified diff