From 6d9a2153089c3fc8b3439ed43d25c01393b93a2b Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 26 Mar 2015 15:06:53 +0000 Subject: [PATCH] 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 --- .../client/event/ExpressionWrapperEvent.java | 2 +- .../expression/ExpressionWrapper.java | 22 +++++++++---------- .../ExpressionWrapperType.java} | 4 ++-- .../expression/C_ExpressionContainer.java | 2 -- 4 files changed, 14 insertions(+), 16 deletions(-) rename src/main/java/org/gcube/portlets/user/td/widgetcommonevent/{shared => client}/expression/ExpressionWrapper.java (86%) rename src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/{type/ExpressionType.java => expression/ExpressionWrapperType.java} (69%) diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExpressionWrapperEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExpressionWrapperEvent.java index 4f78eac..2f5abb5 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExpressionWrapperEvent.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExpressionWrapperEvent.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/ExpressionWrapper.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java similarity index 86% rename from src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/ExpressionWrapper.java rename to src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java index 97e3ee4..5705f46 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/ExpressionWrapper.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java @@ -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; } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ExpressionType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapperType.java similarity index 69% rename from src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ExpressionType.java rename to src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapperType.java index 76315a5..e757ce2 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ExpressionType.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapperType.java @@ -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; * g.panichi@isti.cnr.it * */ -public enum ExpressionType { +public enum ExpressionWrapperType { CONDITION_AND_REPLACE_COLUMN_EXPRESSION, CONDITION_COLUMN_EXPRESSION, REPLACE_COLUMN_EXPRESSION, diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java index af7aced..540ed90 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java @@ -23,8 +23,6 @@ public class C_ExpressionContainer implements Serializable { private String readableExpression; - - /** * */