From aac25e9e4d5a60a886664ce87fb9f44d342ecf1d Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 20 Jan 2014 10:29:35 +0000 Subject: [PATCH] Fixing svn bug git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@90229 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 37 --- .project | 53 ---- .settings/.jsdtscope | 13 - .../com.google.appengine.eclipse.core.prefs | 4 - .settings/com.google.gdt.eclipse.core.prefs | 5 - .settings/com.google.gwt.eclipse.core.prefs | 3 - .settings/org.eclipse.core.resources.prefs | 6 - .settings/org.eclipse.jdt.core.prefs | 8 - .settings/org.eclipse.m2e.core.prefs | 4 - .settings/org.eclipse.wst.common.component | 13 - ....eclipse.wst.common.project.facet.core.xml | 7 - ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - ExpressionWidget.launch | 17 - config/profile.xml | 29 -- distro/INSTALL | 0 distro/LICENSE | 6 - distro/MAINTAINERS | 1 - distro/README | 40 --- distro/changelog.xml | 6 - distro/svnpath.txt | 1 - pom.xml | 297 ------------------ .../expressionwidget/ExpressionWidget.gwt.xml | 32 -- .../client/ColumnExpressionPanel.java | 184 ----------- .../client/ConditionWidget.java | 94 ------ .../client/ExpressionWidgetEntry.java | 27 -- .../client/operation/Operation.java | 58 ---- .../client/operation/OperationProperties.java | 21 -- .../client/operation/OperationsStore.java | 86 ----- .../share/model/Expression.java | 12 - .../share/model/OperatorType.java | 29 -- .../model/composite/comparable/Equals.java | 30 -- .../composite/comparable/GreaterOrEquals.java | 30 -- .../composite/comparable/GreaterThan.java | 30 -- .../composite/comparable/LessOrEquals.java | 29 -- .../model/composite/comparable/LessThan.java | 30 -- .../model/composite/comparable/NotEquals.java | 29 -- .../composite/comparable/NotGreater.java | 29 -- .../model/composite/comparable/NotLess.java | 29 -- .../model/composite/text/TextBeginsWith.java | 30 -- .../model/composite/text/TextContains.java | 29 -- .../model/composite/text/TextEndsWith.java | 30 -- .../composite/text/TextMatchSQLRegexp.java | 31 -- .../share/model/logical/And.java | 35 --- .../share/model/logical/Between.java | 31 -- .../share/model/logical/IsNotNull.java | 29 -- .../share/model/logical/IsNull.java | 28 -- .../share/model/logical/Not.java | 27 -- .../share/model/logical/Or.java | 35 --- .../share/model/logical/ValueIsIn.java | 29 -- .../expressionwidget/ExpressionWidget.gwt.xml | 32 -- .../client/Messages.properties | 2 - .../client/Messages_fr.properties | 2 - src/main/webapp/ExpressionWidget.css | 34 -- src/main/webapp/ExpressionWidget.html | 50 --- src/main/webapp/WEB-INF/web.xml | 35 --- .../client/GwtTestExpressionWidget.java | 64 ---- .../ExpressionWidgetJUnit.gwt.xml | 13 - templates/INSTALL | 0 templates/LICENSE | 6 - templates/MAINTAINERS | 1 - templates/README | 40 --- templates/changelog.xml | 6 - templates/descriptor.xml | 39 --- templates/profile.xml | 29 -- templates/svnpath.txt | 1 - 66 files changed, 2019 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .settings/.jsdtscope delete mode 100644 .settings/com.google.appengine.eclipse.core.prefs delete mode 100644 .settings/com.google.gdt.eclipse.core.prefs delete mode 100644 .settings/com.google.gwt.eclipse.core.prefs delete mode 100644 .settings/org.eclipse.core.resources.prefs delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.m2e.core.prefs delete mode 100644 .settings/org.eclipse.wst.common.component delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 ExpressionWidget.launch delete mode 100644 config/profile.xml delete mode 100644 distro/INSTALL delete mode 100644 distro/LICENSE delete mode 100644 distro/MAINTAINERS delete mode 100644 distro/README delete mode 100644 distro/changelog.xml delete mode 100644 distro/svnpath.txt delete mode 100644 pom.xml delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ConditionWidget.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/Operation.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/OperationProperties.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/OperationsStore.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/Expression.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/OperatorType.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/Equals.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/GreaterOrEquals.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/GreaterThan.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/LessOrEquals.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/LessThan.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotEquals.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotGreater.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotLess.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextBeginsWith.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextContains.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextEndsWith.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextMatchSQLRegexp.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/And.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Between.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/IsNotNull.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/IsNull.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Not.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Or.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/ValueIsIn.java delete mode 100644 src/main/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml delete mode 100644 src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/Messages.properties delete mode 100644 src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/Messages_fr.properties delete mode 100644 src/main/webapp/ExpressionWidget.css delete mode 100644 src/main/webapp/ExpressionWidget.html delete mode 100644 src/main/webapp/WEB-INF/web.xml delete mode 100644 src/test/java/org/gcube/portlets/user/td/expressionwidget/client/GwtTestExpressionWidget.java delete mode 100644 src/test/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidgetJUnit.gwt.xml delete mode 100644 templates/INSTALL delete mode 100644 templates/LICENSE delete mode 100644 templates/MAINTAINERS delete mode 100644 templates/README delete mode 100644 templates/changelog.xml delete mode 100644 templates/descriptor.xml delete mode 100644 templates/profile.xml delete mode 100644 templates/svnpath.txt diff --git a/.classpath b/.classpath deleted file mode 100644 index 3a5b2af..0000000 --- a/.classpath +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index 1908e4c..0000000 --- a/.project +++ /dev/null @@ -1,53 +0,0 @@ - - - tabular-data-expression-widget - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - com.google.gdt.eclipse.core.webAppProjectValidator - - - - - com.google.gwt.eclipse.core.gwtProjectValidator - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - com.google.gwt.eclipse.core.gwtNature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope deleted file mode 100644 index 3b2886e..0000000 --- a/.settings/.jsdtscope +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/.settings/com.google.appengine.eclipse.core.prefs b/.settings/com.google.appengine.eclipse.core.prefs deleted file mode 100644 index 5260f5f..0000000 --- a/.settings/com.google.appengine.eclipse.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -filesCopiedToWebInfLib= -googleCloudSqlEnabled=false -localDevMySqlEnabled=true diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs deleted file mode 100644 index 3e27203..0000000 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -jarsExcludedFromWebInfLib= -lastWarOutDir=/home/giancarlo/workspace/tabular-data-expression-widget/target/tabular-data-expression-widget-1.0.0-SNAPSHOT -warSrcDir=src/main/webapp -warSrcDirIsOutput=false diff --git a/.settings/com.google.gwt.eclipse.core.prefs b/.settings/com.google.gwt.eclipse.core.prefs deleted file mode 100644 index fb32c70..0000000 --- a/.settings/com.google.gwt.eclipse.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -entryPointModules= -filesCopiedToWebInfLib= diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf99..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8ad6fb0..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -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.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 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 4d09fdd..0000000 --- a/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - uses - - - - - diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index d74c55e..0000000 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/ExpressionWidget.launch b/ExpressionWidget.launch deleted file mode 100644 index 0fa3c42..0000000 --- a/ExpressionWidget.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/config/profile.xml b/config/profile.xml deleted file mode 100644 index d213e5f..0000000 --- a/config/profile.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - Service - - tabular-data-expression-widget allows to create expression on column of table - PortletsUser - tabular-data-expression-widget - 1.0.0 - - - tabular-data-expression-widget allows to create expression on column of table - tabular-data-expression-widget - 1.0.0-SNAPSHOT - - org.gcube.portlets.user - tabular-data-expression-widget - 1.0.0-SNAPSHOT - - library - - tabular-data-expression-widget-1.0.0-SNAPSHOT.war - - - - - - - diff --git a/distro/INSTALL b/distro/INSTALL deleted file mode 100644 index e69de29..0000000 diff --git a/distro/LICENSE b/distro/LICENSE deleted file mode 100644 index cc51139..0000000 --- a/distro/LICENSE +++ /dev/null @@ -1,6 +0,0 @@ -gCube System - License ------------------------------------------------------------- - -The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl). -The software and documentation is provided by its authors/distributors "as is" and no expressed or -implied warranty is given for its use, quality or fitness for a particular case. \ No newline at end of file diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS deleted file mode 100644 index 0bc9be3..0000000 --- a/distro/MAINTAINERS +++ /dev/null @@ -1 +0,0 @@ -Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" diff --git a/distro/README b/distro/README deleted file mode 100644 index 206d0fd..0000000 --- a/distro/README +++ /dev/null @@ -1,40 +0,0 @@ -The gCube System - tabular-data-expression-widget ------------------------------------------------------------- - -This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) - -Authors -------- - -Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, -Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - - -Version and Release Date ------------------------- - -v. 1.0.0-SNAPSHOT (2013-10-18) - -Description ------------ - -tabular-data-expression-widget allows to create expression on column of table - -Download information --------------------- -Source code URL: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget - - -Documentation -------------- - -tabular-data-expression-widget allows to create expression on column of table - - -Licensing ---------- - -This software is licensed under the terms you may find in the file named "LICENSE" in this directory. - - - diff --git a/distro/changelog.xml b/distro/changelog.xml deleted file mode 100644 index 7fcdae7..0000000 --- a/distro/changelog.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - First Release - - \ No newline at end of file diff --git a/distro/svnpath.txt b/distro/svnpath.txt deleted file mode 100644 index d857dd1..0000000 --- a/distro/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget \ No newline at end of file diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 4a5a964..0000000 --- a/pom.xml +++ /dev/null @@ -1,297 +0,0 @@ - - - - - maven-parent - org.gcube.tools - 1.0.0 - - - - - 4.0.0 - org.gcube.portlets.user - tabular-data-expression-widget - 1.0.0-SNAPSHOT - - - tabular-data-expression-widget - tabular-data-expression-widget allows to create expression on column of table - - - https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget - - - - - Giancarlo Panichi - g.panichi@isti.cnr.it - CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - - architect - developer - - - - - - ${project.basedir}/distro - ${project.build.directory}/${project.build.finalName} - 2013-10-18 - templates - distro - config - - - 2.5.1 - - ${env.GLOBUS_LOCATION} - - UTF-8 - UTF-8 - - - - - - - localRun - - - org.slf4j - slf4j-api - compile - - - ch.qos.logback - logback-classic - 1.0.1 - runtime - - - - - - - - - com.google.gwt - gwt-servlet - - - com.google.gwt - gwt-user - - - - - javax.validation - validation-api - 1.0.0.GA - test - - - javax.validation - validation-api - 1.0.0.GA - sources - test - - - - com.sencha.gxt - gxt - 3.0.1 - - - - - - - - org.gcube.portlets.user - tabular-data-gwt-service - [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - - - - - - com.allen-sauer.gwt.log - gwt-log - - - - org.slf4j - slf4j-api - - - - - - junit - junit - 4.8.1 - test - - - - - - - - - - ${webappDirectory}/WEB-INF/classes - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - true - - - - - org.apache.maven.surefire - surefire-junit47 - 2.16 - - - - - - - org.codehaus.mojo - gwt-maven-plugin - ${gwtVersion} - - - - resources - - - - - ExpressionWidget.html - ${webappDirectory} - org.gcube.portlets.user.td.expressionwidget.ExpressionWidget - - - - - - maven-resources-plugin - 2.6 - - - copy-profile - process-resources - - copy-resources - - - ${configDirectory} - - - ${templatesDirectory} - - profile.xml - - true - - - - - - copy-distro-resources - process-resources - - copy-resources - - - ${distroDirectory} - - - ${templatesDirectory} - - profile.xml - descriptor.xml - - true - - - - - - - - maven-clean-plugin - 2.5 - - - - ${distroDirectory} - - ** - - false - - - ${configDirectory} - - ** - - false - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2 - - - ${templatesDirectory}/descriptor.xml - - - - - servicearchive - package - - single - - - - - - - - - - - - - org.gcube.distribution - maven-portal-bom - LATEST - pom - import - - - - war - diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml b/src/main/java/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml deleted file mode 100644 index 71ab088..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java deleted file mode 100644 index c09c093..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java +++ /dev/null @@ -1,184 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.client; - -import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; -import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode; -import com.sencha.gxt.widget.core.client.FramedPanel; -import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; -import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; -import com.sencha.gxt.widget.core.client.form.FieldLabel; -import com.sencha.gxt.widget.core.client.form.TextField; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class ColumnExpressionPanel extends FramedPanel { - protected TRId trId; - protected String columnName=null; - protected ColumnData column; - //protected ComboBox combo=null; - - /** - * - * @param columnTypeCode - * @param dataTypeName - */ - public ColumnExpressionPanel(String columnId, String columnTypeCode, String dataTypeName) { - column=new ColumnData(); - column.setColumnId(columnId); - column.setDataTypeName(dataTypeName); - column.setTypeCode(columnTypeCode); - create(); - } - - /** - * - * @param trId - * @param columnName - */ - public ColumnExpressionPanel(TRId trId, String columnName) { - this.trId=trId; - this.columnName=columnName; - load(trId, columnName); - } - - protected void create() { - setBodyBorder(false); - // getHeader().setIcon(Resources.IMAGES.side_list()); - setWidth(400); - setHeight(400); - setResize(true); - - VerticalLayoutContainer basicLayout = new VerticalLayoutContainer(); - basicLayout.setScrollMode(ScrollMode.AUTO); - basicLayout.setAdjustForScroll(true); - - - TextField tf= new TextField(); - basicLayout.add(new FieldLabel(tf, "Prova"), new VerticalLayoutData(1, -1)); - - ConditionWidget conditionWidget =new ConditionWidget(column.getColumnId(), column.getTypeCode(), column.getDataTypeName()); - basicLayout.add(conditionWidget); - - add(basicLayout); - - /* - ContentPanel panel = new ContentPanel(); - panel.setHeaderVisible(false); - - //panel.setBodyStyle("margin: 0px;"); - - ColumnDataProperties props = GWT.create(ColumnDataProperties.class); - ListStore store = new ListStore(props.id()); - - Log.trace("Store created"); - RpcProxy> proxy = new RpcProxy>() { - - public void load(ListLoadConfig loadConfig, final AsyncCallback> callback) { - loadData(loadConfig, callback); - } - }; - final ListLoader> loader = new ListLoader>(proxy); - loader.setRemoteSort(false); - loader.addLoadHandler(new LoadResultListStoreBinding>(store)); - Log.trace("Loader created"); - - - combo = new ComboBox(store, - props.label()){ - @Override - protected void onAfterFirstAttach() { - super.onAfterFirstAttach(); - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - public void execute() { - loader.load(); - } - }); - } - }; - Log.trace("Combo created"); - - addHandlersForEventObservation(combo, props.label()); - - combo.setEmptyText("Select a column..."); - combo.setWidth(150); - combo.setTypeAhead(true); - combo.setTriggerAction(TriggerAction.ALL); - combo.setLoader(loader); - - FramedPanel form = new FramedPanel(); - form.setHeaderVisible(false); - //form.setWidth(350); - form.setBodyStyle("background: none;"); - - VerticalLayoutContainer v = new VerticalLayoutContainer(); - v.add(new FieldLabel(combo, "Column"), new VerticalLayoutData(1, -1)); - form.add(v); - form.addButton(new TextButton("Remove")); - - - panel.add(form); - - basicLayout.add(panel, new VerticalLayoutData(-1, -1, new Margins())); - */ - - } - - /* - private void addHandlersForEventObservation(ComboBox combo, - final LabelProvider labelProvider) { - combo.addValueChangeHandler(new ValueChangeHandler() { - - public void onValueChange(ValueChangeEvent event) { - Info.display( - "Value Changed", - "New value: " - + (event.getValue() == null ? "nothing" - : labelProvider.getLabel(event - .getValue()) + "!")); - - } - }); - combo.addSelectionHandler(new SelectionHandler() { - public void onSelection(SelectionEvent event) { - Info.display( - "State Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) + "!")); - } - }); - } - - */ - - - - protected void load(TRId trId, String columnName) { - TDGWTServiceAsync.INSTANCE.getColumn(trId,columnName, new AsyncCallback(){ - - public void onFailure(Throwable caught) { - Log.error("Error retrieving column: "+caught.getMessage()); - - } - - public void onSuccess(ColumnData result) { - Log.debug("Retrived column: "+result); - column=result; - create(); - } - - }); - - - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ConditionWidget.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ConditionWidget.java deleted file mode 100644 index 8970183..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ConditionWidget.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.client; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.core.client.GWT; -import com.google.gwt.event.logical.shared.SelectionEvent; -import com.google.gwt.event.logical.shared.SelectionHandler; -import com.google.gwt.event.logical.shared.ValueChangeEvent; -import com.google.gwt.event.logical.shared.ValueChangeHandler; -import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction; -import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode; -import com.sencha.gxt.core.client.util.Margins; -import com.sencha.gxt.data.shared.LabelProvider; -import com.sencha.gxt.data.shared.ListStore; -import com.sencha.gxt.widget.core.client.container.SimpleContainer; -import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; -import com.sencha.gxt.widget.core.client.form.ComboBox; -import com.sencha.gxt.widget.core.client.info.Info; -import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; -import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; - -import org.gcube.data.analysis.tabulardata.expression.Operator; -import org.gcube.portlets.user.td.expressionwidget.client.operation.Operation; -import org.gcube.portlets.user.td.expressionwidget.client.operation.OperationProperties; -import org.gcube.portlets.user.td.expressionwidget.client.operation.OperationsStore; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class ConditionWidget extends SimpleContainer { - protected Operator op; - protected ComboBox comboOp=null; - - ConditionWidget(String columnPlaceHolderId,String columnTypeCode, String dataTypeName){ - VerticalLayoutContainer v=new VerticalLayoutContainer(); - v.setScrollMode(ScrollMode.AUTO); - v.setAdjustForScroll(true); - - OperationProperties props = GWT.create(OperationProperties.class); - ListStore storeOp = new ListStore(props.name()); - storeOp.addAll(OperationsStore.getAll(dataTypeName)); - - Log.trace("Store created"); - - - comboOp = new ComboBox(storeOp, - props.label()); - - Log.trace("ComboOperation created"); - - addHandlersForEventObservation(comboOp, props.label()); - - comboOp.setEmptyText("Select a operation..."); - comboOp.setWidth(150); - comboOp.setTypeAhead(true); - comboOp.setTriggerAction(TriggerAction.ALL); - - v.add(comboOp,new VerticalLayoutData(-1, -1, new Margins(0))); - - add(v); - } - - private void addHandlersForEventObservation(ComboBox combo, - final LabelProvider labelProvider) { - combo.addValueChangeHandler(new ValueChangeHandler() { - - public void onValueChange(ValueChangeEvent event) { - Info.display( - "Value Changed", - "New value: " - + (event.getValue() == null ? "nothing" - : labelProvider.getLabel(event - .getValue()) + "!")); - - } - }); - combo.addSelectionHandler(new SelectionHandler() { - public void onSelection(SelectionEvent event) { - Info.display( - "State Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) + "!")); - } - }); - } - - - - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java deleted file mode 100644 index c418fe0..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.client; - - - -import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.core.client.EntryPoint; - -public class ExpressionWidgetEntry implements EntryPoint { - - - public void onModuleLoad() { - TRId trId=new TRId(); - //For example Tabular Resource 1 and table 1 - trId.setId("1"); - trId.setTableId("1"); - - ColumnExpressionPanel expressionPanel=new ColumnExpressionPanel("0", "Attribute", "Integer"); - expressionPanel.show(); - /*ChangeLabelColumnDialog changeLabel=new ChangeLabelColumnDialog(trId); - changeLabel.show(); - ChangeToAnnotationColumnDialog changeToAnnotation=new ChangeToAnnotationColumnDialog(trId); - changeToAnnotation.show();*/ - Log.info("Hello!"); - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/Operation.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/Operation.java deleted file mode 100644 index fc0a3fe..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/Operation.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.client.operation; - -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - - - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class Operation { - String name; - OperatorType operatorType; - String label; - - public Operation(String name, String label, OperatorType operatorType){ - this.name=name; - this.label=label; - this.operatorType=operatorType; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public OperatorType getOperatorType() { - return operatorType; - } - - public void setOperatorType(OperatorType operatorType) { - this.operatorType = operatorType; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - @Override - public String toString() { - return "Operation [name=" + name + ", operatorType=" + operatorType - + ", label=" + label + "]"; - } - - - - - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/OperationProperties.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/OperationProperties.java deleted file mode 100644 index cc11bb0..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/OperationProperties.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.client.operation; - -import com.google.gwt.editor.client.Editor.Path; -import com.sencha.gxt.data.shared.LabelProvider; -import com.sencha.gxt.data.shared.ModelKeyProvider; -import com.sencha.gxt.data.shared.PropertyAccess; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public interface OperationProperties extends PropertyAccess { - - @Path("name") - ModelKeyProvider name(); - - LabelProvider label(); - -} 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 deleted file mode 100644 index 44edc49..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/operation/OperationsStore.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.client.operation; - -import java.util.ArrayList; - -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - - - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class OperationsStore { - static ArrayList operations; - - static ArrayList operationsNumeric = new ArrayList() { - private static final long serialVersionUID = -6559885743626876431L; - { - add(new Operation("EQUALS","Equals",OperatorType.EQUALS)); - add(new Operation("GREATER","Greater",OperatorType.GREATER)); - add(new Operation("GREATER_OR_EQUALS","Greater or equals",OperatorType.GREATER_OR_EQUALS)); - add(new Operation("LESSER","Lesser",OperatorType.LESSER)); - add(new Operation("LESSER_OR_EQUALS","Lesser or equals",OperatorType.LESSER_OR_EQUALS)); - add(new Operation("NOT_EQUALS","Not equals",OperatorType.NOT_EQUALS)); - add(new Operation("NOT_GREATER","Not greater",OperatorType.NOT_GREATER)); - add(new Operation("NOT_LESSER","Not lesser",OperatorType.NOT_LESSER)); - add(new Operation("IS_NULL","Is null",OperatorType.IS_NULL)); - add(new Operation("IS_NOT_NULL","Is not null",OperatorType.IS_NOT_NULL)); - add(new Operation("BETWEEN","Between",OperatorType.BETWEEN)); - add(new Operation("IN","In",OperatorType.IN)); - }}; - - static ArrayList operationsText = new ArrayList() { - private static final long serialVersionUID = -6559885743626876431L; - { - add(new Operation("BEGIN_WITH","Begin with",OperatorType.BEGINS_WITH)); - add(new Operation("CONTAINS","Contains",OperatorType.CONTAINS)); - add(new Operation("ENDS_WITH","End with",OperatorType.ENDS_WITH)); - add(new Operation("MATCH","Match",OperatorType.MATCH_REGEX)); - add(new Operation("NOT_BEGIN_WITH","Not begin with",OperatorType.BEGINS_WITH)); - add(new Operation("NOT_CONTAINS","Not contains",OperatorType.CONTAINS)); - add(new Operation("NOT_ENDS_WITH","Not end with",OperatorType.ENDS_WITH)); - add(new Operation("NOT_MATCH","Not match",OperatorType.MATCH_REGEX)); - add(new Operation("IS_NULL","Is null",OperatorType.IS_NULL)); - add(new Operation("IS_NOT_NULL","Is not null",OperatorType.IS_NOT_NULL)); - add(new Operation("BETWEEN","Between",OperatorType.BETWEEN)); - add(new Operation("IN","In",OperatorType.IN)); - - }}; - - - public static ArrayList getAll(String dataTypeName){ - if(dataTypeName.compareTo("Boolean")==0){ - operations=operationsNumeric; - } else { - if(dataTypeName.compareTo("Date")==0){ - operations=operationsNumeric; - } else { - if(dataTypeName.compareTo("Integer")==0){ - operations=operationsNumeric; - } else { - if(dataTypeName.compareTo("Geometry")==0){ - operations=operationsNumeric; - } else { - if(dataTypeName.compareTo("Numeric")==0){ - operations=operationsNumeric; - } else { - if(dataTypeName.compareTo("Text")==0){ - operations=operationsText; - } else { - operations=operationsText; - } - } - } - - } - } - } - return operations; - } - - - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/Expression.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/Expression.java deleted file mode 100644 index 1db0837..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/Expression.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model; - -import java.io.Serializable; - -public class Expression implements Serializable{ - - - private static final long serialVersionUID = 7818512507606450235L; - - - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/OperatorType.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/OperatorType.java deleted file mode 100644 index 649b413..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/OperatorType.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model; - -public enum OperatorType { - // Arithmetic - ADDITION, SUBTRACTION, MULTIPLICATION, DIVISION, MODULUS, - - // COMPARISON - - EQUALS, GREATER, LESSER, - - GREATER_OR_EQUALS, LESSER_OR_EQUALS, - - NOT_EQUALS, NOT_GREATER, NOT_LESSER, - - // LOGICAL - - ALL, AND, ANY, BETWEEN, EXISTS, IN, LIKE, NOT, OR, IS_NULL, UNIQUE, IS_NOT_NULL, - - // STRING - - BEGINS_WITH, ENDS_WITH, CONTAINS, MATCH_REGEX, - - NO_BEGINS_WITH, NO_ENDS_WITH, NO_CONTAINS, NO_MATCH_REGEX, - - - // COMPLEX - - SELECT_IN -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/Equals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/Equals.java deleted file mode 100644 index 9ab5a8c..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/Equals.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.comparable; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class Equals extends Expression { - private static final long serialVersionUID = 3154667914317692836L; - Expression leftArgument; - Expression rightArgument; - - public Equals(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.EQUALS; - } - - public String getReturnedDataType() { - return "Boolean"; - } - -} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/GreaterOrEquals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/GreaterOrEquals.java deleted file mode 100644 index 5ea2984..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/GreaterOrEquals.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.comparable; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class GreaterOrEquals extends Expression { - private static final long serialVersionUID = -5441076239992740424L; - protected Expression leftArgument; - protected Expression rightArgument; - - public GreaterOrEquals(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.GREATER_OR_EQUALS; - } - - public String getReturnedDataType() { - return "Boolean"; - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/GreaterThan.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/GreaterThan.java deleted file mode 100644 index 34c3eb5..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/GreaterThan.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.comparable; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class GreaterThan extends Expression { - private static final long serialVersionUID = -8878360512708863164L; - protected Expression leftArgument; - protected Expression rightArgument; - - public GreaterThan(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.GREATER; - } - - public String getReturnedDataType() { - return "Boolean"; - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/LessOrEquals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/LessOrEquals.java deleted file mode 100644 index 9e16924..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/LessOrEquals.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.comparable; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class LessOrEquals extends Expression { - private static final long serialVersionUID = 7693397481316523615L; - Expression leftArgument; - Expression rightArgument; - - public LessOrEquals(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.LESSER_OR_EQUALS; - } - - public String getReturnedDataType() { - return "Boolean"; - } -} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/LessThan.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/LessThan.java deleted file mode 100644 index 3f09227..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/LessThan.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.comparable; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class LessThan extends Expression { - private static final long serialVersionUID = 6420164520127827750L; - Expression leftArgument; - Expression rightArgument; - - public LessThan(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.LESSER; - } - - public String getReturnedDataType() { - return "Boolean"; - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotEquals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotEquals.java deleted file mode 100644 index 73c0da0..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotEquals.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.comparable; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class NotEquals extends Expression { - private static final long serialVersionUID = 7587723477959909679L; - Expression leftArgument; - Expression rightArgument; - - public NotEquals(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.NOT_EQUALS; - } - - public String getReturnedDataType() { - return "Boolean"; - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotGreater.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotGreater.java deleted file mode 100644 index ed22b1f..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotGreater.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.comparable; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class NotGreater extends Expression { - private static final long serialVersionUID = 6783019184437499833L; - Expression leftArgument; - Expression rightArgument; - - public NotGreater(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.NOT_GREATER; - } - - public String getReturnedDataType() { - return "Boolean"; - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotLess.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotLess.java deleted file mode 100644 index a5f848a..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/comparable/NotLess.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.comparable; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class NotLess extends Expression { - private static final long serialVersionUID = 4497500830326659077L; - Expression leftArgument; - Expression rightArgument; - - public NotLess(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.NOT_LESSER; - } - - public String getReturnedDataType() { - return "Boolean"; - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextBeginsWith.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextBeginsWith.java deleted file mode 100644 index 9cb27fb..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextBeginsWith.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.text; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class TextBeginsWith extends Expression { - private static final long serialVersionUID = 222662008523199480L; - protected Expression leftArgument; - protected Expression rightArgument; - - public TextBeginsWith(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.BEGINS_WITH; - } - - public String getReturnedDataType() { - return "Boolean"; - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextContains.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextContains.java deleted file mode 100644 index af1f07f..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextContains.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.text; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class TextContains extends Expression { - private static final long serialVersionUID = 7951499429397693592L; - protected Expression leftArgument; - protected Expression rightArgument; - - public TextContains(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.CONTAINS; - } - - public String getReturnedDataType() { - return "Boolean"; - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextEndsWith.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextEndsWith.java deleted file mode 100644 index 05cde43..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextEndsWith.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.text; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class TextEndsWith extends Expression { - private static final long serialVersionUID = -5149428840566398839L; - protected Expression leftArgument; - protected Expression rightArgument; - - public TextEndsWith(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.ENDS_WITH; - } - - public String getReturnedDataType() { - return "Boolean"; - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextMatchSQLRegexp.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextMatchSQLRegexp.java deleted file mode 100644 index 06d7322..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/composite/text/TextMatchSQLRegexp.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.composite.text; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class TextMatchSQLRegexp extends Expression { - private static final long serialVersionUID = -4097780009381262681L; - protected Expression leftArgument; - protected Expression rightArgument; - - public TextMatchSQLRegexp(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.MATCH_REGEX; - } - - public String getReturnedDataType() { - return "Boolean"; - } - -} - diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/And.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/And.java deleted file mode 100644 index 20a2430..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/And.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.logical; - -import java.util.Arrays; -import java.util.List; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class And extends Expression { - private static final long serialVersionUID = -4462616033767138280L; - protected List arguments; - - public And(Expression... arguments) { - this.arguments = Arrays.asList(arguments); - } - - public And(List arguments) { - this.arguments = arguments; - } - - public OperatorType getOperator() { - return OperatorType.AND; - } - - public String getReturnedDataType() { - return "Boolean"; - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Between.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Between.java deleted file mode 100644 index e68bbae..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Between.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.logical; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class Between extends Expression { - - private static final long serialVersionUID = 5367101215792568854L; - - protected Expression leftArgument; - protected Expression rightArgument; - - public Between(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.BETWEEN; - } - - public String getReturnedDataType() { - return "Boolean"; - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/IsNotNull.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/IsNotNull.java deleted file mode 100644 index 1b33a23..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/IsNotNull.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.logical; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class IsNotNull extends Expression { - - private static final long serialVersionUID = 8930488371061116376L; - protected Expression argument; - - public IsNotNull(Expression argument) { - this.argument=argument; - } - - public OperatorType getOperator() { - return OperatorType.IS_NOT_NULL; - } - - public String getReturnedDataType() { - return "Boolean"; - } - -} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/IsNull.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/IsNull.java deleted file mode 100644 index 891ca37..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/IsNull.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.logical; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class IsNull extends Expression { - private static final long serialVersionUID = -7845762664802353175L; - protected Expression argument; - - public IsNull(Expression argument) { - this.argument=argument; - } - - public OperatorType getOperator() { - return OperatorType.IS_NULL; - } - - public String getReturnedDataType() { - return "Boolean"; - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Not.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Not.java deleted file mode 100644 index 855b90a..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Not.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.logical; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class Not extends Expression { - private static final long serialVersionUID = 9206533042761278382L; - protected Expression argument; - - public Not(Expression argument) { - this.argument = argument; - } - - public OperatorType getOperator() { - return OperatorType.NOT; - } - - public String getReturnedDataType() { - return "Boolean"; - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Or.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Or.java deleted file mode 100644 index 66f07e9..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/Or.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.logical; - -import java.util.Arrays; -import java.util.List; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public class Or extends Expression { - private static final long serialVersionUID = 1855717717443945397L; - - protected List arguments; - - public Or(Expression... arguments) { - this.arguments = Arrays.asList(arguments); - } - - public Or(List arguments) { - this.arguments = arguments; - } - - public OperatorType getOperator() { - return OperatorType.OR; - } - - public String getReturnedDataType() { - return "Boolean"; - } -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/ValueIsIn.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/ValueIsIn.java deleted file mode 100644 index d48400e..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/share/model/logical/ValueIsIn.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.share.model.logical; - -import org.gcube.portlets.user.td.expressionwidget.share.model.Expression; -import org.gcube.portlets.user.td.expressionwidget.share.model.OperatorType; - -/** - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it - * - */ -public class ValueIsIn extends Expression { - private static final long serialVersionUID = 739569588958197726L; - protected Expression leftArgument; - protected Expression rightArgument; - - public ValueIsIn(Expression leftArgument, Expression rightArgument) { - this.leftArgument = leftArgument; - this.rightArgument = rightArgument; - } - - public OperatorType getOperator() { - return OperatorType.IN; - } - - public String getReturnedDataType() { - return "Boolean"; - } -} diff --git a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml deleted file mode 100644 index 8349886..0000000 --- a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/Messages.properties b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/Messages.properties deleted file mode 100644 index c222555..0000000 --- a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/Messages.properties +++ /dev/null @@ -1,2 +0,0 @@ -sendButton = Send -nameField = Enter your name \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/Messages_fr.properties b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/Messages_fr.properties deleted file mode 100644 index b4a7627..0000000 --- a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/client/Messages_fr.properties +++ /dev/null @@ -1,2 +0,0 @@ -sendButton = Envoyer -nameField = Entrez votre nom \ No newline at end of file diff --git a/src/main/webapp/ExpressionWidget.css b/src/main/webapp/ExpressionWidget.css deleted file mode 100644 index 7aca7ac..0000000 --- a/src/main/webapp/ExpressionWidget.css +++ /dev/null @@ -1,34 +0,0 @@ -/** Add css rules here for your application. */ - - -/** Example rules used by the template application (remove for your app) */ -h1 { - font-size: 2em; - font-weight: bold; - color: #777777; - margin: 40px 0px 70px; - text-align: center; -} - -.sendButton { - display: block; - font-size: 16pt; -} - -/** Most GWT widgets already have a style name defined */ -.gwt-DialogBox { - width: 400px; -} - -.dialogVPanel { - margin: 5px; -} - -.serverResponseLabelError { - color: red; -} - -/** Set ids using widget.getElement().setId("idOfElement") */ -#closeButton { - margin: 15px 6px 6px; -} diff --git a/src/main/webapp/ExpressionWidget.html b/src/main/webapp/ExpressionWidget.html deleted file mode 100644 index 095c8ae..0000000 --- a/src/main/webapp/ExpressionWidget.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - Web Application Starter Project - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index ff96f4b..0000000 --- a/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - TDGWTService - org.gcube.portlets.user.td.gwtservice.server.TDGWTServiceImpl - - - - jUnitHostImpl - com.google.gwt.junit.server.JUnitHostImpl - - - - - TDGWTService - ExpressionWidget/TDGWTService - - - jUnitHostImpl - ExpressionWidget/junithost/* - - - - - - ExpressionWidget.html - - - diff --git a/src/test/java/org/gcube/portlets/user/td/expressionwidget/client/GwtTestExpressionWidget.java b/src/test/java/org/gcube/portlets/user/td/expressionwidget/client/GwtTestExpressionWidget.java deleted file mode 100644 index 162b5a1..0000000 --- a/src/test/java/org/gcube/portlets/user/td/expressionwidget/client/GwtTestExpressionWidget.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.gcube.portlets.user.td.expressionwidget.client; - - - -import com.google.gwt.junit.client.GWTTestCase; - -/** - * GWT JUnit integration tests must extend GWTTestCase. - * Using "GwtTest*" naming pattern exclude them from running with - * surefire during the test phase. - * - * If you run the tests using the Maven command line, you will have to - * navigate with your browser to a specific url given by Maven. - * See http://mojo.codehaus.org/gwt-maven-plugin/user-guide/testing.html - * for details. - */ -public class GwtTestExpressionWidget extends GWTTestCase { - - /** - * Must refer to a valid module that sources this class. - */ - public String getModuleName() { - return "org.gcube.portlets.user.td.expressionwidget.ExpressionWidgetJUnit"; - } - - - /** - * This test will send a request to the server using the greetServer method in - * GreetingService and verify the response. - */ - public void testGreetingService() { - // Create the service that we will test. - //GreetingServiceAsync greetingService = GWT.create(GreetingService.class); - //ServiceDefTarget target = (ServiceDefTarget) greetingService; - //target.setServiceEntryPoint(GWT.getModuleBaseURL() + "SDMXImportWizardTD/greet"); - - // Since RPC calls are asynchronous, we will need to wait for a response - // after this test method returns. This line tells the test runner to wait - // up to 10 seconds before timing out. - //delayTestFinish(10000); - - // Send a request to the server. - /* greetingService.greetServer("GWT User", new AsyncCallback() { - public void onFailure(Throwable caught) { - // The request resulted in an unexpected error. - fail("Request failure: " + caught.getMessage()); - } - - - public void onSuccess(String result) { - // Verify that the response is correct. - assertTrue(result.startsWith("Hello, GWT User!")); - - // Now that we have received a response, we need to tell the test runner - // that the test is complete. You must call finishTest() after an - // asynchronous test finishes successfully, or the test will time out. - finishTest(); - } - });*/ - - } - - -} diff --git a/src/test/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidgetJUnit.gwt.xml b/src/test/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidgetJUnit.gwt.xml deleted file mode 100644 index 0e67944..0000000 --- a/src/test/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidgetJUnit.gwt.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/templates/INSTALL b/templates/INSTALL deleted file mode 100644 index e69de29..0000000 diff --git a/templates/LICENSE b/templates/LICENSE deleted file mode 100644 index cc51139..0000000 --- a/templates/LICENSE +++ /dev/null @@ -1,6 +0,0 @@ -gCube System - License ------------------------------------------------------------- - -The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl). -The software and documentation is provided by its authors/distributors "as is" and no expressed or -implied warranty is given for its use, quality or fitness for a particular case. \ No newline at end of file diff --git a/templates/MAINTAINERS b/templates/MAINTAINERS deleted file mode 100644 index 0bc9be3..0000000 --- a/templates/MAINTAINERS +++ /dev/null @@ -1 +0,0 @@ -Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" diff --git a/templates/README b/templates/README deleted file mode 100644 index e81341a..0000000 --- a/templates/README +++ /dev/null @@ -1,40 +0,0 @@ -The gCube System - ${name} ------------------------------------------------------------- - -This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) - -Authors -------- - -Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, -Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - - -Version and Release Date ------------------------- - -v. ${version} (${release.date}) - -Description ------------ - -${project.description} - -Download information --------------------- -Source code URL: ${scm.url} - - -Documentation -------------- - -${project.description} - - -Licensing ---------- - -This software is licensed under the terms you may find in the file named "LICENSE" in this directory. - - - diff --git a/templates/changelog.xml b/templates/changelog.xml deleted file mode 100644 index 3741410..0000000 --- a/templates/changelog.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - First Release - - \ No newline at end of file diff --git a/templates/descriptor.xml b/templates/descriptor.xml deleted file mode 100644 index b978636..0000000 --- a/templates/descriptor.xml +++ /dev/null @@ -1,39 +0,0 @@ - - servicearchive - - tar.gz - - / - - - ${distroDirectory} - / - true - - README - LICENSE - INSTALL - MAINTAINERS - changelog.xml - - 755 - - - - - ${distroDirectory}/svnpath.txt - /${artifactId} - - - ${configDirectory}/profile.xml - / - - - target/${build.finalName}.${packaging} - /${artifactId} - - - \ No newline at end of file diff --git a/templates/profile.xml b/templates/profile.xml deleted file mode 100644 index ffa3274..0000000 --- a/templates/profile.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - Service - - ${project.description} - PortletsUser - ${project.name} - 1.0.0 - - - ${project.description} - ${project.name} - ${version} - - ${project.groupId} - ${project.artifactId} - ${project.version} - - library - - ${project.build.finalName}.${project.packaging} - - - - - - - diff --git a/templates/svnpath.txt b/templates/svnpath.txt deleted file mode 100644 index dcd0d22..0000000 --- a/templates/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -${scm.url} \ No newline at end of file