From 494670918ff8b8b88e5c77c28211ea3f57bd460b Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 9 Jul 2014 16:43:42 +0000 Subject: [PATCH] Added the management of ambiguity git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@98537 82a268e6-3cf1-43bd-a215-b396298e98cf --- .gwt/.gwt-log | 160 ++++++++++++++++++ .../client/batch/ReplaceBatchDialog.java | 8 +- .../client/batch/ReplaceBatchPanel.java | 13 +- 3 files changed, 175 insertions(+), 6 deletions(-) diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index cbb48a0..0423342 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -4986,3 +4986,163 @@ 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: 5 seconds) + 40% complete (ETR: 5 seconds) + 40% complete (ETR: 5 seconds) + 40% complete (ETR: 5 seconds) + 40% complete (ETR: 5 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 10.94 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 +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 40% complete (ETR: 7 seconds) + 40% complete (ETR: 7 seconds) + 40% complete (ETR: 7 seconds) + 40% complete (ETR: 7 seconds) + 40% complete (ETR: 7 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 15.17 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 +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 20% complete (ETR: 18 seconds) + 20% complete (ETR: 18 seconds) + 20% complete (ETR: 18 seconds) + 30% complete (ETR: 14 seconds) + 40% complete (ETR: 11 seconds) + 50% complete (ETR: 8 seconds) + 60% complete (ETR: 7 seconds) + 70% complete (ETR: 5 seconds) + 80% complete (ETR: 3 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 27.60 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 +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 30% complete (ETR: 8 seconds) + 30% complete (ETR: 8 seconds) + 30% complete (ETR: 8 seconds) + 30% complete (ETR: 8 seconds) + 40% complete (ETR: 8 seconds) + 50% complete (ETR: 6 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 16.37 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 +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2719 units from cache. +Compiling... + 10% complete (ETR: 24 seconds) + 10% complete (ETR: 25 seconds) + 20% complete (ETR: 22 seconds) + 30% complete (ETR: 15 seconds) + 40% complete (ETR: 10 seconds) + 50% complete (ETR: 8 seconds) + 60% complete (ETR: 5 seconds) + 70% complete (ETR: 4 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 17.56 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/batch/ReplaceBatchDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchDialog.java index c9825cf..35ce108 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchDialog.java @@ -9,6 +9,7 @@ import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; +import org.gcube.portlets.user.td.gwtservice.shared.task.InvocationS; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskResumeSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; @@ -60,8 +61,11 @@ public class ReplaceBatchDialog extends Window implements this.trId = trId; this.requestProperties = requestProperties; this.eventBus = eventBus; - taskId = (String) requestProperties.getMap().get( - Constants.REQUEST_PROPERTIES_TASKID); + + + InvocationS invocationS=(InvocationS) requestProperties.getMap().get( + Constants.REQUEST_PROPERTIES_INVOCATIONS); + taskId = invocationS.getTaskId(); Log.debug("Resume TaskId:" + taskId); initWindow(); diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchPanel.java index 014afdc..f3a1889 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchPanel.java @@ -16,6 +16,7 @@ import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; +import org.gcube.portlets.user.td.gwtservice.shared.task.InvocationS; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.gwtservice.shared.tr.ConditionCode; import org.gcube.portlets.user.td.gwtservice.shared.tr.DimensionRow; @@ -142,10 +143,14 @@ public class ReplaceBatchPanel extends FramedPanel implements this.trId = trId; this.requestProperties = requestProperties; this.eventBus = eventBus; - columnId = (String) requestProperties.getMap().get( - Constants.REQUEST_PROPERTIES_COLUMNID); - refColumn = (RefColumn) requestProperties.getMap().get( - Constants.REQUEST_PROPERTIES_REFCOLUMN); + + InvocationS invocationS=(InvocationS) requestProperties.getMap().get( + Constants.REQUEST_PROPERTIES_INVOCATIONS); + + columnId = invocationS.getColumnId(); + + refColumn = invocationS.getRefColumn(); + conditionCode = (ConditionCode) requestProperties.getMap().get( Constants.REQUEST_PROPERTIES_CONDITIONCODE); validationColumnColumnId = (String) requestProperties.getMap().get(