gCubeSystem
/
tabular-data-widget-common-event
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-widget-common-event@113759 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-03-26 15:06:53 +00:00
parent 293919acf4
commit 6d9a215308
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExpressionWrapperEvent.java
View File

@ -1,6 +1,6 @@
package org.gcube.portlets.user.td.widgetcommonevent.client.event;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.ExpressionWrapper;
import org.gcube.portlets.user.td.widgetcommonevent.client.expression.ExpressionWrapper;
import com.google.gwt.event.shared.EventHandler;
import com.google.gwt.event.shared.GwtEvent;

22
src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/ExpressionWrapper.java → src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java
View File

@ -1,9 +1,9 @@
package org.gcube.portlets.user.td.widgetcommonevent.shared.expression;
package org.gcube.portlets.user.td.widgetcommonevent.client.expression;
import java.io.Serializable;
import org.gcube.portlets.user.td.widgetcommonevent.client.type.ExpressionType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_ExpressionContainer;
/**
*
@ -14,7 +14,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
public class ExpressionWrapper implements Serializable {
private static final long serialVersionUID = 3877772253100442685L;
private ExpressionType expressionType;
private ExpressionWrapperType expressionType;
private TRId trId;
private String columnId;
private String columnName;
@ -28,7 +28,7 @@ public class ExpressionWrapper implements Serializable {
*/
public ExpressionWrapper() {
super();
this.expressionType=ExpressionType.EXPRESSION_NULL;
this.expressionType=ExpressionWrapperType.EXPRESSION_NULL;
}
@ -44,7 +44,7 @@ public class ExpressionWrapper implements Serializable {
C_ExpressionContainer conditionExpressionContainer) {
super();
this.expressionType = ExpressionType.CONDITION_COLUMN_EXPRESSION;
this.expressionType = ExpressionWrapperType.CONDITION_COLUMN_EXPRESSION;
this.trId = trId;
this.columnId = columnId;
this.columnName = columnName;
@ -64,7 +64,7 @@ public class ExpressionWrapper implements Serializable {
public ExpressionWrapper(String replaceValue,TRId trId,
String columnId, String columnName) {
super();
this.expressionType = ExpressionType.REPLACE_COLUMN_EXPRESSION;
this.expressionType = ExpressionWrapperType.REPLACE_COLUMN_EXPRESSION;
this.trId = trId;
this.columnId = columnId;
this.columnName = columnName;
@ -84,7 +84,7 @@ public class ExpressionWrapper implements Serializable {
public ExpressionWrapper(C_ExpressionContainer replaceExpressionContainer,TRId trId,
String columnId, String columnName) {
super();
this.expressionType = ExpressionType.REPLACE_COLUMN_EXPRESSION;
this.expressionType = ExpressionWrapperType.REPLACE_COLUMN_EXPRESSION;
this.trId = trId;
this.columnId = columnId;
this.columnName = columnName;
@ -109,7 +109,7 @@ public class ExpressionWrapper implements Serializable {
C_ExpressionContainer conditionExpressionContainer,
C_ExpressionContainer replaceExpressionContainer) {
super();
this.expressionType = ExpressionType.CONDITION_AND_REPLACE_COLUMN_EXPRESSION;
this.expressionType = ExpressionWrapperType.CONDITION_AND_REPLACE_COLUMN_EXPRESSION;
this.trId = trId;
this.columnId = columnId;
this.columnName = columnName;
@ -133,7 +133,7 @@ public class ExpressionWrapper implements Serializable {
C_ExpressionContainer conditionExpressionContainer,
String replaceValue) {
super();
this.expressionType = ExpressionType.CONDITION_AND_REPLACE_COLUMN_EXPRESSION;
this.expressionType = ExpressionWrapperType.CONDITION_AND_REPLACE_COLUMN_EXPRESSION;
this.trId = trId;
this.columnId = columnId;
this.columnName = columnName;
@ -145,12 +145,12 @@ public class ExpressionWrapper implements Serializable {
public ExpressionType getExpressionType() {
public ExpressionWrapperType getExpressionType() {
return expressionType;
}
public void setExpressionType(ExpressionType expressionType) {
public void setExpressionType(ExpressionWrapperType expressionType) {
this.expressionType = expressionType;
}

4
src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ExpressionType.java → src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapperType.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.gcube.portlets.user.td.widgetcommonevent.client.type;
package org.gcube.portlets.user.td.widgetcommonevent.client.expression;
/**
*
@ -9,7 +9,7 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public enum ExpressionType {
public enum ExpressionWrapperType {
CONDITION_AND_REPLACE_COLUMN_EXPRESSION,
CONDITION_COLUMN_EXPRESSION,
REPLACE_COLUMN_EXPRESSION,

2
src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java
View File

@ -23,8 +23,6 @@ public class C_ExpressionContainer implements Serializable {
private String readableExpression;
/**
*
*/