fixed npe

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 a2e3a110c0b6049d382aed69e0e9e07fe283ee8f..f64e1165a983835524182f64b5cc483df0f1ed38 100644 (file)
--- 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 d03825d30a0a54da6933e452d5bb6fc6707131e2..253c7d9aa4d1ee58ef9050ef7391b898abba6464 100644 (file)
--- 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);