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

38
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.clear();
comboReplaceElementsLeaf.reset(); comboReplaceElementsLeaf.reset();
comboReplaceElementsLeaf.getStore().clear(); comboReplaceElementsLeaf.getStore().clear();
comboReplaceElementsLeaf.getStore().addAll(
factory.replaceElements);
comboReplaceElementsLeaf.getStore() comboReplaceElementsLeaf.getStore()
.addAll(factory.replaceElements); .commitChanges();
comboReplaceElementsLeaf.getStore().commitChanges();
comboReplaceElementsLeaf.setVisible(true); comboReplaceElementsLeaf.setVisible(true);
comboReplaceElementsLeaf.redraw(); comboReplaceElementsLeaf.redraw();
if (!existOperation(source)) {
comboColumns.clear(); comboColumns.clear();
comboColumns.setVisible(false); comboColumns.setVisible(false);
firstArg.setVisible(false); firstArg.setVisible(false);
firstArg.setEmptyText(""); firstArg.setEmptyText("");
secondArg.setVisible(false); secondArg.setVisible(false);
secondArg.setEmptyText(""); secondArg.setEmptyText("");
if (!existOperation(source)) {
addOperation(); addOperation();
} }
break; break;
@ -440,18 +440,20 @@ public class ReplaceWidget extends SimpleContainer {
comboReplaceElementsLeaf.clear(); comboReplaceElementsLeaf.clear();
comboReplaceElementsLeaf.reset(); comboReplaceElementsLeaf.reset();
comboReplaceElementsLeaf.getStore().clear(); comboReplaceElementsLeaf.getStore().clear();
comboReplaceElementsLeaf.getStore().addAll(
factory.replaceElementsArithmetic);
comboReplaceElementsLeaf.getStore() comboReplaceElementsLeaf.getStore()
.addAll(factory.replaceElementsArithmetic); .commitChanges();
comboReplaceElementsLeaf.getStore().commitChanges();
comboReplaceElementsLeaf.setVisible(true); comboReplaceElementsLeaf.setVisible(true);
comboReplaceElementsLeaf.redraw(); comboReplaceElementsLeaf.redraw();
if (!existOperation(source)) {
comboColumns.clear(); comboColumns.clear();
comboColumns.setVisible(false); comboColumns.setVisible(false);
firstArg.setVisible(false); firstArg.setVisible(false);
firstArg.setEmptyText(""); firstArg.setEmptyText("");
secondArg.setVisible(false); secondArg.setVisible(false);
secondArg.setEmptyText(""); secondArg.setEmptyText("");
if (!existOperation(source)) {
addOperation(); addOperation();
} }
break; break;
@ -715,18 +717,20 @@ public class ReplaceWidget extends SimpleContainer {
comboReplaceElementsLeaf.clear(); comboReplaceElementsLeaf.clear();
comboReplaceElementsLeaf.reset(); comboReplaceElementsLeaf.reset();
comboReplaceElementsLeaf.getStore().clear(); comboReplaceElementsLeaf.getStore().clear();
comboReplaceElementsLeaf.getStore().addAll(
factory.replaceElements);
comboReplaceElementsLeaf.getStore() comboReplaceElementsLeaf.getStore()
.addAll(factory.replaceElements); .commitChanges();
comboReplaceElementsLeaf.getStore().commitChanges();
comboReplaceElementsLeaf.setVisible(true); comboReplaceElementsLeaf.setVisible(true);
comboReplaceElementsLeaf.redraw(); comboReplaceElementsLeaf.redraw();
if (!existOperation(source)) {
comboColumns.clear(); comboColumns.clear();
comboColumns.setVisible(false); comboColumns.setVisible(false);
firstArg.setVisible(false); firstArg.setVisible(false);
firstArg.setEmptyText(""); firstArg.setEmptyText("");
secondArg.setVisible(false); secondArg.setVisible(false);
secondArg.setEmptyText(""); secondArg.setEmptyText("");
if (!existOperation(source)) {
addOperation(); addOperation();
} }
break; break;
@ -738,18 +742,20 @@ public class ReplaceWidget extends SimpleContainer {
comboReplaceElementsLeaf.clear(); comboReplaceElementsLeaf.clear();
comboReplaceElementsLeaf.reset(); comboReplaceElementsLeaf.reset();
comboReplaceElementsLeaf.getStore().clear(); comboReplaceElementsLeaf.getStore().clear();
comboReplaceElementsLeaf.getStore().addAll(
factory.replaceElementsArithmetic);
comboReplaceElementsLeaf.getStore() comboReplaceElementsLeaf.getStore()
.addAll(factory.replaceElementsArithmetic); .commitChanges();
comboReplaceElementsLeaf.getStore().commitChanges();
comboReplaceElementsLeaf.setVisible(true); comboReplaceElementsLeaf.setVisible(true);
comboReplaceElementsLeaf.redraw(); comboReplaceElementsLeaf.redraw();
if (!existOperation(source)) {
comboColumns.clear(); comboColumns.clear();
comboColumns.setVisible(false); comboColumns.setVisible(false);
firstArg.setVisible(false); firstArg.setVisible(false);
firstArg.setEmptyText(""); firstArg.setEmptyText("");
secondArg.setVisible(false); secondArg.setVisible(false);
secondArg.setEmptyText(""); secondArg.setEmptyText("");
if (!existOperation(source)) {
addOperation(); addOperation();
} }
break; break;
@ -1049,8 +1055,7 @@ public class ReplaceWidget extends SimpleContainer {
comboLeafReplaceType = comboLeaf.getCurrentValue() comboLeafReplaceType = comboLeaf.getCurrentValue()
.getReplaceType(); .getReplaceType();
cType = ColumnDataType cType = ColumnDataType.getColumnDataTypeFromId(column
.getColumnDataTypeFromId(column
.getDataTypeName()); .getDataTypeName());
switch (replaceColumnByExpressionType) { switch (replaceColumnByExpressionType) {
@ -1092,8 +1097,7 @@ public class ReplaceWidget extends SimpleContainer {
index++; index++;
if (index < vert.getWidgetCount()) { if (index < vert.getWidgetCount()) {
expContainerOperation = calcCExpression(index, expContainerOperation = calcCExpression(index, cType);
cType);
if (expContainerOperation == null) { if (expContainerOperation == null) {
return null; return null;
} else { } else {