gCubeSystem
/
tabular-data-expression-widget
16
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@91424 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-02-11 18:57:06 +00:00
parent cb78fb0a6f
commit 0f3ff81072
5 changed files with 72 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.classpath
View File

@ -22,16 +22,16 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/tabular-data-expression-widget-1.0.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

4
.settings/org.eclipse.jdt.core.prefs
View File

@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.source=1.7

2
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.5"/>
<installed facet="jst.web" version="2.3"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.7"/>
</faceted-project>

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

@ -15,7 +15,7 @@ import com.sencha.gxt.widget.core.client.Window;
public class ColumnExpressionDialog extends Window {
protected String WIDTH = "650px";
protected String HEIGHT = "530px";
protected String HEIGHT = "426px";
protected ColumnExpressionPanel columnExpressionPanel;
protected Expression exp = null;
protected ColumnData column=null;
@ -35,7 +35,7 @@ public class ColumnExpressionDialog extends Window {
column.setColumnId(columnId);
column.setDataTypeName(dataTypeName.toString());
column.setTypeCode(columnTypeCode.toString());
if (columnTypeCode == ColumnTypeCode.ANNOTATION
|| columnTypeCode == ColumnTypeCode.ATTRIBUTE
@ -46,7 +46,7 @@ public class ColumnExpressionDialog extends Window {
columnExpressionPanel = new ColumnExpressionPanel(this, column);
add(columnExpressionPanel);
} else {
HTML errorMessage=new HTML("This type of column is not supported");
HTML errorMessage=new HTML("This type of column is not supported for now!");
add(errorMessage);
}
}
@ -76,7 +76,7 @@ public class ColumnExpressionDialog extends Window {
column);
add(columnExpressionPanel);
} else {
HTML errorMessage=new HTML("This type of column is not supported");
HTML errorMessage=new HTML("This type of column is not supported for now!");
add(errorMessage);
}
}

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

@ -4,7 +4,6 @@ import org.gcube.portlets.user.td.expressionwidget.client.resource.ExpressionRes
import org.gcube.portlets.user.td.expressionwidget.shared.model.Expression;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import com.allen_sauer.gwt.log.client.Log;
import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign;
@ -23,7 +22,6 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent;
import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
import com.sencha.gxt.widget.core.client.form.FieldLabel;
import com.sencha.gxt.widget.core.client.form.FieldSet;
import com.sencha.gxt.widget.core.client.form.TextArea;
import com.sencha.gxt.widget.core.client.form.TextField;
/**
@ -51,7 +49,6 @@ public class ColumnExpressionPanel extends FramedPanel {
public ColumnExpressionPanel(ColumnExpressionDialog parent, ColumnData column) {
this.parent=parent;
this.column = column;
create();
}
@ -64,12 +61,13 @@ public class ColumnExpressionPanel extends FramedPanel {
this.parent=parent;
this.trId = trId;
this.column = column;
create();
}
protected void create() {
setBodyBorder(false);
setWidth(WIDTH);
setHeight(HEIGHT);
//setWidth(WIDTH);
//setHeight(HEIGHT);
setHeaderVisible(false);
/*
setResize(true);
@ -88,7 +86,9 @@ public class ColumnExpressionPanel extends FramedPanel {
VerticalLayoutContainer propertiesLayout = new VerticalLayoutContainer();
properties.add(propertiesLayout);
/*
TextField name = new TextField();
name.setToolTip("The name of rule");
propertiesLayout.add(new FieldLabel(name, "Name"),
new VerticalLayoutData(1, -1));
@ -98,12 +98,21 @@ public class ColumnExpressionPanel extends FramedPanel {
description.setToolTip("The description of rule");
propertiesLayout.add(new FieldLabel(description, "Description"),
new VerticalLayoutData(1, -1));
*/
TextField columnType = new TextField();
columnType.setToolTip("The type of column");
columnType.setReadOnly(true);
columnType.setValue(column.getTypeCode());
propertiesLayout.add(new FieldLabel(columnType, "Column Type"),
new VerticalLayoutData(1, -1));
TextField type = new TextField();
type.setToolTip("The type of column");
type.setReadOnly(true);
type.setValue(column.getDataTypeName());
propertiesLayout.add(new FieldLabel(type, "Type"),
TextField dataType = new TextField();
dataType.setToolTip("The data type");
dataType.setReadOnly(true);
dataType.setValue(column.getDataTypeName());
propertiesLayout.add(new FieldLabel(dataType, "Data Type"),
new VerticalLayoutData(1, -1));
FieldSet conditions = new FieldSet();
@ -119,6 +128,34 @@ public class ColumnExpressionPanel extends FramedPanel {
flowButton.setHBoxLayoutAlign(HBoxLayoutAlign.MIDDLE);
flowButton.setPack(BoxLayoutPack.CENTER);
TextButton btnApply = new TextButton("Apply");
btnApply.setIcon(ExpressionResources.INSTANCE.rule());
btnApply.setIconAlign(IconAlign.RIGHT);
btnApply.setTitle("Apply rule");
btnApply.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
Log.debug("Pressed Apply");
applyRule();
}
});
TextButton btnSearch = new TextButton("Search");
btnSearch.setIcon(ExpressionResources.INSTANCE.save());
btnSearch.setIconAlign(IconAlign.RIGHT);
btnSearch.setTitle("Search rule");
btnSearch.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
Log.debug("Pressed Search");
searchRule();
}
});
TextButton btnSave = new TextButton("Save");
btnSave.setIcon(ExpressionResources.INSTANCE.save());
btnSave.setIconAlign(IconAlign.RIGHT);
@ -144,14 +181,16 @@ public class ColumnExpressionPanel extends FramedPanel {
}
});
flowButton.add(btnApply, new BoxLayoutData(new Margins(2, 4, 2, 4)));
flowButton.add(btnSave, new BoxLayoutData(new Margins(2, 4, 2, 4)));
flowButton.add(btnSearch, new BoxLayoutData(new Margins(2, 4, 2, 4)));
flowButton.add(btnClose, new BoxLayoutData(new Margins(2, 4, 2, 4)));
basicLayout.add(properties, new VerticalLayoutData(-1, -1, new Margins(
1)));
basicLayout.add(conditions, new VerticalLayoutData(-1, -1, new Margins(
1)));
basicLayout.add(flowButton, new VerticalLayoutData(-1, -1, new Margins(
basicLayout.add(flowButton, new VerticalLayoutData(-1, -1, new Margins(5,2,5,
2)));
add(basicLayout);
@ -160,13 +199,20 @@ public class ColumnExpressionPanel extends FramedPanel {
}
protected void saveRule() {
protected void applyRule() {
Expression exp=conditionWidget.getExpression();
parent.setExpression(exp);
}
protected void saveRule() {
//Expression exp=conditionWidget.getExpression();
//parent.setExpression(exp);
}
protected void searchRule(){
}
protected void cancelRule() {
}