From b75b17686c2d277cc2f853a7dd81deb9644488bf Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 27 Mar 2015 13:31:40 +0000 Subject: [PATCH] Updated ReplaceByExpression git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@113770 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/com.google.gdt.eclipse.core.prefs | 2 +- .settings/org.eclipse.wst.common.component | 9 +++++++++ ExpressionWidget.launch | 6 +++++- pom.xml | 14 +++++++------- .../client/ExpressionWidgetEntry.java | 8 +++++--- .../expression/ReplaceExpressionDialog.java | 4 +++- .../expression/ReplaceExpressionPanel.java | 19 +++++++++++++++---- .../server/ExpressionServiceImpl.java | 6 ++++++ .../expressionwidget/ExpressionWidget.gwt.xml | 15 ++++++++------- 9 files changed, 59 insertions(+), 24 deletions(-) diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 03a47ff..7fb0fe5 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/home/giancarlo/workspace/tabular-data-expression-widget/target/tabular-data-expression-widget-1.3.0-SNAPSHOT +lastWarOutDir=/home/giancarlo/workspace2/tabular-data-expression-widget/target warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index ba09c09..5f95c03 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,15 @@ + + uses + + + uses + + + uses + diff --git a/ExpressionWidget.launch b/ExpressionWidget.launch index 9eca14c..68b789f 100644 --- a/ExpressionWidget.launch +++ b/ExpressionWidget.launch @@ -1,6 +1,10 @@ + + + + @@ -10,7 +14,7 @@ - + diff --git a/pom.xml b/pom.xml index 9862335..3b7fd7f 100644 --- a/pom.xml +++ b/pom.xml @@ -119,13 +119,11 @@ [1.0.2-SNAPSHOT,2.0.0-SNAPSHOT) provided - org.gcube.portal custom-portal-handler provided - org.gcube.applicationsupportlayer aslcore @@ -144,7 +142,7 @@ org.gcube.data.analysis.tabulardata service-client-impl [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - provided + provided @@ -152,7 +150,7 @@ org.gcube.portlets.user tabular-data-gwt-service [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - provided + provided @@ -160,7 +158,7 @@ org.gcube.portlets.user tabular-data-widget-common-event [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) - provided + provided @@ -168,7 +166,7 @@ org.gcube.portlets.user tabular-data-monitor-widget [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) - provided + provided @@ -185,6 +183,8 @@ slf4j-api + + junit @@ -193,7 +193,6 @@ test - @@ -338,6 +337,7 @@ + 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 index 472dbbe..04bc0ad 100644 --- 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 @@ -33,8 +33,10 @@ public class ExpressionWidgetEntry implements EntryPoint { Log.debug("ExpressionWidgetEntry"); startInDevMode(); + //TabularResource: [ id=86, type=STANDARD, lastTable=[ id=1159, type=Generic]] + EventBus eventBus= new SimpleEventBus(); - TRId trId=new TRId("154",TabResourceType.STANDARD, "1969"); + TRId trId=new TRId("86",TabResourceType.STANDARD, "1159"); //String columnName="zwqvvx"; //Column Expression Dialog @@ -58,12 +60,12 @@ public class ExpressionWidgetEntry implements EntryPoint { //HelpReplaceColumnByExpressionDialog //HelpReplaceColumnByExpressionDialog help= new HelpReplaceColumnByExpressionDialog(eventBus); //help.show(); - + //Replace Expression Dialog ColumnMockUp columnMockUp=new ColumnMockUp(null, null, "TestMock", ColumnTypeCode.ATTRIBUTE, ColumnDataType.Text,""); ReplaceExpressionDialog replaceExpressionDialog=new ReplaceExpressionDialog(columnMockUp,trId,eventBus); replaceExpressionDialog.show(); - + Log.info("Hello!"); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionDialog.java index c392a4f..995f35a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionDialog.java @@ -33,7 +33,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; public class ReplaceExpressionDialog extends Window implements HasExpressionWrapperNotificationListener { private static final String WIDTH = "880px"; - private static final String HEIGHT = "490px"; + private static final String HEIGHT = "360px"; private ArrayList listeners; private ColumnData column; private ArrayList columns; @@ -59,6 +59,7 @@ public class ReplaceExpressionDialog extends Window implements EventBus eventBus) { listeners=new ArrayList(); this.eventBus = eventBus; + this.trId=trId; this.column = column; type = ReplaceExpressionType.Replace; initWindow(); @@ -82,6 +83,7 @@ public class ReplaceExpressionDialog extends Window implements EventBus eventBus) { listeners=new ArrayList(); this.eventBus = eventBus; + this.trId=trId; column = new ColumnData(); column.setColumnId(columnMockUp.getColumnId()); column.setLabel(columnMockUp.getLabel()); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionPanel.java index 7a547fb..25a9b2d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/expression/ReplaceExpressionPanel.java @@ -50,10 +50,10 @@ public class ReplaceExpressionPanel extends FramedPanel { + "|(\\s*LINESTRING\\s*\\((\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*,)+\\s*((-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*)\\)\\s*$)"; private static final String WIDTH = "868px"; - private static final String HEIGHT = "454px"; - private static final String HEIGHT_REDUCE = "368px"; - private static final String PARENT_HEIGHT = "490px"; - private static final String PARENT_HEIGHT_REDUCE = "404px"; + private static final String HEIGHT = "324px"; + private static final String HEIGHT_REDUCE = "238px"; + private static final String PARENT_HEIGHT = "360px"; + private static final String PARENT_HEIGHT_REDUCE = "274px"; private static final String REPLACEWIDTH = "832px"; private static final String REPLACEHEIGHT = "120px"; @@ -70,6 +70,7 @@ public class ReplaceExpressionPanel extends FramedPanel { private TextButton btnApply; private TextButton btnClose; + private TextField columnLabel; private TextField columnType; private TextField dataType; @@ -81,6 +82,8 @@ public class ReplaceExpressionPanel extends FramedPanel { private ReplaceExpressionType type; + + public ReplaceExpressionPanel(ReplaceExpressionDialog parent, ColumnData column, ArrayList columns, ReplaceExpressionType type, EventBus eventBus) { @@ -143,6 +146,13 @@ public class ReplaceExpressionPanel extends FramedPanel { VerticalLayoutContainer propertiesLayout = new VerticalLayoutContainer(); properties.add(propertiesLayout); + columnLabel = new TextField(); + columnLabel.setToolTip("The label of column"); + columnLabel.setReadOnly(true); + propertiesLayout.add(new FieldLabel(columnLabel, "Label"), + new VerticalLayoutData(1, -1)); + + columnType = new TextField(); columnType.setToolTip("The type of column"); columnType.setReadOnly(true); @@ -276,6 +286,7 @@ public class ReplaceExpressionPanel extends FramedPanel { case CODEDESCRIPTION: case CODENAME: case MEASURE: + columnLabel.setValue(column.getLabel()); columnType.setValue(column.getTypeCode()); dataType.setValue(column.getDataTypeName()); break; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java index 1f0bdd2..98fef38 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java @@ -29,6 +29,12 @@ import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ public class ExpressionServiceImpl extends RemoteServiceServlet implements ExpressionService { 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 index c43ec38..a3bc8fd 100644 --- 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 @@ -1,12 +1,13 @@ - + + - + @@ -22,21 +23,21 @@ - - + + - + - + - +