From 55788d536b765aef9dbf2c600702db13568b3e3f Mon Sep 17 00:00:00 2001 From: Fabian Reimeier Date: Fri, 18 May 2018 17:31:25 +0200 Subject: [PATCH] fixed npe --- .../cdm/vaadin/util/DistributionStatusQuery.java | 10 +++++----- .../distributionStatus/DistributionTableViewBean.java | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionStatusQuery.java b/src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionStatusQuery.java index a2e3a110..f64e1165 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionStatusQuery.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionStatusQuery.java @@ -46,11 +46,11 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode; */ public class DistributionStatusQuery implements Query{ public static final String DTYPE_COLUMN = "DTYPE"; - public static final String ID_COLUMN = "id"; - public static final String UUID_COLUMN = "uuid"; - public static final String CLASSIFICATION_COLUMN = "classification"; - public static final String RANK_COLUMN = "Rang"; - public static final String TAXON_COLUMN = "Taxon"; + public static final String ID_COLUMN = "ID"; + public static final String UUID_COLUMN = "UUID"; + public static final String CLASSIFICATION_COLUMN = "CLASSIFICATION"; + public static final String RANK_COLUMN = "RANK"; + public static final String TAXON_COLUMN = "TAXON"; private CdmRepository repo; private QueryDefinition definition; diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java index d03825d3..253c7d9a 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java @@ -57,6 +57,7 @@ import eu.etaxonomy.cdm.vaadin.permission.AccessRestrictedView; import eu.etaxonomy.cdm.vaadin.util.CdmQueryFactory; import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper; import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil; +import eu.etaxonomy.cdm.vaadin.util.DistributionStatusQuery; import eu.etaxonomy.cdm.vaadin.view.AbstractPageView; /** @@ -341,7 +342,7 @@ public class DistributionTableViewBean Object selectedItemId = DistributionTableViewBean.this.table.getValue(); // Object selectedItemId = DistributionTableViewBean.this.grid.getSelectedRow(); if(selectedItemId!=null){ - final UUID uuid = UUID.fromString(table.getContainerDataSource().getItem(selectedItemId).getItemProperty("uuid").getValue().toString()); + final UUID uuid = UUID.fromString(table.getContainerDataSource().getItem(selectedItemId).getItemProperty(CdmQueryFactory.UUID_COLUMN).getValue().toString()); // final UUID uuid = (UUID) selectedItemId; Taxon taxon = HibernateProxyHelper.deproxy(CdmSpringContextHelper.getTaxonService().load(uuid), Taxon.class); // Taxon taxon = (Taxon) CdmSpringContextHelper.getTaxonService().load(uuid); -- 2.34.1