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

Updated Replace by Expression 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@100012 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-09-18 10:31:38 +00:00
parent a6704a4ecc
commit 33cefe2f32
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java
View File

@ -35,7 +35,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
*/ */
public class ReplaceColumnByExpressionDialog extends Window implements public class ReplaceColumnByExpressionDialog extends Window implements
MonitorDialogListener { MonitorDialogListener {
protected static final String WIDTH = "660px"; protected static final String WIDTH = "710px";
protected static final String HEIGHT = "490px"; protected static final String HEIGHT = "490px";
protected static final String HEIGHT_REDUCE = "404px"; protected static final String HEIGHT_REDUCE = "404px";

13
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java
View File

@ -45,14 +45,17 @@ import com.sencha.gxt.widget.core.client.form.TextField;
* *
*/ */
public class ReplaceColumnByExpressionPanel extends FramedPanel { public class ReplaceColumnByExpressionPanel extends FramedPanel {
protected static final String WIDTH = "648px";
protected static final String WIDTH = "698px";
protected static final String HEIGHT = "454px"; protected static final String HEIGHT = "454px";
protected static final String HEIGHT_REDUCE = "368px"; protected static final String HEIGHT_REDUCE = "368px";
protected static final String CONDITIONWIDTH = "612px"; protected static final String CONDITIONWIDTH = "662px";
protected static final String CONDITIONHEIGHT = "120px"; protected static final String CONDITIONHEIGHT = "120px";
protected static final String REPLACEWIDTH = "612px"; protected static final String CONDITION_LAYOUT_WIDTH = "662px";
protected static final String REPLACEWIDTH = "662px";
protected static final String REPLACEHEIGHT = "120px"; protected static final String REPLACEHEIGHT = "120px";
protected static final String ALL_ROWS_FIELD_WIDTH = "662px";
protected EventBus eventBus; protected EventBus eventBus;
@ -134,7 +137,7 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel {
conditionsFieldSet.setCollapsible(false); conditionsFieldSet.setCollapsible(false);
conditionsVerticalLayout = new VerticalLayoutContainer(); conditionsVerticalLayout = new VerticalLayoutContainer();
conditionsVerticalLayout.setWidth("612px"); conditionsVerticalLayout.setWidth(CONDITION_LAYOUT_WIDTH);
Radio radioAllRowsTrue = new Radio(); Radio radioAllRowsTrue = new Radio();
radioAllRowsTrue.setBoxLabel("true"); radioAllRowsTrue.setBoxLabel("true");
@ -167,7 +170,7 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel {
hp.setWidth("100px"); hp.setWidth("100px");
allRowsField = new FieldLabel(hp, "All rows"); allRowsField = new FieldLabel(hp, "All rows");
allRowsField.setWidth("612px"); allRowsField.setWidth(ALL_ROWS_FIELD_WIDTH);
conditionWidget = new ConditionWidget(column, CONDITIONWIDTH, conditionWidget = new ConditionWidget(column, CONDITIONWIDTH,
CONDITIONHEIGHT); CONDITIONHEIGHT);

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

@ -48,8 +48,8 @@ public class ReplaceWidget extends SimpleContainer {
private ReplaceWidget thisCont; private ReplaceWidget thisCont;
protected static final String HEIGHT = "210px"; protected static final String HEIGHT = "210px";
protected static final String WIDTH = "612px"; protected static final String WIDTH = "662px";
protected static final String COMBO_WIDTH = "150px"; protected static final String COMBO_WIDTH = "170px";
protected FieldLabel matchLabel; protected FieldLabel matchLabel;
protected ToggleGroup groupMatch; protected ToggleGroup groupMatch;
@ -266,6 +266,7 @@ public class ReplaceWidget extends SimpleContainer {
break; break;
case Concat: case Concat:
if (!existConcat(source)) { if (!existConcat(source)) {
comboReplaceElementsLeaf.clear();
comboReplaceElementsLeaf.setVisible(true); comboReplaceElementsLeaf.setVisible(true);
firstArg.setVisible(false); firstArg.setVisible(false);
firstArg.setEmptyText(""); firstArg.setEmptyText("");
@ -475,6 +476,7 @@ public class ReplaceWidget extends SimpleContainer {
break; break;
case Concat: case Concat:
if (!existConcat(source)) { if (!existConcat(source)) {
comboReplaceElementsLeaf.clear();
comboReplaceElementsLeaf.setVisible(true); comboReplaceElementsLeaf.setVisible(true);
firstArg.setVisible(false); firstArg.setVisible(false);
firstArg.setEmptyText(""); firstArg.setEmptyText("");