From c9b8e315616b6e7fc6ce306f3d963e161d7c100b Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Wed, 9 Jul 2014 07:47:18 +0000
Subject: [PATCH] Added the management of ambiguity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-table-widget@98508 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../validation/ValidationsTasksPanel.java     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTasksPanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTasksPanel.java
index 28f098f..4a0ddd6 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTasksPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTasksPanel.java
@@ -394,7 +394,8 @@ public class ValidationsTasksPanel extends FramedPanel implements
 				ValidationDto v = (ValidationDto) d;
 				Log.debug("ValidationDto: [" + v.getId() + ", "
 						+ v.getDescription() + ", " + v.getValid() + ", "
-						+ v.getConditionCode() + ", " + v.getValidationColumnColumnId() + ", "
+						+ v.getConditionCode() + ", "
+						+ v.getValidationColumnColumnId() + ", "
 						+ v.getInvocation() + "]");
 				if (v.getValid()) {
 
@@ -405,7 +406,8 @@ public class ValidationsTasksPanel extends FramedPanel implements
 						Long op = invocationS.getOperationId();
 						if (op.compareTo(OperationsId.ChangeToDimensionColumn
 								.toLong()) == 0) {
-							if (v.getConditionCode() == ConditionCode.MissingValueOnExternalReference) {
+							if (v.getConditionCode() == ConditionCode.MissingValueOnExternalReference ||
+									v.getConditionCode() == ConditionCode.AmbigousValueOnExternalReference) {
 								WidgetRequestEvent widgetRequestEvent = new WidgetRequestEvent(
 										WidgetRequestType.CURATIONBYREPLACEBATCHDIALOG);
 								widgetRequestEvent.setTrId(trId);
@@ -512,7 +514,8 @@ public class ValidationsTasksPanel extends FramedPanel implements
 					ValidationDto v = (ValidationDto) selected;
 					Log.debug("ValidationDto: [" + v.getId() + ", "
 							+ v.getDescription() + ", " + v.getValid() + ", "
-							+ v.getConditionCode() + ", " + v.getValidationColumnColumnId() + ", "
+							+ v.getConditionCode() + ", "
+							+ v.getValidationColumnColumnId() + ", "
 							+ v.getInvocation() + "]");
 					if (v.getInvocation() != null) {
 						if (v.getValid()) {
@@ -526,15 +529,18 @@ public class ValidationsTasksPanel extends FramedPanel implements
 							// TODO Add all cases
 							if (op.compareTo(OperationsId.ChangeToDimensionColumn
 									.toLong()) == 0
-									&& v.getConditionCode() == ConditionCode.MissingValueOnExternalReference) {
+									&& (v.getConditionCode() == ConditionCode.MissingValueOnExternalReference || 
+											v.getConditionCode() == ConditionCode.AmbigousValueOnExternalReference)) {
 								contextMenu.clear();
 								contextMenu.add(resolveItem);
 								contextMenu.add(resumeItem);
 								tree.setContextMenu(contextMenu);
 							} else {
-								contextMenu.clear();
-								contextMenu.add(resumeItem);
-								tree.setContextMenu(contextMenu);
+								
+									contextMenu.clear();
+									contextMenu.add(resumeItem);
+									tree.setContextMenu(contextMenu);
+								
 							}
 						}
 					} else {