From 6dc521f74b2c2caadb8cd81f96828527c113e09e Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 31 Mar 2015 17:19:01 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widget-common-event@113845 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../td/widgetcommonevent/shared/tr/column/ColumnDataType.java | 2 ++ .../td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java index 0c723d0..4aba143 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java @@ -34,6 +34,8 @@ public enum ColumnDataType { * @return */ public static ColumnDataType getColumnDataTypeFromId(String id) { + if(id==null||id.isEmpty()) return null; + for (ColumnDataType columnDataType : values()) { if (columnDataType.id.compareToIgnoreCase(id) == 0) { return columnDataType; diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java index aac89fb..a79a43d 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java @@ -56,6 +56,8 @@ public enum ColumnTypeCode { * @return */ public static ColumnTypeCode getColumnTypeCodeFromId(String id) { + if(id==null|| id.isEmpty()) return null; + for (ColumnTypeCode columnTypeCode : values()) { if (columnTypeCode.id.compareToIgnoreCase(id) == 0) { return columnTypeCode;