From 27b026de262ebb1882b80d116fc08f05c679b5a7 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 27 Mar 2014 17:26:24 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@93675 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../ReplaceColumnProgressUpdater.java | 2 +- .../client/replace/ReplacePanel.java | 21 +++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressUpdater.java index 857895e..a09cedd 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ReplaceColumnProgressUpdater.java @@ -44,7 +44,7 @@ public class ReplaceColumnProgressUpdater extends Timer { } public void onSuccess(ReplaceColumnMonitor result) { - Log.info("retrieved LabelColumnMonitor: " + Log.info("retrieved ReplaceColumnMonitor: " + result.getStatus()); switch (result.getStatus()) { case INITIALIZING: diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplacePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplacePanel.java index 83bc67e..cb52022 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplacePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/replace/ReplacePanel.java @@ -54,7 +54,9 @@ public class ReplacePanel extends FramedPanel implements protected CellData cellData; protected ReplaceDialog parent; protected ColumnData column; - + + protected DimensionRow dimensionRow; + protected ReplaceColumnSession replaceColumnSession; private ComboBox comboDimensionType; private FieldLabel comboDimensionTypeLabel; @@ -71,6 +73,7 @@ public class ReplacePanel extends FramedPanel implements this.cellData = cellData; this.trId = trId; this.eventBus = eventBus; + dimensionRow=null; Log.debug("ReplacePanel:[" + trId + ", CellData:" + cellData + "]"); initPanel(); retrieveColumn(); @@ -199,7 +202,7 @@ public class ReplacePanel extends FramedPanel implements btnApply.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - Log.debug("Pressed Apply"); + Log.debug("Pressed Apply For Dimension"); replaceValueForDimension(); } @@ -212,7 +215,7 @@ public class ReplacePanel extends FramedPanel implements btnClose.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - Log.debug("Pressed Close"); + Log.debug("Pressed Close For Dimension"); close(); } @@ -251,11 +254,11 @@ public class ReplacePanel extends FramedPanel implements } protected void replaceValueForDimension() { - DimensionRow dimRow = comboDimensionType.getCurrentValue(); - if (dimRow == null) { + Log.debug("Current Dimension Row in combo: "+dimensionRow); + if (dimensionRow == null) { UtilsGXT3.alert("Attention", "Select a valid value"); } else { - callReplaceValue(dimRow.getRowId()); + callReplaceValue(dimensionRow.getRowId()); } } @@ -306,6 +309,7 @@ public class ReplacePanel extends FramedPanel implements } protected void callReplaceValue(String rValue) { + Log.debug("callRepalceValue is Dimension: "+isDimension); if (isDimension) { replaceColumnSession = new ReplaceColumnSession( value.getCurrentValue(), rValue, trId, column, @@ -379,18 +383,23 @@ public class ReplacePanel extends FramedPanel implements @Override public void selected(DimensionRow dimRow) { Log.debug("Selected dimension row: " + dimRow); + dimensionRow=dimRow; comboDimensionType.setValue(dimRow); } @Override public void aborted() { + Log.debug("Aborted"); comboDimensionType.setValue(null); + dimensionRow=null; } @Override public void failed(String reason, String detail) { + Log.debug("Failed: "+reason+" "+detail); comboDimensionType.setValue(null); + dimensionRow=null; } }