From ce2f05a72c63ef7bb58e2ad33836c55d6f03e056 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 14 May 2014 17:28:02 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@95697 82a268e6-3cf1-43bd-a215-b396298e98cf --- .gwt/.gwt-log | 32 +++++++++++++++++++ .../DimensionRowSelectionDialog.java | 25 +++++++++++---- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index 49a2e3b..e994bd8 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -3354,3 +3354,35 @@ Compiling... Compilation completed in 0.00 seconds Removing invalidated units Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 40% complete (ETR: 6 seconds) + 40% complete (ETR: 6 seconds) + 40% complete (ETR: 6 seconds) + 40% complete (ETR: 6 seconds) + 40% complete (ETR: 6 seconds) + 50% complete (ETR: 5 seconds) + 60% complete (ETR: 4 seconds) + 70% complete (ETR: 3 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 18.54 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2719 cached/archived units. Used 2719 / 2719 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/DimensionRowSelectionDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/DimensionRowSelectionDialog.java index 6bed4c5..028aebc 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/DimensionRowSelectionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/DimensionRowSelectionDialog.java @@ -90,8 +90,17 @@ public class DimensionRowSelectionDialog extends Window { gridPanel.setHeaderVisible(false); gridPanel.setSelectionModel(SelectionMode.SINGLE); Log.debug("SetVisibleOnlyColumn"); - gridPanel.setVisibleOnlyColumn(column.getColumnId()); - + if(column.isViewColumn()){ + gridPanel.setVisibleOnlyColumn(column.getColumnId()); + } else { + if(column.getRelationship()!=null){ + //Used a Dimension Column + gridPanel.setVisibleOnlyColumn(column.getRelationship().getTargetColumnId()); + } else { + UtilsGXT3.alert("Attention", "No valid view column associated with this column!"); + return; + } + } v.add(new FieldLabel(value, "Value"), new VerticalLayoutData(1, -1)); v.add(gridPanel, new VerticalLayoutData(1, 1)); @@ -140,8 +149,14 @@ public class DimensionRowSelectionDialog extends Window { if (column.isViewColumn()) { tableId = column.getColumnViewData().getTargetTableId(); } else { - tableId = Long.valueOf(column.getTrId().getTableId()); - } + if(column.getRelationship()!=null){ + //Used a Dimension Column + tableId = Long.valueOf(column.getRelationship().getTargetTableId()); + } else { + UtilsGXT3.alert("Attention", "No valid table associated with this column!"); + return; + } + } TableId tableOpening = new TableId(Constants.TDX_DATASOURCE_FACTORY_ID, String.valueOf(tableId)); @@ -150,8 +165,6 @@ public class DimensionRowSelectionDialog extends Window { } - - protected void initWindow() { setWidth(WIDTH);