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@91767 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-02-17 11:55:50 +00:00
parent 2407989bd9
commit ba5a9088bf
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionDialog.java
View File

@ -81,6 +81,7 @@ public class ColumnExpressionDialog extends Window {
protected void setExpression(C_Expression exp) { protected void setExpression(C_Expression exp) {
Log.debug("New Expression set:"+exp.toString()); Log.debug("New Expression set:"+exp.toString());
this.exp = exp; this.exp = exp;
} }
protected void load(TRId trId, String columnName) { protected void load(TRId trId, String columnName) {

32
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java
View File

@ -60,14 +60,7 @@ public class ColumnExpressionPanel extends FramedPanel {
protected void create() { protected void create() {
setBodyBorder(false); setBodyBorder(false);
//setWidth(WIDTH);
//setHeight(HEIGHT);
setHeaderVisible(false); setHeaderVisible(false);
/*
setResize(true);
setHeadingText("New Rule");
getHeader().setIcon(ExpressionResources.INSTANCE.rule());
*/
VerticalLayoutContainer basicLayout = new VerticalLayoutContainer(); VerticalLayoutContainer basicLayout = new VerticalLayoutContainer();
basicLayout.setScrollMode(ScrollMode.AUTO); basicLayout.setScrollMode(ScrollMode.AUTO);
@ -80,20 +73,6 @@ public class ColumnExpressionPanel extends FramedPanel {
VerticalLayoutContainer propertiesLayout = new VerticalLayoutContainer(); VerticalLayoutContainer propertiesLayout = new VerticalLayoutContainer();
properties.add(propertiesLayout); properties.add(propertiesLayout);
/*
TextField name = new TextField();
name.setToolTip("The name of rule");
propertiesLayout.add(new FieldLabel(name, "Name"),
new VerticalLayoutData(1, -1));
TextArea description = new TextArea();
description.setHeight("100px");
description.setToolTip("The description of rule");
propertiesLayout.add(new FieldLabel(description, "Description"),
new VerticalLayoutData(1, -1));
*/
TextField columnType = new TextField(); TextField columnType = new TextField();
columnType.setToolTip("The type of column"); columnType.setToolTip("The type of column");
columnType.setReadOnly(true); columnType.setReadOnly(true);
@ -169,6 +148,7 @@ public class ColumnExpressionPanel extends FramedPanel {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
Log.debug("Pressed Close"); Log.debug("Pressed Close");
close();
} }
}); });
@ -200,8 +180,12 @@ public class ColumnExpressionPanel extends FramedPanel {
container.setId(C_ExpressionContainer.Contains.C_Expression); container.setId(C_ExpressionContainer.Contains.C_Expression);
container.setExp(exp); container.setExp(exp);
expressionEvent.setC_ExpressionContainer(container); expressionEvent.setC_ExpressionContainer(container);
expressionEvent.setTrId(column.getTrId());
expressionEvent.setColumnId(column.getColumnId());
expressionEvent.setColumnName(column.getName());
Log.debug(expressionEvent.toString()); Log.debug(expressionEvent.toString());
eventBus.fireEvent(expressionEvent); eventBus.fireEvent(expressionEvent);
parent.hide();
} }
protected void saveRule() { protected void saveRule() {
@ -213,8 +197,10 @@ public class ColumnExpressionPanel extends FramedPanel {
} }
protected void cancelRule() { protected void close() {
ExpressionEvent expressionEvent= new ExpressionEvent(ExpressionType.EXPRESSIONNULL);
eventBus.fireEvent(expressionEvent);
parent.hide();
} }