Project

General

Profile

« Previous | Next » 

Revision 55788d53

Added by Fabian Reimeier almost 6 years ago

fixed npe

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionStatusQuery.java
46 46
 */
47 47
public class DistributionStatusQuery implements Query{
48 48
    public static final String DTYPE_COLUMN = "DTYPE";
49
    public static final String ID_COLUMN = "id";
50
    public static final String UUID_COLUMN = "uuid";
51
    public static final String CLASSIFICATION_COLUMN = "classification";
52
    public static final String RANK_COLUMN = "Rang";
53
    public static final String TAXON_COLUMN = "Taxon";
49
    public static final String ID_COLUMN = "ID";
50
    public static final String UUID_COLUMN = "UUID";
51
    public static final String CLASSIFICATION_COLUMN = "CLASSIFICATION";
52
    public static final String RANK_COLUMN = "RANK";
53
    public static final String TAXON_COLUMN = "TAXON";
54 54

  
55 55
    private CdmRepository repo;
56 56
    private QueryDefinition definition;
src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java
57 57
import eu.etaxonomy.cdm.vaadin.util.CdmQueryFactory;
58 58
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper;
59 59
import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil;
60
import eu.etaxonomy.cdm.vaadin.util.DistributionStatusQuery;
60 61
import eu.etaxonomy.cdm.vaadin.view.AbstractPageView;
61 62

  
62 63
/**
......
341 342
				Object selectedItemId = DistributionTableViewBean.this.table.getValue();
342 343
//				Object selectedItemId = DistributionTableViewBean.this.grid.getSelectedRow();
343 344
				if(selectedItemId!=null){
344
				    final UUID uuid = UUID.fromString(table.getContainerDataSource().getItem(selectedItemId).getItemProperty("uuid").getValue().toString());
345
				    final UUID uuid = UUID.fromString(table.getContainerDataSource().getItem(selectedItemId).getItemProperty(CdmQueryFactory.UUID_COLUMN).getValue().toString());
345 346
//					final UUID uuid = (UUID) selectedItemId;
346 347
					Taxon taxon = HibernateProxyHelper.deproxy(CdmSpringContextHelper.getTaxonService().load(uuid), Taxon.class);
347 348
//					Taxon taxon = (Taxon) CdmSpringContextHelper.getTaxonService().load(uuid);

Also available in: Unified diff