gCubeSystem
/
tabular-data-expression-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Panel layout 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@114713 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-05-08 14:34:09 +00:00
parent f614d40f30
commit 756bdd7b98
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java
View File

@ -40,7 +40,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
*/ */
public class ReplaceColumnByExpressionDialog extends Window implements public class ReplaceColumnByExpressionDialog extends Window implements
MonitorDialogListener { MonitorDialogListener {
private static final String WIDTH = "890px"; private static final String WIDTH = "900px";
private static final String HEIGHT = "490px"; private static final String HEIGHT = "490px";
// private static final String HEIGHT_REDUCE = "404px"; // private static final String HEIGHT_REDUCE = "404px";

10
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java
View File

@ -65,18 +65,18 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel {
private static final String GEOMETRY_REGEXPR = "(\\s*POINT\\s*\\(\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*\\)\\s*$)" private static final String GEOMETRY_REGEXPR = "(\\s*POINT\\s*\\(\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*\\)\\s*$)"
+ "|(\\s*LINESTRING\\s*\\((\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*,)+\\s*((-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*)\\)\\s*$)"; + "|(\\s*LINESTRING\\s*\\((\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*,)+\\s*((-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*)\\)\\s*$)";
private static final String WIDTH = "878px"; private static final String WIDTH = "888px";
private static final String HEIGHT = "454px"; private static final String HEIGHT = "454px";
private static final String HEIGHT_REDUCE = "368px"; private static final String HEIGHT_REDUCE = "368px";
private static final String PARENT_HEIGHT = "490px"; private static final String PARENT_HEIGHT = "490px";
private static final String PARENT_HEIGHT_REDUCE = "404px"; private static final String PARENT_HEIGHT_REDUCE = "404px";
private static final String CONDITIONWIDTH = "818px"; private static final String CONDITIONWIDTH = "828px";
private static final String CONDITIONHEIGHT = "120px"; private static final String CONDITIONHEIGHT = "120px";
private static final String CONDITION_LAYOUT_WIDTH = "818px"; private static final String CONDITION_LAYOUT_WIDTH = "828px";
private static final String REPLACEWIDTH = "842px"; private static final String REPLACEWIDTH = "852px";
private static final String REPLACEHEIGHT = "120px"; private static final String REPLACEHEIGHT = "120px";
private static final String ALL_ROWS_FIELD_WIDTH = "832px"; private static final String ALL_ROWS_FIELD_WIDTH = "842px";
private static final String RADIO_LABEL_BY_CONDITION = "By Condition"; private static final String RADIO_LABEL_BY_CONDITION = "By Condition";
private static final String RADIO_LABEL_ALL_ROWS = "All Rows"; private static final String RADIO_LABEL_ALL_ROWS = "All Rows";

2
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionDialog.java
View File

@ -33,7 +33,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
*/ */
public class ReplaceExpressionDialog extends Window implements public class ReplaceExpressionDialog extends Window implements
HasExpressionWrapperNotificationListener { HasExpressionWrapperNotificationListener {
private static final String WIDTH = "890px"; private static final String WIDTH = "900px";
private static final String HEIGHT = "360px"; private static final String HEIGHT = "360px";
private ArrayList<ExpressionWrapperNotificationListener> listeners; private ArrayList<ExpressionWrapperNotificationListener> listeners;
private ColumnData column; private ColumnData column;

4
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceExpressionPanel.java
View File

@ -49,13 +49,13 @@ public class ReplaceExpressionPanel extends FramedPanel {
private static final String GEOMETRY_REGEXPR = "(\\s*POINT\\s*\\(\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*\\)\\s*$)" private static final String GEOMETRY_REGEXPR = "(\\s*POINT\\s*\\(\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*\\)\\s*$)"
+ "|(\\s*LINESTRING\\s*\\((\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*,)+\\s*((-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*)\\)\\s*$)"; + "|(\\s*LINESTRING\\s*\\((\\s*(-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*,)+\\s*((-)?\\d+(\\.\\d+)?\\s+(-)?\\d+(\\.\\d+)?\\s*)\\)\\s*$)";
private static final String WIDTH = "878px"; private static final String WIDTH = "888px";
private static final String HEIGHT = "324px"; private static final String HEIGHT = "324px";
private static final String HEIGHT_REDUCE = "238px"; private static final String HEIGHT_REDUCE = "238px";
private static final String PARENT_HEIGHT = "360px"; private static final String PARENT_HEIGHT = "360px";
private static final String PARENT_HEIGHT_REDUCE = "274px"; private static final String PARENT_HEIGHT_REDUCE = "274px";
private static final String REPLACEWIDTH = "842px"; private static final String REPLACEWIDTH = "852px";
private static final String REPLACEHEIGHT = "120px"; private static final String REPLACEHEIGHT = "120px";
private EventBus eventBus; private EventBus eventBus;