From 9078dc278547380bbecec5b0d9411b5b11e8e42e Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 24 Apr 2015 10:18:45 +0000 Subject: [PATCH] Updated operation names in expressions git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@114387 82a268e6-3cf1-43bd-a215-b396298e98cf --- .gwt/.gwt-log | 32 +++++++ .../client/operation/OperationsStore.java | 92 +++++++++---------- .../client/resources/ExpressionResources.java | 1 - 3 files changed, 78 insertions(+), 47 deletions(-) diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log index 601337c..0696c31 100644 --- a/.gwt/.gwt-log +++ b/.gwt/.gwt-log @@ -286,3 +286,35 @@ Compiling... Compilation completed in 0.00 seconds Removing invalidated units Finding entry point classes +Public resources found in... +Translatable source found in... +Found 0 cached/archived units. Used 0 / 2737 units from cache. +Compiling... + 20% complete (ETR: 13 seconds) + 20% complete (ETR: 13 seconds) + 20% complete (ETR: 13 seconds) + 30% complete (ETR: 12 seconds) + 40% complete (ETR: 9 seconds) + 50% complete (ETR: 7 seconds) + 60% complete (ETR: 5 seconds) + 70% complete (ETR: 4 seconds) + 80% complete (ETR: 2 seconds) + 90% complete (ETR: 1 seconds) + 100% complete (ETR: 0 seconds) + Compilation completed in 33.12 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2737 cached/archived units. Used 2737 / 2737 units from cache. +Compiling... + Compilation completed in 0.01 seconds +Removing invalidated units +Finding entry point classes +Public resources found in... +Translatable source found in... +Found 2737 cached/archived units. Used 2737 / 2737 units from cache. +Compiling... + Compilation completed in 0.00 seconds +Removing invalidated units +Finding entry point classes diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/OperationsStore.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/OperationsStore.java index 0b2f8a3..9655a9b 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/OperationsStore.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/OperationsStore.java @@ -20,41 +20,41 @@ public class OperationsStore { protected ArrayList operationsNumeric = new ArrayList() { private static final long serialVersionUID = -6559885743626876431L; { - add(new Operation(1,"EQUALS","The value is equal to",C_OperatorType.EQUALS)); - add(new Operation(2,"GREATER","The value is greater than",C_OperatorType.GREATER)); - add(new Operation(3,"GREATER_OR_EQUALS","The value is greater than or equal to",C_OperatorType.GREATER_OR_EQUALS)); - add(new Operation(4,"LESSER","The value is less than",C_OperatorType.LESSER)); - add(new Operation(5,"LESSER_OR_EQUALS","The value is less than or equal to",C_OperatorType.LESSER_OR_EQUALS)); - add(new Operation(6,"NOT_EQUALS","The value is not equal to",C_OperatorType.NOT_EQUALS)); - add(new Operation(7,"NOT_GREATER","The value is not greater than",C_OperatorType.NOT_GREATER)); - add(new Operation(8,"NOT_LESSER","The value is not less than",C_OperatorType.NOT_LESSER)); - add(new Operation(9,"IS_NULL","The value is null",C_OperatorType.IS_NULL)); - add(new Operation(10,"IS_NOT_NULL","The value is not null",C_OperatorType.IS_NOT_NULL)); - add(new Operation(11,"BETWEEN","The value is between",C_OperatorType.BETWEEN)); - add(new Operation(12,"NOT_BETWEEN","The value is not between",C_OperatorType.NOT_BETWEEN)); - add(new Operation(13,"IN","The value is in",C_OperatorType.IN)); - add(new Operation(14,"NOT_IN","The value is not in",C_OperatorType.NOT_IN)); + add(new Operation(1,"EQUALS","Equal to",C_OperatorType.EQUALS)); + add(new Operation(2,"GREATER","Greater than",C_OperatorType.GREATER)); + add(new Operation(3,"GREATER_OR_EQUALS","Greater than or equal to",C_OperatorType.GREATER_OR_EQUALS)); + add(new Operation(4,"LESSER","Less than",C_OperatorType.LESSER)); + add(new Operation(5,"LESSER_OR_EQUALS","Less than or equal to",C_OperatorType.LESSER_OR_EQUALS)); + add(new Operation(6,"NOT_EQUALS","Not equal to",C_OperatorType.NOT_EQUALS)); + add(new Operation(7,"NOT_GREATER","Not greater than",C_OperatorType.NOT_GREATER)); + add(new Operation(8,"NOT_LESSER","Not less than",C_OperatorType.NOT_LESSER)); + add(new Operation(9,"IS_NULL","Is null",C_OperatorType.IS_NULL)); + add(new Operation(10,"IS_NOT_NULL","Is not null",C_OperatorType.IS_NOT_NULL)); + add(new Operation(11,"BETWEEN","Is between",C_OperatorType.BETWEEN)); + add(new Operation(12,"NOT_BETWEEN","Is not between",C_OperatorType.NOT_BETWEEN)); + add(new Operation(13,"IN","Is in",C_OperatorType.IN)); + add(new Operation(14,"NOT_IN","Is not in",C_OperatorType.NOT_IN)); }}; protected ArrayList operationsText = new ArrayList() { private static final long serialVersionUID = -6559885743626876431L; { - add(new Operation(1,"EQUALS","The value is equal to",C_OperatorType.EQUALS)); - add(new Operation(2,"BEGIN_WITH","The value begin with",C_OperatorType.BEGINS_WITH)); - add(new Operation(3,"CONTAINS","The value contains",C_OperatorType.CONTAINS)); - add(new Operation(4,"ENDS_WITH","The value end with",C_OperatorType.ENDS_WITH)); - add(new Operation(5,"MATCH","The value match",C_OperatorType.MATCH_REGEX)); - add(new Operation(6,"NOT_EQUALS","The value is not equal to",C_OperatorType.NOT_EQUALS)); - add(new Operation(7,"NOT_BEGIN_WITH","The value not begin with",C_OperatorType.NOT_BEGINS_WITH)); - add(new Operation(8,"NOT_CONTAINS","The value not contains",C_OperatorType.NOT_CONTAINS)); - add(new Operation(9,"NOT_ENDS_WITH","The value not end with",C_OperatorType.NOT_ENDS_WITH)); - add(new Operation(10,"NOT_MATCH","The value not match",C_OperatorType.NOT_MATCH_REGEX)); - add(new Operation(11,"IS_NULL","The value is null",C_OperatorType.IS_NULL)); - add(new Operation(12,"IS_NOT_NULL","Thel value is not null",C_OperatorType.IS_NOT_NULL)); - add(new Operation(13,"BETWEEN","The value is between",C_OperatorType.BETWEEN)); - add(new Operation(14,"NOT_BETWEEN","The value is not between",C_OperatorType.NOT_BETWEEN)); - add(new Operation(15,"IN","The value is in",C_OperatorType.IN)); - add(new Operation(16,"NOT_IN","The value is not in",C_OperatorType.NOT_IN)); + add(new Operation(1,"EQUALS","Equal to",C_OperatorType.EQUALS)); + add(new Operation(2,"BEGIN_WITH","Begin with",C_OperatorType.BEGINS_WITH)); + add(new Operation(3,"CONTAINS","Contains",C_OperatorType.CONTAINS)); + add(new Operation(4,"ENDS_WITH","End with",C_OperatorType.ENDS_WITH)); + add(new Operation(5,"MATCH","Match",C_OperatorType.MATCH_REGEX)); + add(new Operation(6,"NOT_EQUALS","Not equal to",C_OperatorType.NOT_EQUALS)); + add(new Operation(7,"NOT_BEGIN_WITH","Not begin with",C_OperatorType.NOT_BEGINS_WITH)); + add(new Operation(8,"NOT_CONTAINS","Not contains",C_OperatorType.NOT_CONTAINS)); + add(new Operation(9,"NOT_ENDS_WITH","Not end with",C_OperatorType.NOT_ENDS_WITH)); + add(new Operation(10,"NOT_MATCH","Not match",C_OperatorType.NOT_MATCH_REGEX)); + add(new Operation(11,"IS_NULL","Is null",C_OperatorType.IS_NULL)); + add(new Operation(12,"IS_NOT_NULL","Is not null",C_OperatorType.IS_NOT_NULL)); + add(new Operation(13,"BETWEEN","Is between",C_OperatorType.BETWEEN)); + add(new Operation(14,"NOT_BETWEEN","Is not between",C_OperatorType.NOT_BETWEEN)); + add(new Operation(15,"IN","Is in",C_OperatorType.IN)); + add(new Operation(16,"NOT_IN","Is not in",C_OperatorType.NOT_IN)); add(new Operation(17,"SOUNDEX","Soundex", C_OperatorType.SOUNDEX)); add(new Operation(18,"LEVENSHTEIN","Levenshtein", C_OperatorType.LEVENSHTEIN)); add(new Operation(19,"SIMILARITY","Similarity", C_OperatorType.SIMILARITY)); @@ -66,10 +66,10 @@ public class OperationsStore { private static final long serialVersionUID = -1095217157799110522L; { - add(new Operation(1,"EQUALS","The value is equal to",C_OperatorType.EQUALS)); - add(new Operation(2,"NOT_EQUALS","The value is not equal to",C_OperatorType.NOT_EQUALS)); - add(new Operation(3,"IS_NULL","The value is null",C_OperatorType.IS_NULL)); - add(new Operation(4,"IS_NOT_NULL","The value is not null",C_OperatorType.IS_NOT_NULL)); + add(new Operation(1,"EQUALS","Equal to",C_OperatorType.EQUALS)); + add(new Operation(2,"NOT_EQUALS","Not equal to",C_OperatorType.NOT_EQUALS)); + add(new Operation(3,"IS_NULL","Is null",C_OperatorType.IS_NULL)); + add(new Operation(4,"IS_NOT_NULL","Is not null",C_OperatorType.IS_NOT_NULL)); }}; @@ -79,16 +79,16 @@ public class OperationsStore { private static final long serialVersionUID = -1095217157799110522L; { - add(new Operation(1,"EQUALS","The value is equal to",C_OperatorType.EQUALS)); - add(new Operation(2,"GREATER","The value is greater than",C_OperatorType.GREATER)); - add(new Operation(3,"GREATER_OR_EQUALS","The value is greater than or equal to",C_OperatorType.GREATER_OR_EQUALS)); - add(new Operation(4,"LESSER","The value is less than",C_OperatorType.LESSER)); - add(new Operation(5,"LESSER_OR_EQUALS","The value is less than or equal to",C_OperatorType.LESSER_OR_EQUALS)); - add(new Operation(6,"NOT_EQUALS","The value is not equal to",C_OperatorType.NOT_EQUALS)); - add(new Operation(7,"NOT_GREATER","The value is not greater than",C_OperatorType.NOT_GREATER)); - add(new Operation(8,"NOT_LESSER","The value is not less than",C_OperatorType.NOT_LESSER)); - add(new Operation(9,"IS_NULL","The value is null",C_OperatorType.IS_NULL)); - add(new Operation(10,"IS_NOT_NULL","The value is not null",C_OperatorType.IS_NOT_NULL)); + add(new Operation(1,"EQUALS","Equal to",C_OperatorType.EQUALS)); + add(new Operation(2,"GREATER","Greater than",C_OperatorType.GREATER)); + add(new Operation(3,"GREATER_OR_EQUALS","Greater than or equal to",C_OperatorType.GREATER_OR_EQUALS)); + add(new Operation(4,"LESSER","Less than",C_OperatorType.LESSER)); + add(new Operation(5,"LESSER_OR_EQUALS","Less than or equal to",C_OperatorType.LESSER_OR_EQUALS)); + add(new Operation(6,"NOT_EQUALS","Not equal to",C_OperatorType.NOT_EQUALS)); + add(new Operation(7,"NOT_GREATER","Not greater than",C_OperatorType.NOT_GREATER)); + add(new Operation(8,"NOT_LESSER","Not less than",C_OperatorType.NOT_LESSER)); + add(new Operation(9,"IS_NULL","Is null",C_OperatorType.IS_NULL)); + add(new Operation(10,"IS_NOT_NULL","Is not null",C_OperatorType.IS_NOT_NULL)); }}; @@ -99,8 +99,8 @@ public class OperationsStore { { //[ADDITION, DIVISION, MODULUS, MULTIPLICATION, SUBTRACTION, IS_NOT_NULL, IS_NULL, NOT, COUNT, MAX, MIN, ST_EXTENT] - add(new Operation(1,"IS_NULL","The value is null",C_OperatorType.IS_NULL)); - add(new Operation(2,"IS_NOT_NULL","The value is not null",C_OperatorType.IS_NOT_NULL)); + add(new Operation(1,"IS_NULL","Is null",C_OperatorType.IS_NULL)); + add(new Operation(2,"IS_NOT_NULL","Is not null",C_OperatorType.IS_NOT_NULL)); }}; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resources/ExpressionResources.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resources/ExpressionResources.java index dfb9967..2bbe718 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resources/ExpressionResources.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/resources/ExpressionResources.java @@ -5,7 +5,6 @@ package org.gcube.portlets.user.td.expressionwidget.client.resources; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; -import com.google.gwt.resources.client.ClientBundle.Source; /**