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@111758 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-02-06 09:27:19 +00:00
parent 8b541fce46
commit 4612e0e2ba
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceArithmeticWidget.java
View File

@ -21,7 +21,6 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredTy
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap;
import com.allen_sauer.gwt.log.client.Log; import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT;
@ -113,8 +112,8 @@ public class ReplaceArithmeticWidget extends SimpleContainer {
public ReplaceArithmeticWidget(ColumnData column, EventBus eventBus) { public ReplaceArithmeticWidget(ColumnData column, EventBus eventBus) {
super(); super();
replaceColumnByExpressionType = ReplaceColumnByExpressionType.Replace; replaceColumnByExpressionType = ReplaceColumnByExpressionType.Replace;
ColumnDataType targetColumnDataType = ColumnTypeMap ColumnDataType targetColumnDataType = ColumnDataType
.getColumnDataType(column.getDataTypeName()); .getColumnDataTypeFromId(column.getDataTypeName());
create(column.getTrId(), WIDTH, HEIGHT, eventBus, targetColumnDataType); create(column.getTrId(), WIDTH, HEIGHT, eventBus, targetColumnDataType);
retrieveColumns(); retrieveColumns();
} }
@ -123,8 +122,8 @@ public class ReplaceArithmeticWidget extends SimpleContainer {
String height, EventBus eventBus) { String height, EventBus eventBus) {
super(); super();
replaceColumnByExpressionType = ReplaceColumnByExpressionType.Replace; replaceColumnByExpressionType = ReplaceColumnByExpressionType.Replace;
ColumnDataType targetColumnDataType = ColumnTypeMap ColumnDataType targetColumnDataType = ColumnDataType
.getColumnDataType(column.getDataTypeName()); .getColumnDataTypeFromId(column.getDataTypeName());
create(column.getTrId(), width, height, eventBus, targetColumnDataType); create(column.getTrId(), width, height, eventBus, targetColumnDataType);
retrieveColumns(); retrieveColumns();
@ -135,8 +134,8 @@ public class ReplaceArithmeticWidget extends SimpleContainer {
super(); super();
replaceColumnByExpressionType = ReplaceColumnByExpressionType.Template; replaceColumnByExpressionType = ReplaceColumnByExpressionType.Template;
this.columns = columns; this.columns = columns;
ColumnDataType targetColumnDataType = ColumnTypeMap ColumnDataType targetColumnDataType = ColumnDataType
.getColumnDataType(column.getDataTypeName()); .getColumnDataTypeFromId(column.getDataTypeName());
create(column.getTrId(), WIDTH, HEIGHT, eventBus, targetColumnDataType); create(column.getTrId(), WIDTH, HEIGHT, eventBus, targetColumnDataType);
setup(); setup();
} }
@ -147,8 +146,8 @@ public class ReplaceArithmeticWidget extends SimpleContainer {
super(); super();
replaceColumnByExpressionType = ReplaceColumnByExpressionType.Template; replaceColumnByExpressionType = ReplaceColumnByExpressionType.Template;
this.columns = columns; this.columns = columns;
ColumnDataType targetColumnDataType = ColumnTypeMap ColumnDataType targetColumnDataType = ColumnDataType
.getColumnDataType(column.getDataTypeName()); .getColumnDataTypeFromId(column.getDataTypeName());
create(column.getTrId(), width, height, eventBus, targetColumnDataType); create(column.getTrId(), width, height, eventBus, targetColumnDataType);
setup(); setup();
} }
@ -480,8 +479,7 @@ public class ReplaceArithmeticWidget extends SimpleContainer {
}); });
comboReplaceArithmeticElementsOperators.setEmptyText("Select..."); comboReplaceArithmeticElementsOperators.setEmptyText("Select...");
comboReplaceArithmeticElementsOperators comboReplaceArithmeticElementsOperators.setItemId(itemIdComboOperation);
.setItemId(itemIdComboOperation);
comboReplaceArithmeticElementsOperators.setWidth(COMBO_WIDTH); comboReplaceArithmeticElementsOperators.setWidth(COMBO_WIDTH);
comboReplaceArithmeticElementsOperators.setEditable(false); comboReplaceArithmeticElementsOperators.setEditable(false);
comboReplaceArithmeticElementsOperators comboReplaceArithmeticElementsOperators

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

