gCubeSystem
/
tabular-data-table-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Giancarlo Panichi 2014-07-09 07:47:18 +00:00 committed by Giancarlo Panichi
parent c9ebc06ee8
commit c9b8e31561
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/gcube/portlets/user/td/tablewidget/client/validation/ValidationsTasksPanel.java
View File

@ -394,7 +394,8 @@ public class ValidationsTasksPanel extends FramedPanel implements
ValidationDto v = (ValidationDto) d; ValidationDto v = (ValidationDto) d;
Log.debug("ValidationDto: [" + v.getId() + ", " Log.debug("ValidationDto: [" + v.getId() + ", "
+ v.getDescription() + ", " + v.getValid() + ", " + v.getDescription() + ", " + v.getValid() + ", "
+ v.getConditionCode() + ", " + v.getValidationColumnColumnId() + ", " + v.getConditionCode() + ", "
+ v.getValidationColumnColumnId() + ", "
+ v.getInvocation() + "]"); + v.getInvocation() + "]");
if (v.getValid()) { if (v.getValid()) {
@ -405,7 +406,8 @@ public class ValidationsTasksPanel extends FramedPanel implements
Long op = invocationS.getOperationId(); Long op = invocationS.getOperationId();
if (op.compareTo(OperationsId.ChangeToDimensionColumn if (op.compareTo(OperationsId.ChangeToDimensionColumn
.toLong()) == 0) { .toLong()) == 0) {
if (v.getConditionCode() == ConditionCode.MissingValueOnExternalReference) { if (v.getConditionCode() == ConditionCode.MissingValueOnExternalReference ||
v.getConditionCode() == ConditionCode.AmbigousValueOnExternalReference) {
WidgetRequestEvent widgetRequestEvent = new WidgetRequestEvent( WidgetRequestEvent widgetRequestEvent = new WidgetRequestEvent(
WidgetRequestType.CURATIONBYREPLACEBATCHDIALOG); WidgetRequestType.CURATIONBYREPLACEBATCHDIALOG);
widgetRequestEvent.setTrId(trId); widgetRequestEvent.setTrId(trId);
@ -512,7 +514,8 @@ public class ValidationsTasksPanel extends FramedPanel implements
ValidationDto v = (ValidationDto) selected; ValidationDto v = (ValidationDto) selected;
Log.debug("ValidationDto: [" + v.getId() + ", " Log.debug("ValidationDto: [" + v.getId() + ", "
+ v.getDescription() + ", " + v.getValid() + ", " + v.getDescription() + ", " + v.getValid() + ", "
+ v.getConditionCode() + ", " + v.getValidationColumnColumnId() + ", " + v.getConditionCode() + ", "
+ v.getValidationColumnColumnId() + ", "
+ v.getInvocation() + "]"); + v.getInvocation() + "]");
if (v.getInvocation() != null) { if (v.getInvocation() != null) {
if (v.getValid()) { if (v.getValid()) {
@ -526,15 +529,18 @@ public class ValidationsTasksPanel extends FramedPanel implements
// TODO Add all cases // TODO Add all cases
if (op.compareTo(OperationsId.ChangeToDimensionColumn if (op.compareTo(OperationsId.ChangeToDimensionColumn
.toLong()) == 0 .toLong()) == 0
&& v.getConditionCode() == ConditionCode.MissingValueOnExternalReference) { && (v.getConditionCode() == ConditionCode.MissingValueOnExternalReference ||
v.getConditionCode() == ConditionCode.AmbigousValueOnExternalReference)) {
contextMenu.clear(); contextMenu.clear();
contextMenu.add(resolveItem); contextMenu.add(resolveItem);
contextMenu.add(resumeItem); contextMenu.add(resumeItem);
tree.setContextMenu(contextMenu); tree.setContextMenu(contextMenu);
} else { } else {
contextMenu.clear(); contextMenu.clear();
contextMenu.add(resumeItem); contextMenu.add(resumeItem);
tree.setContextMenu(contextMenu); tree.setContextMenu(contextMenu);
} }
} }
} else { } else {