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

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@111808 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-02-09 15:16:34 +00:00
parent ba8e135c1e
commit 20190eb507
1 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceWidget.java
View File

@ -416,19 +416,19 @@ public class ReplaceWidget extends SimpleContainer {
comboReplaceElementsLeaf.clear();
comboReplaceElementsLeaf.reset();
comboReplaceElementsLeaf.getStore().clear();
comboReplaceElementsLeaf.getStore().addAll(
factory.replaceElements);
comboReplaceElementsLeaf.getStore()
.addAll(factory.replaceElements);
comboReplaceElementsLeaf.getStore().commitChanges();
.commitChanges();
comboReplaceElementsLeaf.setVisible(true);
comboReplaceElementsLeaf.redraw();
comboColumns.clear();
comboColumns.setVisible(false);
firstArg.setVisible(false);
firstArg.setEmptyText("");
secondArg.setVisible(false);
secondArg.setEmptyText("");
if (!existOperation(source)) {
comboColumns.clear();
comboColumns.setVisible(false);
firstArg.setVisible(false);
firstArg.setEmptyText("");
secondArg.setVisible(false);
secondArg.setEmptyText("");
addOperation();
}
break;
@ -440,21 +440,23 @@ public class ReplaceWidget extends SimpleContainer {
comboReplaceElementsLeaf.clear();
comboReplaceElementsLeaf.reset();
comboReplaceElementsLeaf.getStore().clear();
comboReplaceElementsLeaf.getStore().addAll(
factory.replaceElementsArithmetic);
comboReplaceElementsLeaf.getStore()
.addAll(factory.replaceElementsArithmetic);
comboReplaceElementsLeaf.getStore().commitChanges();
.commitChanges();
comboReplaceElementsLeaf.setVisible(true);
comboReplaceElementsLeaf.redraw();
comboColumns.clear();
comboColumns.setVisible(false);
firstArg.setVisible(false);
firstArg.setEmptyText("");
secondArg.setVisible(false);
secondArg.setEmptyText("");
if (!existOperation(source)) {
comboColumns.clear();
comboColumns.setVisible(false);
firstArg.setVisible(false);
firstArg.setEmptyText("");
secondArg.setVisible(false);
secondArg.setEmptyText("");
addOperation();
}
break;
break;
case SubstringByRegex:
comboReplaceElementsLeaf.setVisible(false);
comboColumns.clear();
@ -715,18 +717,20 @@ public class ReplaceWidget extends SimpleContainer {
comboReplaceElementsLeaf.clear();
comboReplaceElementsLeaf.reset();
comboReplaceElementsLeaf.getStore().clear();
comboReplaceElementsLeaf.getStore().addAll(
factory.replaceElements);
comboReplaceElementsLeaf.getStore()
.addAll(factory.replaceElements);
comboReplaceElementsLeaf.getStore().commitChanges();
.commitChanges();
comboReplaceElementsLeaf.setVisible(true);
comboReplaceElementsLeaf.redraw();
comboColumns.clear();
comboColumns.setVisible(false);
firstArg.setVisible(false);
firstArg.setEmptyText("");
secondArg.setVisible(false);
secondArg.setEmptyText("");
if (!existOperation(source)) {
comboColumns.clear();
comboColumns.setVisible(false);
firstArg.setVisible(false);
firstArg.setEmptyText("");
secondArg.setVisible(false);
secondArg.setEmptyText("");
addOperation();
}
break;
@ -738,18 +742,20 @@ public class ReplaceWidget extends SimpleContainer {
comboReplaceElementsLeaf.clear();
comboReplaceElementsLeaf.reset();
comboReplaceElementsLeaf.getStore().clear();
comboReplaceElementsLeaf.getStore().addAll(
factory.replaceElementsArithmetic);
comboReplaceElementsLeaf.getStore()
.addAll(factory.replaceElementsArithmetic);
comboReplaceElementsLeaf.getStore().commitChanges();
.commitChanges();
comboReplaceElementsLeaf.setVisible(true);
comboReplaceElementsLeaf.redraw();
comboColumns.clear();
comboColumns.setVisible(false);
firstArg.setVisible(false);
firstArg.setEmptyText("");
secondArg.setVisible(false);
secondArg.setEmptyText("");
if (!existOperation(source)) {
comboColumns.clear();
comboColumns.setVisible(false);
firstArg.setVisible(false);
firstArg.setEmptyText("");
secondArg.setVisible(false);
secondArg.setEmptyText("");
addOperation();
}
break;
@ -1046,13 +1052,12 @@ public class ReplaceWidget extends SimpleContainer {
if (comboLeaf.getCurrentValue() == null) {
throw new ReplaceTypeMapException("Fill all field!");
} else {
comboLeafReplaceType = comboLeaf.getCurrentValue()
.getReplaceType();
cType = ColumnDataType
.getColumnDataTypeFromId(column
.getDataTypeName());
cType = ColumnDataType.getColumnDataTypeFromId(column
.getDataTypeName());
switch (replaceColumnByExpressionType) {
case Replace:
expLeaf = mapReplace.map(
@ -1092,8 +1097,7 @@ public class ReplaceWidget extends SimpleContainer {
index++;
if (index < vert.getWidgetCount()) {
expContainerOperation = calcCExpression(index,
cType);
expContainerOperation = calcCExpression(index, cType);
if (expContainerOperation == null) {
return null;
} else {