@ -14,7 +14,6 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.type.ExpressionType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_ExpressionContainer; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_ExpressionContainer;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap;
import com.allen_sauer.gwt.log.client.Log; import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeEvent;
@ -505,8 +504,8 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel {
private boolean checkValue(String value) { private boolean checkValue(String value) {
try { try {
boolean ok = false; boolean ok = false;
ColumnDataType columnDataType = ColumnTypeMap ColumnDataType columnDataType =ColumnDataType
.getColumnDataType(column.getDataTypeName()); .getColumnDataTypeFromId(column.getDataTypeName());
switch (columnDataType) { switch (columnDataType) {
case Boolean: case Boolean:
Boolean.valueOf(value); Boolean.valueOf(value);

9
src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java
View File

@ -17,10 +17,10 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C
import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextContains; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextContains;
import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextEndsWith; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextEndsWith;
import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextMatchSQLRegexp; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextMatchSQLRegexp;
import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReference;
import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReferencePlaceholder; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReferencePlaceholder;
import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ConstantList; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ConstantList;
import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_Range; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_Range;
import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReference;
import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.TD_Value; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.TD_Value;
import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_And; import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_And;
import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_Between; import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_Between;
@ -32,7 +32,6 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_ValueI
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap;
import com.allen_sauer.gwt.log.client.Log; import com.allen_sauer.gwt.log.client.Log;
@ -70,7 +69,8 @@ public class ConditionTypeMap {
Log.debug("ConditionTypeMap Map Place Holder"); Log.debug("ConditionTypeMap Map Place Holder");
C_Expression exp = null; C_Expression exp = null;
Log.debug("Column Data Type Name:" + column.getDataTypeName()); Log.debug("Column Data Type Name:" + column.getDataTypeName());
ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column ColumnDataType dataType = ColumnDataType
.getColumnDataTypeFromId(column
.getDataTypeName()); .getDataTypeName());
Log.debug("Data Type:" + dataType); Log.debug("Data Type:" + dataType);
C_ColumnReferencePlaceholder placeHolder = new C_ColumnReferencePlaceholder( C_ColumnReferencePlaceholder placeHolder = new C_ColumnReferencePlaceholder(
@ -342,7 +342,8 @@ public class ConditionTypeMap {
C_Expression exp = null; C_Expression exp = null;
Log.debug("Column Data Type Name:" + column.getDataTypeName()); Log.debug("Column Data Type Name:" + column.getDataTypeName());
ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column ColumnDataType dataType = ColumnDataType
.getColumnDataTypeFromId(column
.getDataTypeName()); .getDataTypeName());
Log.debug("Data Type:" + dataType); Log.debug("Data Type:" + dataType);
C_ColumnReference columnReference = new C_ColumnReference( C_ColumnReference columnReference = new C_ColumnReference(

7
src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceArithmeticTypeMap.java
View File

@ -18,7 +18,6 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.TD_Value;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap;
import com.allen_sauer.gwt.log.client.Log; import com.allen_sauer.gwt.log.client.Log;
@ -113,7 +112,8 @@ public class ReplaceArithmeticTypeMap {
} }
Log.debug("Column Data Type Name:" + column.getDataTypeName()); Log.debug("Column Data Type Name:" + column.getDataTypeName());
ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column ColumnDataType dataType = ColumnDataType
.getColumnDataTypeFromId(column
.getDataTypeName()); .getDataTypeName());
Log.debug("Data Type:" + dataType); Log.debug("Data Type:" + dataType);
C_ColumnReferencePlaceholder placeH = new C_ColumnReferencePlaceholder( C_ColumnReferencePlaceholder placeH = new C_ColumnReferencePlaceholder(
@ -285,7 +285,8 @@ public class ReplaceArithmeticTypeMap {
} }
Log.debug("Column Data Type Name:" + column.getDataTypeName()); Log.debug("Column Data Type Name:" + column.getDataTypeName());
ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column ColumnDataType dataType = ColumnDataType
.getColumnDataTypeFromId(column
.getDataTypeName()); .getDataTypeName());
Log.debug("Data Type:" + dataType); Log.debug("Data Type:" + dataType);

9
src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java
View File

@ -7,13 +7,12 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C
import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_SubstringByRegex; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_SubstringByRegex;
import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_SubstringPosition; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_SubstringPosition;
import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextReplaceMatchingRegex; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextReplaceMatchingRegex;
import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReferencePlaceholder;
import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReference; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReference;
import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReferencePlaceholder;
import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.TD_Value; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.TD_Value;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap;
import com.allen_sauer.gwt.log.client.Log; import com.allen_sauer.gwt.log.client.Log;
@ -82,7 +81,8 @@ public class ReplaceTypeMap {
Log.debug("Column Data Type Name:" + column.getDataTypeName()); Log.debug("Column Data Type Name:" + column.getDataTypeName());
ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column ColumnDataType dataType = ColumnDataType
.getColumnDataTypeFromId(column
.getDataTypeName()); .getDataTypeName());
Log.debug("Data Type:" + dataType); Log.debug("Data Type:" + dataType);
C_ColumnReferencePlaceholder placeH = new C_ColumnReferencePlaceholder( C_ColumnReferencePlaceholder placeH = new C_ColumnReferencePlaceholder(
@ -193,7 +193,8 @@ public class ReplaceTypeMap {
Log.debug("Column Data Type Name:" + column.getDataTypeName()); Log.debug("Column Data Type Name:" + column.getDataTypeName());
ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column ColumnDataType dataType = ColumnDataType
.getColumnDataTypeFromId(column
.getDataTypeName()); .getDataTypeName());
Log.debug("Data Type:" + dataType); Log.debug("Data Type:" + dataType);