From f675d9c37f46b74bb1cc29ec326382e502efe74a Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 30 Mar 2015 15:47:19 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@113803 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 1 + pom.xml | 8 ++------ .../user/td/columnwidget/ColumnWidget.gwt.xml | 4 ++-- .../client/store/ColumnTypeCodeStore.java | 12 ++++++++++++ .../user/td/columnwidget/ColumnWidget.gwt.xml | 16 +++++++++++++++- 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.classpath b/.classpath index 05bbe04..d41851e 100644 --- a/.classpath +++ b/.classpath @@ -40,6 +40,7 @@ + diff --git a/pom.xml b/pom.xml index 2dac5d6..7d23da2 100644 --- a/pom.xml +++ b/pom.xml @@ -100,12 +100,7 @@ ${gwtVersion} - - com.google.gwt - gwt-dev - ${gwtVersion} - - + - + diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnTypeCodeStore.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnTypeCodeStore.java index 8431242..1cebddc 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnTypeCodeStore.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/store/ColumnTypeCodeStore.java @@ -40,6 +40,12 @@ public class ColumnTypeCodeStore implements Serializable { public static ArrayList getColumnTypeCodes(TRId trId) { store = new ArrayList(); + if(trId==null|| trId.getTableTypeName()==null){ + Log.debug("Attention no valid table type, trId:"+trId); + store.add(annotation); + return store; + } + if (trId.getTableTypeName().compareTo("Generic") == 0) { store.add(annotation); store.add(attribute); @@ -75,6 +81,12 @@ public class ColumnTypeCodeStore implements Serializable { public static ArrayList getColumnTypeCodesForAddColumn(TRId trId) { store = new ArrayList(); + if(trId==null|| trId.getTableTypeName()==null){ + Log.debug("Attention no valid table type, trId:"+trId); + store.add(annotation); + return store; + } + if (trId.getTableTypeName().compareTo("Generic") == 0) { store.add(annotation); store.add(attribute); diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml index f50f1a9..217b81c 100644 --- a/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml @@ -28,7 +28,21 @@ - + + + + + + + + + + +